diff options
author | Ross Burton <ross.burton@intel.com> | 2018-11-29 11:42:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-25 22:27:46 +0000 |
commit | 5d249ac250e50e8e0f8f33ac34fc2eeb23ca1b5e (patch) | |
tree | 0cd86a5bc4c169312f17c734644b442b3d8e657f /meta | |
parent | ac03a57bf3a616bd2039e9e0c87a4a50e4e02667 (diff) | |
download | poky-5d249ac250e50e8e0f8f33ac34fc2eeb23ca1b5e.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)
(From OE-Core rev: 9e1c69932add702b9c5bc1faa9ef5db975de0ee3)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image_types.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 00a00d318f..2c8ee29706 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -239,6 +239,7 @@ EXTRA_IMAGECMD_ext4 ?= "-i 4096" | |||
239 | EXTRA_IMAGECMD_btrfs ?= "-n 4096" | 239 | EXTRA_IMAGECMD_btrfs ?= "-n 4096" |
240 | EXTRA_IMAGECMD_f2fs ?= "" | 240 | EXTRA_IMAGECMD_f2fs ?= "" |
241 | 241 | ||
242 | do_image_cpio[depends] += "cpio-native:do_populate_sysroot" | ||
242 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" | 243 | do_image_jffs2[depends] += "mtd-utils-native:do_populate_sysroot" |
243 | do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" | 244 | do_image_cramfs[depends] += "util-linux-native:do_populate_sysroot" |
244 | do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot" | 245 | do_image_ext2[depends] += "e2fsprogs-native:do_populate_sysroot" |