diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-10-11 13:47:52 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-15 14:16:11 +0100 |
commit | a0cf9a307ab074424ff571b5ce2e508acff3a2fb (patch) | |
tree | 7c02f4652fe2f6da53107d673973f3c54998a1a6 /meta/recipes-devtools/libmodulemd | |
parent | a0a49bba6dc84c7e6b0e57199aeb087379318acd (diff) | |
download | poky-a0cf9a307ab074424ff571b5ce2e508acff3a2fb.tar.gz |
libmodulemd-v1: introduce the recipe
Upstream has split version 1 of the libmodulemd recipe into
its own branch and removed version 1 from the master
branch and 2.x releases; as libdnf requires v1 of libmodulemd,
this commit introduces a v1-specific revipe.
(From OE-Core rev: e0678765b1fb66df6ec37da1d32836bee2237af1)
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')
3 files changed, 108 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch new file mode 100644 index 0000000000..d950ad5867 --- /dev/null +++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 6 Sep 2019 17:07:00 +0200 | ||
4 | Subject: [PATCH] Do not generate gtkdoc or python bindings | ||
5 | |||
6 | All of these really need a configuration option. | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe-core specific] | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | meson.build | 12 ------------ | ||
12 | modulemd/meson.build | 8 -------- | ||
13 | 2 files changed, 20 deletions(-) | ||
14 | |||
15 | diff --git a/meson.build b/meson.build | ||
16 | index 155c9e7..fe35d5e 100644 | ||
17 | --- a/meson.build | ||
18 | +++ b/meson.build | ||
19 | @@ -51,25 +51,13 @@ gnome = import('gnome') | ||
20 | pkg = import('pkgconfig') | ||
21 | gobject = dependency('gobject-2.0') | ||
22 | yaml = dependency('yaml-0.1') | ||
23 | -gtkdoc = dependency('gtk-doc') | ||
24 | |||
25 | glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') | ||
26 | -glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') | ||
27 | |||
28 | sh = find_program('sh') | ||
29 | sed = find_program('sed') | ||
30 | test = find_program('test') | ||
31 | |||
32 | -ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) | ||
33 | -if ret.returncode() != 0 | ||
34 | - error('Missing documentation for GLib.') | ||
35 | -endif | ||
36 | - | ||
37 | -ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) | ||
38 | -if ret.returncode() != 0 | ||
39 | - error('Missing documentation for GObject.') | ||
40 | -endif | ||
41 | - | ||
42 | python_name = get_option('python_name') | ||
43 | |||
44 | if python_name != '' | ||
45 | diff --git a/modulemd/meson.build b/modulemd/meson.build | ||
46 | index 9a164b5..349c982 100644 | ||
47 | --- a/modulemd/meson.build | ||
48 | +++ b/modulemd/meson.build | ||
49 | @@ -523,11 +523,3 @@ configure_file( | ||
50 | configuration : xcdata | ||
51 | ) | ||
52 | |||
53 | -gnome.gtkdoc( | ||
54 | - 'modulemd-1.0', | ||
55 | - install_dir: 'modulemd-1.0', | ||
56 | - src_dir : './modulemd', | ||
57 | - main_xml : 'modulemd-docs.xml', | ||
58 | - install : true, | ||
59 | -) | ||
60 | - | ||
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch new file mode 100644 index 0000000000..847b5f700b --- /dev/null +++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | From 4e67f6049b3f822fe6f5af46790a51ace581bf82 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 0238087..126853c 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 | template=$2 | ||
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb new file mode 100644 index 0000000000..9790470f4f --- /dev/null +++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb | |||
@@ -0,0 +1,26 @@ | |||
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;branch=1.x-maint \ | ||
6 | file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ | ||
7 | file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \ | ||
8 | " | ||
9 | |||
10 | PV = "1.8.15" | ||
11 | SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5" | ||
12 | UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)" | ||
13 | |||
14 | S = "${WORKDIR}/git" | ||
15 | |||
16 | inherit meson gobject-introspection | ||
17 | |||
18 | EXTRA_OEMESON = "-Ddeveloper_build=false" | ||
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' | ||