linux-dtb: strip DTB extension properly in postinst/postrm

The use of awk -F "." in do_install/do_deploy to strip filename extension
was deprecated long time ago in 72980d5bb465f0640ed451d1ebb9c5d2a210ad0c.

Make a similar change in postinst/postrm to properly use basename command.

Otherwise DTB files that contain dots in the name result in broken symlinks
that point to non-existent truncated files.

(From OE-Core rev: 40c2addf0f0ee16b1c1334cf00f1490ffeaac475)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 668f6342b5..0e720934bb 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -68,7 +68,7 @@ pkg_postinst_kernel-devicetree () {
                 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
                         symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
                         DTB_EXT=${DTB##*.}
-                        DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'`
+                        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
                         DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
                         update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true
                 done
@@ -81,7 +81,7 @@ pkg_postrm_kernel-devicetree () {
                 for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
                         symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME}
                         DTB_EXT=${DTB##*.}
-                        DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'`
+                        DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
                         DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
                         update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true
                 done