[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1095/8267] classes/kernel: fix symlink creation in DEPLOYDIR for bundled initramfs



commit 83444bbe2d59990ad7783c999fb942ed27e1fc28
Author: André Draszik <adraszik tycoint com>
Date:   Fri Jun 24 11:42:32 2016 +0100

    classes/kernel: fix symlink creation in DEPLOYDIR for bundled initramfs
    
    If multiple kernel image types have been specified, only the very first
    one would receive a symlink in DEPLOYDIR.
    
    The reason is that we're looping over the list of image types and check
    if a bundled initramfs images exists using a relative path. As part of
    the loop we're changing the current directory, hence all additional
    iterations fail to see the files we're looking for, and hence no symlinks
    are being created.
    
    Fix by not changing the directory and adjusting the ln invocation instead.
    
    (From OE-Core rev: 2a6ac8ca71b669b8653eb19417faf58575385a21)
    
    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.bbclass |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 59bbbe8..3127590 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -586,8 +586,7 @@ kernel_do_deploy() {
                        initramfs_base_name=${type}-${INITRAMFS_BASE_NAME}
                        initramfs_symlink_name=${type}-initramfs-${MACHINE}
                        install -m 0644 ${KERNEL_OUTPUT_DIR}/${type}.initramfs 
${DEPLOYDIR}/${initramfs_base_name}.bin
-                       cd ${DEPLOYDIR}
-                       ln -sf ${initramfs_base_name}.bin ${initramfs_symlink_name}.bin
+                       ln -sf ${initramfs_base_name}.bin ${DEPLOYDIR}/${initramfs_symlink_name}.bin
                fi
        done
 }


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