summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Christ <s.christ@phytec.de>2015-10-19 10:15:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:28 +0000
commit3a0bd40dfc6b359d771391bf4b8124600a811105 (patch)
treee10b17c815e9cee04b6bd7b51dc0babc49fb6307
parenta8793127134a4561123a262e121c38bbe48c1af2 (diff)
downloadpoky-3a0bd40dfc6b359d771391bf4b8124600a811105.tar.gz
linux-dtb.inc: use same variable name DTB for all elements of KERNEL_DEVICETREE
(From OE-Core rev: 1e9ac2c4970b2fc7f8ed939bce7cf0a5c7715ca3) Signed-off-by: Stefan Christ <s.christ@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-dtb.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 2e8ec3bf6c..173e945ef6 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -58,9 +58,9 @@ do_deploy_append() {
58 58
59pkg_postinst_kernel-devicetree () { 59pkg_postinst_kernel-devicetree () {
60 cd /${KERNEL_IMAGEDEST} 60 cd /${KERNEL_IMAGEDEST}
61 for DTB_FILE in ${KERNEL_DEVICETREE} 61 for DTB in ${KERNEL_DEVICETREE}
62 do 62 do
63 DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'` 63 DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'`
64 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` 64 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
65 update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true 65 update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
66 done 66 done
@@ -68,9 +68,9 @@ pkg_postinst_kernel-devicetree () {
68 68
69pkg_postrm_kernel-devicetree () { 69pkg_postrm_kernel-devicetree () {
70 cd /${KERNEL_IMAGEDEST} 70 cd /${KERNEL_IMAGEDEST}
71 for DTB_FILE in ${KERNEL_DEVICETREE} 71 for DTB in ${KERNEL_DEVICETREE}
72 do 72 do
73 DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'` 73 DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'`
74 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` 74 DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
75 update-alternatives --remove ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true 75 update-alternatives --remove ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
76 done 76 done