summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb4
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch22
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch28
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch71
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb26
6 files changed, 2 insertions, 150 deletions
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 7a9d55c5c3..d85e5b697f 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>"
355RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>" 355RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
356RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>" 356RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
357RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>" 357RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
358RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
359RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>" 358RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
360RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>" 359RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
361RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>" 360RECIPE_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 ae0a35da84..dc1b851b2d 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"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm libmodulemd" 15DEPENDS = "expat curl glib-2.0 libxml2 openssl bzip2 zlib file sqlite3 xz rpm"
16DEPENDS_append_class-native = " file-replacement-native" 16DEPENDS_append_class-native = " file-replacement-native"
17 17
18inherit cmake pkgconfig bash-completion distutils3-base 18inherit cmake pkgconfig bash-completion distutils3-base
19 19
20EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF" 20EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 -DWITH_ZCHUNK=OFF -DENABLE_DRPM=OFF -DWITH_LIBMODULEMD=OFF"
21 21
22BBCLASSEXTEND = "native nativesdk" 22BBCLASSEXTEND = "native nativesdk"
23 23
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 2598c177c4..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:41:29 +0100
4Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9---
10 spec_tmpl.sh | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/spec_tmpl.sh b/spec_tmpl.sh
14index 14e895a..fc80fc6 100755
15--- a/spec_tmpl.sh
16+++ b/spec_tmpl.sh
17@@ -1,4 +1,4 @@
18-#!/usr/bin/sh
19+#!/bin/sh
20
21 version=$1
22 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 1568d25f9d..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 21 May 2019 17:59:26 +0200
4Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in
5 pkgconfig
6
7Otherwise there would be '-lmodulemd' which resolves
8to v2 version if both v2 and v1 are present in the sysroot.
9
10Upstream-Status: Pending
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 modulemd/v1/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
17index 4d54e69..9144ca2 100644
18--- a/modulemd/v1/meson.build
19+++ b/modulemd/v1/meson.build
20@@ -325,7 +325,7 @@ configure_file(
21 )
22
23 pkg.generate(
24- libraries : modulemd_v1_lib,
25+ libraries : '-l:libmodulemd.so.1',
26 subdirs : v1_header_path,
27 version : libmodulemd_v1_version,
28 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 0b7535624c..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:43:00 +0100
4Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
5 bindings
6
7All of these really need a configuration option.
8
9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12---
13 meson.build | 3 +--
14 modulemd/v1/meson.build | 8 --------
15 modulemd/v2/meson.build | 12 ------------
16 3 files changed, 1 insertion(+), 22 deletions(-)
17
18diff --git a/meson.build b/meson.build
19index 5a0cd3d..f51b16e 100644
20--- a/meson.build
21+++ b/meson.build
22@@ -52,7 +52,6 @@ gnome = import('gnome')
23 pkg = import('pkgconfig')
24 gobject = dependency('gobject-2.0')
25 yaml = dependency('yaml-0.1')
26-gtkdoc = dependency('gtk-doc')
27
28 sh = find_program('sh')
29 sed = find_program('sed')
30@@ -127,4 +126,4 @@ configure_file(
31 )
32
33 subdir('modulemd')
34-subdir('bindings/python')
35+
36diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
37index ddc95a1..e85fafd 100644
38--- a/modulemd/v1/meson.build
39+++ b/modulemd/v1/meson.build
40@@ -356,11 +356,3 @@ configure_file(
41 configuration : xcdata
42 )
43
44-gnome.gtkdoc(
45- 'modulemd-1.0',
46- install_dir: 'modulemd-1.0',
47- src_dir : './modulemd/v1',
48- main_xml : 'modulemd-v1-docs.xml',
49- install : true,
50-)
51-
52diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
53index 93c7fbd..0d9ed24 100644
54--- a/modulemd/v2/meson.build
55+++ b/modulemd/v2/meson.build
56@@ -285,15 +285,3 @@ configure_file(
57 configuration : xcdata
58 )
59
60-gnome.gtkdoc(
61- 'modulemd-2.0',
62- install_dir: 'modulemd-2.0',
63- src_dir : './modulemd/v2',
64- main_xml : 'modulemd-v2-docs.xml',
65- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'),
66- dependencies : [
67- modulemd_v2_dep,
68- ],
69- install : true,
70-)
71-
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
deleted file mode 100644
index 63d3fad6ab..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "C Library for manipulating module metadata files"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
4
5SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
6 file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
7 file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
8 file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
9 "
10
11PV = "2.6.0"
12SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
13
14S = "${WORKDIR}/git"
15
16inherit meson gobject-introspection
17
18EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true"
19
20DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
21
22BBCLASSEXTEND = "native nativesdk"
23
24GIR_MESON_OPTION = 'skip_introspection'
25GIR_MESON_ENABLE_FLAG = 'false'
26GIR_MESON_DISABLE_FLAG = 'true'