summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-19 16:08:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-21 11:54:14 +0000
commitf06d14b2963e9d5145041057c3ad0e48654f1501 (patch)
treebc926fa8a28d5e7cccb26816db96887c22ac53c1 /meta
parent1554c7c3a69e1996c2d901feb22be37aa85c42a5 (diff)
downloadpoky-f06d14b2963e9d5145041057c3ad0e48654f1501.tar.gz
libmodulemd: add a new recipe
This is a hard requirement of the new libdnf versions. (From OE-Core rev: 4b53d713523f56994beb4a7b5dbb3347c8713e42) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch21
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch65
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb21
3 files changed, 107 insertions, 0 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
new file mode 100644
index 0000000000..9465c38520
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch
@@ -0,0 +1,21 @@
1From 590bd5ec9f378ab727ee404bb32f615e1bbd15bf 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 spec_tmpl.sh | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/spec_tmpl.sh b/spec_tmpl.sh
13index 45009c3..307c0c2 100755
14--- a/spec_tmpl.sh
15+++ b/spec_tmpl.sh
16@@ -1,4 +1,4 @@
17-#!/usr/bin/sh
18+#!/bin/sh
19
20 version=$1
21 template=$2
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
new file mode 100644
index 0000000000..e94abd27c3
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch
@@ -0,0 +1,65 @@
1From b6c8039afe016d25c17cdf1b2462d6a53d49fad1 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/v1/meson.build: do not generate gir or gtkdoc
5
6Both 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---
12 meson.build | 1 -
13 modulemd/v1/meson.build | 20 --------------------
14 2 files changed, 21 deletions(-)
15
16diff --git a/meson.build b/meson.build
17index db7c6a1..e0ea61a 100644
18--- a/meson.build
19+++ b/meson.build
20@@ -49,7 +49,6 @@ gnome = import('gnome')
21 pkg = import('pkgconfig')
22 gobject = dependency('gobject-2.0')
23 yaml = dependency('yaml-0.1')
24-gtkdoc = dependency('gtk-doc')
25
26 spec_tmpl = find_program('spec_tmpl.sh')
27
28diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
29index 38e0d15..d59e519 100644
30--- a/modulemd/v1/meson.build
31+++ b/modulemd/v1/meson.build
32@@ -311,19 +311,6 @@ if valgrind.found()
33 timeout : 300)
34 endif
35
36-gnome.generate_gir(
37- modulemd_v1_lib,
38- sources : modulemd_v1_srcs + modulemd_v1_hdrs,
39- nsversion : '.'.join([libmodulemd_version_array[0], '0']),
40- namespace : 'Modulemd',
41- symbol_prefix : 'modulemd_',
42- identifier_prefix : 'Modulemd',
43- includes : [
44- 'GObject-2.0',
45- ],
46- install : true,
47- )
48-
49 xcdata = configuration_data()
50 xcdata.set('VERSION', libmodulemd_version)
51 configure_file(
52@@ -339,13 +326,6 @@ configure_file(
53 configuration : cdata
54 )
55
56-gnome.gtkdoc(
57- 'modulemd-1.0',
58- install_dir: 'modulemd-1.0',
59- src_dir : './',
60- main_xml : 'modulemd-docs.xml',
61- install : true)
62-
63 pkg.generate(
64 libraries : modulemd_v1_lib,
65 subdirs : v1_header_path,
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
new file mode 100644
index 0000000000..556478b5b7
--- /dev/null
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -0,0 +1,21 @@
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 "
9
10PV = "1.7.0"
11SRCREV = "9af3e7b4bec2f8daaa857fa668b858e484487710"
12
13S = "${WORKDIR}/git"
14
15inherit meson
16
17EXTRA_OEMESON = "-Ddeveloper_build=false"
18
19DEPENDS += "glib-2.0 libyaml"
20
21BBCLASSEXTEND = "native"