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>
This commit is contained in:
Alexander Kanavin
2019-10-11 13:47:52 +02:00
committed by Richard Purdie
parent a0a49bba6d
commit a0cf9a307a
5 changed files with 110 additions and 1 deletions

View File

@@ -356,6 +356,7 @@ RECIPE_MAINTAINER_pn-libmnl = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmpc = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-libmodule-build-perl = "Tim Orling <timothy.t.orling@linux.intel.com>"
RECIPE_MAINTAINER_pn-libmodulemd = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libmodulemd-v1 = "Alexander Kanavin <alex.kanavin@gmail.com>"
RECIPE_MAINTAINER_pn-libnewt = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnewt-python = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-libnl = "Alexander Kanavin <alex.kanavin@gmail.com>"

View File

@@ -13,7 +13,7 @@ SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
S = "${WORKDIR}/git"
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native"
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd-v1 json-c swig-native"
inherit gtk-doc gobject-introspection cmake pkgconfig distutils3-base

View File

@@ -0,0 +1,60 @@
From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 6 Sep 2019 17:07:00 +0200
Subject: [PATCH] Do not generate gtkdoc or python bindings
All of these really need a configuration option.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 12 ------------
modulemd/meson.build | 8 --------
2 files changed, 20 deletions(-)
diff --git a/meson.build b/meson.build
index 155c9e7..fe35d5e 100644
--- a/meson.build
+++ b/meson.build
@@ -51,25 +51,13 @@ gnome = import('gnome')
pkg = import('pkgconfig')
gobject = dependency('gobject-2.0')
yaml = dependency('yaml-0.1')
-gtkdoc = dependency('gtk-doc')
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
sh = find_program('sh')
sed = find_program('sed')
test = find_program('test')
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GLib.')
-endif
-
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GObject.')
-endif
-
python_name = get_option('python_name')
if python_name != ''
diff --git a/modulemd/meson.build b/modulemd/meson.build
index 9a164b5..349c982 100644
--- a/modulemd/meson.build
+++ b/modulemd/meson.build
@@ -523,11 +523,3 @@ configure_file(
configuration : xcdata
)
-gnome.gtkdoc(
- 'modulemd-1.0',
- install_dir: 'modulemd-1.0',
- src_dir : './modulemd',
- main_xml : 'modulemd-docs.xml',
- install : true,
-)
-

View File

@@ -0,0 +1,22 @@
From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 6 Nov 2018 13:41:29 +0100
Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
spec_tmpl.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spec_tmpl.sh b/spec_tmpl.sh
index 0238087..126853c 100755
--- a/spec_tmpl.sh
+++ b/spec_tmpl.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#!/bin/sh
version=$1
template=$2

View File

@@ -0,0 +1,26 @@
SUMMARY = "C Library for manipulating module metadata files"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
"
PV = "1.8.15"
SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
S = "${WORKDIR}/git"
inherit meson gobject-introspection
EXTRA_OEMESON = "-Ddeveloper_build=false"
DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
BBCLASSEXTEND = "native nativesdk"
GIR_MESON_OPTION = 'skip_introspection'
GIR_MESON_ENABLE_FLAG = 'false'
GIR_MESON_DISABLE_FLAG = 'true'