diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-10-11 13:47:53 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:11 +0100 |
commit | 62c5b16d46e82dd1b63fb0b63a7c418183950236 (patch) | |
tree | 1fa1894e9162c4f8448c3c47916ccd96e16eac0d /meta/recipes-devtools/libmodulemd | |
parent | a0cf9a307ab074424ff571b5ce2e508acff3a2fb (diff) | |
download | poky-62c5b16d46e82dd1b63fb0b63a7c418183950236.tar.gz |
libmodulemd: remove the recipe
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.
(From OE-Core rev: e5bf0814f565458c1c13d305dfc80a70a060555e)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libmodulemd')
4 files changed, 0 insertions, 147 deletions
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 @@ | |||
1 | From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 6 Nov 2018 13:41:29 +0100 | ||
4 | Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | |||
9 | --- | ||
10 | spec_tmpl.sh | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/spec_tmpl.sh b/spec_tmpl.sh | ||
14 | index 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 @@ | |||
1 | From b651551134cf170038b3e01812e3767969506491 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 21 May 2019 17:59:26 +0200 | ||
4 | Subject: [PATCH] v1/meson.build: explicitly specify the v1 library in | ||
5 | pkgconfig | ||
6 | |||
7 | Otherwise there would be '-lmodulemd' which resolves | ||
8 | to v2 version if both v2 and v1 are present in the sysroot. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | modulemd/v1/meson.build | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build | ||
17 | index 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 @@ | |||
1 | From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 6 Nov 2018 13:43:00 +0100 | ||
4 | Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python | ||
5 | bindings | ||
6 | |||
7 | All of these really need a configuration option. | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-core specific] | ||
10 | Signed-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 | |||
18 | diff --git a/meson.build b/meson.build | ||
19 | index 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 | + | ||
36 | diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build | ||
37 | index 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 | - | ||
52 | diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build | ||
53 | index 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 @@ | |||
1 | SUMMARY = "C Library for manipulating module metadata files" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" | ||
4 | |||
5 | SRC_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 | |||
11 | PV = "2.6.0" | ||
12 | SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit meson gobject-introspection | ||
17 | |||
18 | EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true" | ||
19 | |||
20 | DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" | ||
21 | |||
22 | BBCLASSEXTEND = "native nativesdk" | ||
23 | |||
24 | GIR_MESON_OPTION = 'skip_introspection' | ||
25 | GIR_MESON_ENABLE_FLAG = 'false' | ||
26 | GIR_MESON_DISABLE_FLAG = 'true' | ||