diff mbox

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

Message ID 1484089899-29284-1-git-send-email-denis@denix.org
State New
Headers show

Commit Message

Denys Dmytriyenko Jan. 10, 2017, 11:11 p.m. UTC 
From: Denys Dmytriyenko <denys@ti.com>


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.

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>

---
 meta/recipes-kernel/linux/linux-dtb.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.7.4

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Denys Dmytriyenko Jan. 17, 2017, 5:26 p.m. UTC | #1 
Ping

On Tue, Jan 10, 2017 at 06:11:39PM -0500, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>

> 

> 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.

> 

> 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>

> ---

>  meta/recipes-kernel/linux/linux-dtb.inc | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc

> index 8528d64..2f378a1 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} /boot/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} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true

>  		done

> -- 

> 2.7.4

> 

> -- 

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Armin Kuster Jan. 18, 2017, 4:18 p.m. UTC | #2 
On 01/17/2017 09:26 AM, Denys Dmytriyenko wrote:
> Ping

in staging
- armin
>

> On Tue, Jan 10, 2017 at 06:11:39PM -0500, Denys Dmytriyenko wrote:

>> From: Denys Dmytriyenko <denys@ti.com>

>>

>> 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.

>>

>> 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>

>> ---

>>   meta/recipes-kernel/linux/linux-dtb.inc | 4 ++--

>>   1 file changed, 2 insertions(+), 2 deletions(-)

>>

>> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc

>> index 8528d64..2f378a1 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} /boot/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} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true

>>   		done

>> -- 

>> 2.7.4

>>

>> -- 

>> _______________________________________________

>> Openembedded-core mailing list

>> Openembedded-core@lists.openembedded.org

>> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox

Patch

diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 8528d64..2f378a1 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} /boot/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} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true
 		done