summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2016-12-01 00:36:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-11 17:21:44 +0000
commit2d74e262288683433dc60d65e166b8f874a26591 (patch)
tree1b3c27c14d8bca3a812abb08f28ec9722d9f4404 /meta/classes
parent1dcc0ab902ff8140d5b5eb05451087976bb5f2a3 (diff)
downloadpoky-2d74e262288683433dc60d65e166b8f874a26591.tar.gz
kernel.bbclass: allow uncompressed initramfs archives
The code failed to copy the initramfs in case it was a plain cpio archive. (From OE-Core rev: 7dbdb4ea91aa027866da2bd46c65fe65a25c848f) (From OE-Core rev: 0d65292296ed9fb82e7bfbcca42d4b7a39ba6ca9) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> 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/kernel.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 25a153cd20..4aeeacb1b9 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -165,7 +165,7 @@ copy_initramfs() {
165 mkdir -p ${B}/usr 165 mkdir -p ${B}/usr
166 # Find and use the first initramfs image archive type we find 166 # Find and use the first initramfs image archive type we find
167 rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio 167 rm -f ${B}/usr/${INITRAMFS_IMAGE}-${MACHINE}.cpio
168 for img in cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz; do 168 for img in cpio cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz; do
169 if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then 169 if [ -e "${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img" ]; then
170 cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img ${B}/usr/. 170 cp ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE}-${MACHINE}.$img ${B}/usr/.
171 case $img in 171 case $img in