diff options
author | Ross Burton <ross.burton@intel.com> | 2018-11-29 11:42:15 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-12-01 11:38:36 +0000 |
commit | 66dadb754f887f10c373858bdb3156c4c5ff4bd9 (patch) | |
tree | 8a700596dce806a32060e1c514b8820bb7b7a2e3 /meta/classes | |
parent | 572990892e22b4e31345d370053ad6f875071b59 (diff) | |
download | poky-66dadb754f887f10c373858bdb3156c4c5ff4bd9.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)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-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 5c406481ef..70bd315306 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" |