summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-10-21 15:38:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commitdcf52753abcf494f70323140a5d276228e260c91 (patch)
tree74c7b4d1319d7d20f5c6467c745d06e393b872fd /meta
parent66b6ddf80cc3827ed2ae024ff26c45517bcfecec (diff)
downloadpoky-dcf52753abcf494f70323140a5d276228e260c91.tar.gz
kernel-devicetree: Cope with non-standard kernel deploy subdirectory
kernel.bbclass installs non-standard kernels (where KERNEL_PACKAGE_NAME is not "kernel") in a subdirectory of ${DEPLOYDIR}. To achieve this kernel_do_deploy sets the deployDir shell variable to ${DEPLOYDIR} for the standard kernel or ${DEPLOYDIR}/${KERNEL_DEPLOYSUBDIR} for non-standard kernels. kernel-devicetree.bbclass's do_deploy_append ought to do the same and can do so by using the same shell variable. (From OE-Core rev: db5752911fe085337b9d3d4af85f89a0c664388e) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel-devicetree.bbclass20
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/classes/kernel-devicetree.bbclass b/meta/classes/kernel-devicetree.bbclass
index 8a81c850fd..522c46575d 100644
--- a/meta/classes/kernel-devicetree.bbclass
+++ b/meta/classes/kernel-devicetree.bbclass
@@ -71,23 +71,23 @@ do_deploy_append() {
71 dtb=`normalize_dtb "$dtbf"` 71 dtb=`normalize_dtb "$dtbf"`
72 dtb_ext=${dtb##*.} 72 dtb_ext=${dtb##*.}
73 dtb_base_name=`basename $dtb .$dtb_ext` 73 dtb_base_name=`basename $dtb .$dtb_ext`
74 install -d ${DEPLOYDIR} 74 install -d $deployDir
75 install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext 75 install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
76 ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name.$dtb_ext 76 ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
77 ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext 77 ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
78 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do 78 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
79 if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then 79 if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
80 cat ${D}/${KERNEL_IMAGEDEST}/$type \ 80 cat ${D}/${KERNEL_IMAGEDEST}/$type \
81 ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ 81 $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
82 > ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin 82 > $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
83 ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ 83 ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
84 ${DEPLOYDIR}/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin 84 $deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
85 if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then 85 if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
86 cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \ 86 cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \
87 ${DEPLOYDIR}/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \ 87 $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
88 > ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin 88 > $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
89 ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \ 89 ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
90 ${DEPLOYDIR}/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin 90 $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
91 fi 91 fi
92 fi 92 fi
93 done 93 done