summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.28.1.bb2
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch60
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch22
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb26
4 files changed, 109 insertions, 1 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
index 4ff294c32c..3f11e0231f 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
@@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native" 16DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native"
17 17
18inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base 18inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base
19 19
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 @@
1From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Sep 2019 17:07:00 +0200
4Subject: [PATCH] Do not generate gtkdoc or python bindings
5
6All of these really need a configuration option.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-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
15diff --git a/meson.build b/meson.build
16index 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 != ''
45diff --git a/modulemd/meson.build b/modulemd/meson.build
46index 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 @@
1From 4e67f6049b3f822fe6f5af46790a51ace581bf82 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 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 @@
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;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
10PV = "1.8.15"
11SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
12UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
13
14S = "${WORKDIR}/git"
15
16inherit meson gobject-introspection
17
18EXTRA_OEMESON = "-Ddeveloper_build=false"
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'