[2/2] image_types: use cpio-native to build cpio images

Message ID 20181129114215.4679-2-ross.burton@intel.com
State Accepted
Commit c3b9aedcbe538d7fa74bd814644b4899769dec46
Headers show
Series
  • [1/2] cpio: fix crash when appending to archives
Related show

Commit Message

Ross Burton Nov. 29, 2018, 11:42 a.m.
As per the previous commit, upstream cpio has a bug which means it crashes on
append. If the image being built has already had testimage ran then cpio-native
will be in the sysroot.  It's also possible that some distributions are shipping
this broken CVE patch too.

Now that our cpio-native is fixed, until we can be sure that the host cpio isn't
broken depend on cpio-native if building a cpio image.

[ YOCTO #13042 ]

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/classes/image_types.bbclass | 1 +
 1 file changed, 1 insertion(+)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 5c406481ef0..70bd3153067 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -239,6 +239,7 @@  EXTRA_IMAGECMD_ext4 ?= "-i 4096"
 EXTRA_IMAGECMD_btrfs ?= "-n 4096"
 EXTRA_IMAGECMD_f2fs ?= ""
 
+do_image_cpio[depends] += "cpio-native:do_populate_sysroot"
 do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot"
 do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
 do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot"