diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-devtools/libmodulemd | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/libmodulemd')
3 files changed, 119 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch new file mode 100644 index 0000000000..2598c177c4 --- /dev/null +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch @@ -0,0 +1,22 @@ +From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 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 14e895a..fc80fc6 100755 +--- a/spec_tmpl.sh ++++ b/spec_tmpl.sh +@@ -1,4 +1,4 @@ +-#!/usr/bin/sh ++#!/bin/sh + + version=$1 + libmodulemd_v1_version=$2 diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch new file mode 100644 index 0000000000..a3e62bf52c --- /dev/null +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch @@ -0,0 +1,67 @@ +From b77c9c3d07430b014b2d1bff42027f483c81f15a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 6 Nov 2018 13:43:00 +0100 +Subject: [PATCH] modulemd/v[12]/meson.build: 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 | 3 +-- + modulemd/v1/meson.build | 8 -------- + modulemd/v2/meson.build | 8 -------- + 3 files changed, 1 insertion(+), 18 deletions(-) + +diff --git a/meson.build b/meson.build +index 228bd34..a1e60bb 100644 +--- a/meson.build ++++ b/meson.build +@@ -52,7 +52,6 @@ gnome = import('gnome') + pkg = import('pkgconfig') + gobject = dependency('gobject-2.0') + yaml = dependency('yaml-0.1') +-gtkdoc = dependency('gtk-doc') + + sh = find_program('sh') + sed = find_program('sed') +@@ -110,4 +109,4 @@ configure_file( + ) + + subdir('modulemd') +-subdir('bindings/python') ++ +diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build +index 74db89a..4d54e69 100644 +--- a/modulemd/v1/meson.build ++++ b/modulemd/v1/meson.build +@@ -341,11 +341,3 @@ configure_file( + configuration : xcdata + ) + +-gnome.gtkdoc( +- 'modulemd-1.0', +- install_dir: 'modulemd-1.0', +- src_dir : './modulemd/v1', +- main_xml : 'modulemd-v1-docs.xml', +- install : true, +-) +- +diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build +index 7b94e0c..c5f72b9 100644 +--- a/modulemd/v2/meson.build ++++ b/modulemd/v2/meson.build +@@ -530,11 +530,3 @@ configure_file( + configuration : xcdata + ) + +-gnome.gtkdoc( +- 'modulemd-2.0', +- install_dir: 'modulemd-2.0', +- src_dir : './modulemd/v2', +- main_xml : 'modulemd-v2-docs.xml', +- install : true, +-) +- diff --git a/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb new file mode 100644 index 0000000000..87e92114c8 --- /dev/null +++ b/poky/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -0,0 +1,30 @@ +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 \ + file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ + file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \ + " + +PV = "2.1.0" +SRCREV = "072e6ee791fe7822a6d423bdac7e4a5cbb118bce" + +S = "${WORKDIR}/git" + +inherit meson gobject-introspection + +EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false" + +DEPENDS += "glib-2.0 libyaml glib-2.0-native" + +BBCLASSEXTEND = "native nativesdk" + +GI_ENABLE_FLAG = "-Dskip_introspection=false" +GI_DISABLE_FLAG = "-Dskip_introspection=true" + +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" +EXTRA_OEMESON_append_class-native = " ${GI_DISABLE_FLAG}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " |