From 5a4c73bd3f2bbba2ad5413367fa7ca2f625ffdd7 Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Mon, 6 Jun 2016 07:15:42 +0000 Subject: testimage.bbclass: Make dependency of cpio when using RPMs 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 Signed-off-by: Richard Purdie --- 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 8046e29655..a3208806bc 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 a70d3a885e..7fd0f62469 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 = "" -- cgit 1.2.3-korg