summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-11-29 11:42:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:43 +0000
commitf3205c7e24de4016a16d0ff39c8ea8ac6fdc526c (patch)
treef02d6b47e6b4388e8fa0c487cdfd575ec658c2b8 /meta/classes
parentcfee41c482beb1d680d1eb038115f1f5b68abf9b (diff)
downloadpoky-f3205c7e24de4016a16d0ff39c8ea8ac6fdc526c.tar.gz
image_types: use cpio-native to build cpio images
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 ] (From OE-Core rev: c3b9aedcbe538d7fa74bd814644b4899769dec46) (From OE-Core rev: a75eba71145efa1c3d206c5e5c00608a50f013bc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image_types.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 05e5b0a2e0..0a69542fcc 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -239,6 +239,7 @@ EXTRA_IMAGECMD_ext4 ?= "-i 4096"
239EXTRA_IMAGECMD_btrfs ?= "-n 4096" 239EXTRA_IMAGECMD_btrfs ?= "-n 4096"
240EXTRA_IMAGECMD_f2fs ?= "" 240EXTRA_IMAGECMD_f2fs ?= ""
241 241
242do_image_cpio[depends] += "cpio-native:do_populate_sysroot"
242do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" 243do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot"
243do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" 244do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot"
244do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot" 245do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot"