summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <adraszik@tycoint.com>2016-06-24 11:42:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-01 16:22:43 +0100
commit83444bbe2d59990ad7783c999fb942ed27e1fc28 (patch)
tree5d56580cc2ddfde13931eb92b6ff7263b7d6ecae /meta
parentdc1b016636d9e2c9d0e0bb624e8577cf53ca295d (diff)
downloadopenembedded-core-contrib-83444bbe2d59990ad7783c999fb942ed27e1fc28.tar.gz
openembedded-core-contrib-83444bbe2d59990ad7783c999fb942ed27e1fc28.tar.bz2
openembedded-core-contrib-83444bbe2d59990ad7783c999fb942ed27e1fc28.zip
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 59bbbe8ad5..3127590480 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
}