From 9bdffab95edf0606d23b81850c342d794bae24b0 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Sep 2014 14:02:15 +0200 Subject: [PATCH] No rpmresolve for RPM 4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit RPM 4 doesn't support rpmresolve so we need to remove this feature to build images. Change-Id: I7ce60f3035d33b402ad866c57b1cf28914380275 Signed-off-by: Kévin THIERRY --- classes/metatizen.bbclass | 10 ++++++++++ conf/layer.conf | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 classes/metatizen.bbclass diff --git a/classes/metatizen.bbclass b/classes/metatizen.bbclass new file mode 100644 index 0000000..144e993 --- /dev/null +++ b/classes/metatizen.bbclass @@ -0,0 +1,10 @@ +python () { + if bb.data.inherits_class('rootfs_rpm', d): + rootfsdepends = d.getVarFlag("do_rootfs", "depends", True) + rootfsdepends = rootfsdepends.replace("rpmresolve-native:do_populate_sysroot", "") + d.setVarFlag("do_rootfs", "depends", rootfsdepends) + if bb.data.inherits_class('image-live', d): + bootimgdepends = d.getVarFlag("do_bootimg", "depends", True) + bootimgdepends = bootimgdepends.replace(d.expand("${INITRD_IMAGE}:do_rootfs"), "") + d.setVarFlag("do_bootimg", "depends", bootimgdepends) +} diff --git a/conf/layer.conf b/conf/layer.conf index 390dbb5..6b73e0d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -51,4 +51,6 @@ PREFERRED_VERSION_libav = "9.13" PREFERRED_VERSION_linux-yocto = "3.14.4+git%" -WESTONSTARTUP ??= "weston-common" \ No newline at end of file +WESTONSTARTUP ??= "weston-common" + +INHERIT += "metatizen" -- 2.7.4