[morty/master][PATCH] external-linaro-toolchain: fix against upstream changes

[morty/master][PATCH] external-linaro-toolchain: fix against upstream changes

[Jacob Stiffler]

* Recent upstream changes cause bindir and sbindir to be removed if
  they are empty.
* The bbappend in this layer assumes these directories exist.
* This change removes that assumption.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
index 7648e36..e261259 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -133,6 +133,7 @@ do_install_append() {
 	sed -i -e "s# /lib/# ../../lib/#g" -e "s# /usr/lib/# ./#g" ${D}${libdir}/libpthread.so
 
 	if [ -d ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/libc/${bindir} ]; then
+		install -d ${D}${bindir}
 		cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/libc/${bindir}/* ${D}${bindir}
 	fi
 
@@ -161,5 +162,4 @@ do_install_append() {
 	${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/uapi/.install; rm -rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; rm -rf ${D}${includedir}/scsi/.install; rm -rf ${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; rm -rf ${D}${includedir}/scsi/cxlflash_ioctl.h; rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)}
 
 	rm ${D}${base_libdir}/*.spec
-	rmdir ${D}${sbindir}
 }
-- 
2.7.4

Re: [morty/master][PATCH] external-linaro-toolchain: fix against upstream changes

[Karthik Ramanan]

ACK.
I've verified that this resolves the problem.

On 10-Apr-17 5:55 PM, Jacob Stiffler wrote:
> * Recent upstream changes cause bindir and sbindir to be removed if
>    they are empty.
> * The bbappend in this layer assumes these directories exist.
> * This change removes that assumption.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>   meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
> index 7648e36..e261259 100644
> --- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
> +++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
> @@ -133,6 +133,7 @@ do_install_append() {
>   	sed -i -e "s# /lib/# ../../lib/#g" -e "s# /usr/lib/# ./#g" ${D}${libdir}/libpthread.so
>   
>   	if [ -d ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/libc/${bindir} ]; then
> +		install -d ${D}${bindir}
>   		cp -a ${TOOLCHAIN_PATH}/${ELT_TARGET_SYS}/libc/${bindir}/* ${D}${bindir}
>   	fi
>   
> @@ -161,5 +162,4 @@ do_install_append() {
>   	${@base_conditional('PREFERRED_PROVIDER_linux-libc-headers', 'external-linaro-toolchain', '', 'rm -rf ${D}${includedir}/uapi/.install; rm -rf ${D}${includedir}/misc/.install; rm -rf ${D}${includedir}/misc/cxl.h; rm -rf ${D}${includedir}/scsi/.install; rm -rf ${D}${includedir}/scsi/scsi_netlink*; rm -rf ${D}${includedir}/scsi/scsi_bsg*; rm -rf ${D}${includedir}/scsi/cxlflash_ioctl.h; rm -rf ${D}${includedir}/scsi/fc; rm -rf ${D}${includedir}/xen', d)}
>   
>   	rm ${D}${base_libdir}/*.spec
> -	rmdir ${D}${sbindir}
>   }