diff options
author | Denys Dmytriyenko <denys@ti.com> | 2017-01-10 18:11:39 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-03 09:51:32 +0000 |
commit | 28b0f21342d1785578a04c06c0a2a0e7ea239113 (patch) | |
tree | 0639efc3c8456b2dc2b82bc46be7af5f50598470 /meta/recipes-kernel | |
parent | 6e4393670438df0b4d5dddfbe2b05297217be9e0 (diff) | |
download | poky-28b0f21342d1785578a04c06c0a2a0e7ea239113.tar.gz |
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: ed0f9cf63cb1226f9d92377e13ef63e36a95d29d)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(From OE-Core rev: 40c2addf0f0ee16b1c1334cf00f1490ffeaac475)
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-dtb.inc | 4 |
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 8528d646dd..2f378a1db0 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 () { | |||
68 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do | 68 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do |
69 | symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} | 69 | symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} |
70 | DTB_EXT=${DTB##*.} | 70 | DTB_EXT=${DTB##*.} |
71 | DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` | 71 | DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` |
72 | DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` | 72 | DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` |
73 | update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true | 73 | update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true |
74 | done | 74 | done |
@@ -81,7 +81,7 @@ pkg_postrm_kernel-devicetree () { | |||
81 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do | 81 | for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do |
82 | symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} | 82 | symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} |
83 | DTB_EXT=${DTB##*.} | 83 | DTB_EXT=${DTB##*.} |
84 | DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` | 84 | DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` |
85 | DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` | 85 | DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` |
86 | update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true | 86 | update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true |
87 | done | 87 | done |