[OE-core] [PATCHv2 4/7] testimage.bbclass: Make dependency of cpio when using RPMs
mariano.lopez at linux.intel.com
mariano.lopez at linux.intel.com
Mon Jun 6 07:15:42 UTC 2016
From: Mariano Lopez <mariano.lopez at linux.intel.com>
Exctraction of RPMs needs cpio, not all distros include cpio by
default, so we need to build it.
[YOCTO #8694]
(From OE-Core rev: 95cd427b3887b087533fba11c67ef9bc173f9aa5)
Signed-off-by: Mariano Lopez <mariano.lopez at linux.intel.com>
---
meta/classes/testexport.bbclass | 1 +
meta/classes/testimage.bbclass | 2 ++
2 files changed, 3 insertions(+)
diff --git a/meta/classes/testexport.bbclass b/meta/classes/testexport.bbclass
index 8046e29..a320880 100644
--- a/meta/classes/testexport.bbclass
+++ b/meta/classes/testexport.bbclass
@@ -24,6 +24,7 @@ TEST_TARGET_IP ?= ""
TEST_SERVER_IP ?= ""
TEST_EXPORT_DEPENDS = ""
+TEST_EXPORT_DEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
TEST_EXPORT_LOCK = "${TMPDIR}/testimage.lock"
python do_testexport() {
diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index a70d3a8..7fd0f62 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -68,6 +68,8 @@ TEST_TARGET ?= "qemu"
TESTIMAGEDEPENDS = ""
TESTIMAGEDEPENDS_qemuall = "qemu-native:do_populate_sysroot qemu-helper-native:do_populate_sysroot"
+TESTIMAGEDEPENDS += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
+TESTIMAGEDEPENDS_qemuall += "${@bb.utils.contains('IMAGE_PKGTYPE', 'rpm', 'cpio-native:do_populate_sysroot', '', d)}"
TESTIMAGELOCK = "${TMPDIR}/testimage.lock"
TESTIMAGELOCK_qemuall = ""
--
2.6.6
More information about the Openembedded-core
mailing list