]> code.ossystems Code Review - openembedded-core.git/commitdiff
kernel.bbclass: add lz4 dependency and fix the call to lz4
authorTimon Ulrich <t.ulrich@anapur.de>
Fri, 3 Jul 2020 12:39:40 +0000 (14:39 +0200)
committerSteve Sakoman <steve@sakoman.com>
Sat, 11 Jul 2020 03:11:12 +0000 (17:11 -1000)
If the initramfs image is type lz4, then a native lz4 is needed.

Additionally an output filename needs to be specified when calling lz4,
otherwise STDOUT will be used implicitly.

Signed-off-by: Timon Ulrich <t.ulrich@anapur.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c83a7aec59defbbc049d44ba34a7a409ada4fa19)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/classes/kernel.bbclass

index 6d07b29e2daf1c443b4fcff14e7e858af2ad9811..9e3c34ad481bf8d39b95f8073f35e9bf31722dbe 100644 (file)
@@ -5,6 +5,7 @@ KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel")
 
 PROVIDES += "${@ "virtual/kernel" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else "" }"
 DEPENDS += "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}gcc kmod-native bc-native lzop-native bison-native"
+DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
 PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
 
 do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot"
@@ -210,7 +211,7 @@ copy_initramfs() {
                                ;;
                        *lz4)
                                echo "lz4 decompressing image"
-                               lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
+                               lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
                                break
                                ;;
                        *lzo)