[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7873/8267] kernel-uboot: support compressed kernel on MIPS



commit 0dff25481fb1f222d32e155dd17f7b27d9de6a56
Author: André Draszik <adraszik tycoint com>
Date:   Wed Sep 20 10:41:56 2017 +0100

    kernel-uboot: support compressed kernel on MIPS
    
    MIPS generates vmlinuz.bin when compression in the kernel build is
    enabled, including any necessary objcopy so we can leverage that
    and skip our manual invocation of objcopy here. We just have to
    put the file into the right place for the rest of the build to
    find it.
    
    (From OE-Core rev: 00bc7682473c2558d72ba42c182f8e3bd445f8af)
    
    Signed-off-by: André Draszik <adraszik tycoint com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/kernel-uboot.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass
index 868e97d..87f0265 100644
--- a/meta/classes/kernel-uboot.bbclass
+++ b/meta/classes/kernel-uboot.bbclass
@@ -3,13 +3,19 @@ uboot_prep_kimage() {
                vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
                linux_suffix=""
                linux_comp="none"
+       elif [ -e arch/${ARCH}/boot/vmlinuz.bin ]; then
+               rm -f linux.bin
+               cp -l arch/${ARCH}/boot/vmlinuz.bin linux.bin
+               vmlinux_path=""
+               linux_suffix=""
+               linux_comp="none"
        else
                vmlinux_path="vmlinux"
                linux_suffix=".gz"
                linux_comp="gzip"
        fi
 
-       ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
+       [ -n "${vmlinux_path}" ] && ${OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
 
        if [ "${linux_comp}" != "none" ] ; then
                gzip -9 linux.bin


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]