diff options
| author |   Mariano Lopez <mariano.lopez@linux.intel.com> | 2016-06-06 07:15:42 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-07 15:22:38 +0100 |
| commit | cfe3efd7304b6473574f016650df56dcb0e2ca3c (patch) | |
| tree | 81506ba213c22687c220ee901d5d895b6053936d /meta/classes | |
| parent | 938f05333b94e91a628c940588e2bafc88b8bdef (diff) | |
| download | openembedded-core-contrib-cfe3efd7304b6473574f016650df56dcb0e2ca3c.tar.gz | |
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)
(From OE-Core rev: 5a4c73bd3f2bbba2ad5413367fa7ca2f625ffdd7)
Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/testexport.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/testimage.bbclass | 2 |
2 files changed, 3 insertions, 0 deletions
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 = "" |