[oe-commits] [openembedded-core] 07/16: kernel: Ensure an initramfs is added if configured

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch thud
in repository openembedded-core.

commit 378f720090508d5c8c04f1b0265ba729f6ce827b
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Thu Feb 21 16:00:02 2019 +0000

    kernel: Ensure an initramfs is added if configured
    
    If ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.cpio does not exist,
    nor any of the compressed variants, nothing is copied to kernel build's
    ./usr directory.
    
    The code does not fail, but silently proceeds without a bundled initramfs.
    
    Change to fail and tell the user something is wrong.
    
    Also, if an initramfs is found, contrary to the comments, it does not stop
    at the first uncompressed/compressed cpio image found. Instead it keeps
    processing all so the last is used. Fix this to behave as per the comments.
    
    [YOCTO #12909]
    
    (Patch by Leon Woestenberg)
    
    (From OE-Core rev: 5b5604e288af755eb5553a97d26533445b2cf94b)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/classes/kernel.bbclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 45cb4fa..bd185e2 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -224,9 +224,11 @@ copy_initramfs() {
 				break
 				;;
 			esac
+			break
 		fi
 	done
-	echo "Finished copy of initramfs into ./usr"
+	# Verify that the above loop found a initramfs, fail otherwise
+	[ -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio ] && echo "Finished copy of initramfs into ./usr" || die "Could not find any ${DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.cpio{.gz|.lz4|.lzo|.lzma|.xz) for bundling; INITRAMFS_IMAGE_NAME might be wrong."
 }
 
 do_bundle_initramfs () {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.