From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 18/19] libmodulemd: remove the recipe
Date: Fri, 11 Oct 2019 13:47:53 +0200 [thread overview]
Message-ID: <20191011114754.91740-18-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191011114754.91740-1-alex.kanavin@gmail.com>
Version 2 of the recipe is not actually required by anything; the
lidmodulemd dependency in createrepo-c is optional, and the
libmodulemd feature is not used in YP.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meta/conf/distro/include/maintainers.inc | 1 -
.../createrepo-c/createrepo-c_0.15.0.bb | 4 +-
...ec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 22 ------
...xplicitly-specify-the-v1-library-in-.patch | 28 --------
...n.build-do-not-generate-gir-or-gtkdo.patch | 71 -------------------
.../libmodulemd/libmodulemd_git.bb | 26 -------
6 files changed, 2 insertions(+), 150 deletions(-)
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 7a9d55c5c34..d85e5b697f5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -355,7 +355,6 @@ RECIPE_MAINTAINER_pn-libmatchbox = "Ross Burton <ross.burton@intel.com>"
RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
-RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>"
diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
index ae0a35da847..dc1b851b2d7 100644
--- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
+++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb
@@ -12,12 +12,12 @@ SRCREV = "2077ba104eae04bb819e9e0c906c8c835b62e7a6"
S = "${WORKDIR}/git"
-DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd"
+DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
DEPENDS_append_class-native = " file-replacement-native"
inherit cmake pkgconfig bash-completion distutils3-base
-EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF"
+EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
deleted file mode 100644
index 2598c177c4c..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 6 Nov 2018 13:41:29 +0100
-Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- spec_tmpl.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/spec_tmpl.sh b/spec_tmpl.sh
-index 14e895a..fc80fc6 100755
---- a/spec_tmpl.sh
-+++ b/spec_tmpl.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
-
- version=$1
- libmodulemd_v1_version=$2
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
deleted file mode 100644
index 1568d25f9d8..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 21 May 2019 17:59:26 +0200
-Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
- pkgconfig
-
-Otherwise there would be '-lmodulemd' which resolves
-to v2 version if both v2 and v1 are present in the sysroot.
-
-Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- modulemd/v1/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index 4d54e69..9144ca2 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -325,7 +325,7 @@ configure_file(
- )
-
- pkg.generate(
-- libraries : modulemd_v1_lib,
-+ libraries : '-l:libmodulemd.so.1',
- subdirs : v1_header_path,
- version : libmodulemd_v1_version,
- name : 'modulemd',
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
deleted file mode 100644
index 0b7535624c9..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 6 Nov 2018 13:43:00 +0100
-Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
- bindings
-
-All of these really need a configuration option.
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- meson.build | 3 +--
- modulemd/v1/meson.build | 8 --------
- modulemd/v2/meson.build | 12 ------------
- 3 files changed, 1 insertion(+), 22 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 5a0cd3d..f51b16e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -52,7 +52,6 @@ gnome = import('gnome')
- pkg = import('pkgconfig')
- gobject = dependency('gobject-2.0')
- yaml = dependency('yaml-0.1')
--gtkdoc = dependency('gtk-doc')
-
- sh = find_program('sh')
- sed = find_program('sed')
-@@ -127,4 +126,4 @@ configure_file(
- )
-
- subdir('modulemd')
--subdir('bindings/python')
-+
-diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
-index ddc95a1..e85fafd 100644
---- a/modulemd/v1/meson.build
-+++ b/modulemd/v1/meson.build
-@@ -356,11 +356,3 @@ configure_file(
- configuration : xcdata
- )
-
--gnome.gtkdoc(
-- 'modulemd-1.0',
-- install_dir: 'modulemd-1.0',
-- src_dir : './modulemd/v1',
-- main_xml : 'modulemd-v1-docs.xml',
-- install : true,
--)
--
-diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
-index 93c7fbd..0d9ed24 100644
---- a/modulemd/v2/meson.build
-+++ b/modulemd/v2/meson.build
-@@ -285,15 +285,3 @@ configure_file(
- configuration : xcdata
- )
-
--gnome.gtkdoc(
-- 'modulemd-2.0',
-- install_dir: 'modulemd-2.0',
-- src_dir : './modulemd/v2',
-- main_xml : 'modulemd-v2-docs.xml',
-- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'),
-- dependencies : [
-- modulemd_v2_dep,
-- ],
-- install : true,
--)
--
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
deleted file mode 100644
index 63d3fad6ab4..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-SUMMARY = "C Library for manipulating module metadata files"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
-
-SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
- file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
- file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
- file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
- "
-
-PV = "2.6.0"
-SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
-
-S = "${WORKDIR}/git"
-
-inherit meson gobject-introspection
-
-EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true"
-
-DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
-
-BBCLASSEXTEND = "native nativesdk"
-
-GIR_MESON_OPTION = 'skip_introspection'
-GIR_MESON_ENABLE_FLAG = 'false'
-GIR_MESON_DISABLE_FLAG = 'true'
--
2.17.1
next prev parent reply other threads:[~2019-10-11 11:48 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-11 11:47 [PATCH 01/19] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
2019-10-11 11:47 ` [PATCH 02/19] oe-selftest: extend virgl gtk test to also check the SDL option Alexander Kanavin
2019-10-11 11:47 ` [PATCH 03/19] runqemu: unset another environment variable for 'egl-headless' Alexander Kanavin
2019-10-11 11:47 ` [PATCH 04/19] gobject-introspection: update to 1.62.0 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 05/19] glib-2.0: upgrade to 2.62.1 Alexander Kanavin
2019-10-12 20:59 ` Khem Raj
2019-10-12 22:32 ` Khem Raj
2019-10-13 0:57 ` Khem Raj
2019-10-13 1:18 ` Khem Raj
2019-10-11 11:47 ` [PATCH 06/19] glib-networking: update " Alexander Kanavin
2019-10-11 11:47 ` [PATCH 07/19] sysprof: update to 3.34.1 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 08/19] epiphany: upgrade 3.32.4 -> 3.34.1 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 09/19] webkitgtk: update 2.24.4 -> 2.26.1 Alexander Kanavin
2019-10-11 14:39 ` Khem Raj
2019-10-11 11:47 ` [PATCH 10/19] gtk-doc: upgrade 1.31 -> 1.32 Alexander Kanavin
2019-10-11 19:30 ` akuster808
2019-10-11 19:39 ` Alexander Kanavin
2019-10-12 10:12 ` Adrian Bunk
2019-10-11 11:47 ` [PATCH 11/19] libdazzle: upgrade 3.32.3 -> 3.34.1 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 12/19] libsecret: upgrade 0.19.0 -> 0.19.1 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 13/19] mpg123: upgrade 1.25.11 -> 1.25.12 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 14/19] p11-kit: upgrade 0.23.16.1 -> 0.23.18.1 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 15/19] vala: upgrade 0.44.7 -> 0.46.3 Alexander Kanavin
2019-10-11 11:47 ` [PATCH 16/19] meson: update to 0.52.0 Alexander Kanavin
2019-10-13 0:20 ` Khem Raj
2019-10-17 13:15 ` Khem Raj
2019-10-17 23:31 ` Andreas Müller
2019-10-18 18:49 ` Alexander Kanavin
2019-10-18 21:26 ` richard.purdie
2019-10-20 1:21 ` Khem Raj
2019-10-20 9:50 ` richard.purdie
2019-10-20 12:32 ` richard.purdie
2019-10-20 15:08 ` Andreas Müller
2019-10-20 15:53 ` Andreas Müller
2019-10-22 7:30 ` Andreas Müller
2019-10-18 22:01 ` Andreas Müller
2019-10-18 22:19 ` Richard Purdie
2019-10-11 11:47 ` [PATCH 17/19] libmodulemd-v1: introduce the recipe Alexander Kanavin
2019-10-11 11:47 ` Alexander Kanavin [this message]
2019-10-11 11:47 ` [PATCH 19/19] createrepo-c: upgrade to 0.15.1 Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191011114754.91740-18-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.