Patchwork gcc-package-target: don't fail if the .la files we try to delete are not there to start with

login
register
mail settings
Submitter Koen Kooi
Date July 18, 2011, 8:16 a.m.
Message ID <1310976967-7251-1-git-send-email-koen@dominion.thruhere.net>
Download mbox | patch
Permalink /patch/7757/
State New, archived
Headers show

Comments

Koen Kooi - July 18, 2011, 8:16 a.m.
This fixes:

| rm: cannot remove `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/image/usr/libexec/gcc/arm-angstrom-linux-gnueabi/4.5.4/*.la': No such file or directory
| ERROR: Function 'do_install' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/temp/log.do_install.19514 for further information)
NOTE: package gcc-4.5-r39.1+svnr175127: task do_install: Failed

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-devtools/gcc/gcc-package-target.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Koen Kooi - July 19, 2011, 8:46 a.m.
Any comments on this one?

Op 18 jul 2011, om 10:16 heeft Koen Kooi het volgende geschreven:

> This fixes:
> 
> | rm: cannot remove `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/image/usr/libexec/gcc/arm-angstrom-linux-gnueabi/4.5.4/*.la': No such file or directory
> | ERROR: Function 'do_install' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/temp/log.do_install.19514 for further information)
> NOTE: package gcc-4.5-r39.1+svnr175127: task do_install: Failed
> 
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-devtools/gcc/gcc-package-target.inc |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
> index 9a91a7f..e6105da 100644
> --- a/meta/recipes-devtools/gcc/gcc-package-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
> @@ -84,7 +84,7 @@ do_install () {
> 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
> 	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
> 	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
> -	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
> +	rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
> 
> 	# Hack around specs file assumptions
> 	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs
> -- 
> 1.6.6.1
>
Saul Wold - July 19, 2011, 6:17 p.m.
On 07/18/2011 01:16 AM, Koen Kooi wrote:
> This fixes:
>
> | rm: cannot remove `/OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/image/usr/libexec/gcc/arm-angstrom-linux-gnueabi/4.5.4/*.la': No such file or directory
> | ERROR: Function 'do_install' failed (see /OE/tentacle/build/tmp-angstrom_2010_x-eglibc/work/armv7a-angstrom-linux-gnueabi/gcc-4.5-r39.1+svnr175127/temp/log.do_install.19514 for further information)
> NOTE: package gcc-4.5-r39.1+svnr175127: task do_install: Failed
>
> Signed-off-by: Koen Kooi<koen@dominion.thruhere.net>
> ---
>   meta/recipes-devtools/gcc/gcc-package-target.inc |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
> index 9a91a7f..e6105da 100644
> --- a/meta/recipes-devtools/gcc/gcc-package-target.inc
> +++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
> @@ -84,7 +84,7 @@ do_install () {
>   	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
>   	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
>   	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
> -	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
> +	rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
>
>   	# Hack around specs file assumptions
>   	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs&&  sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs

Merged into OE-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-package-target.inc b/meta/recipes-devtools/gcc/gcc-package-target.inc
index 9a91a7f..e6105da 100644
--- a/meta/recipes-devtools/gcc/gcc-package-target.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-target.inc
@@ -84,7 +84,7 @@  do_install () {
 	# Cleanup some of the ${libdir}{,exec}/gcc stuff ...
 	rm -r ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
 	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/install-tools
-	rm -r ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
+	rm -rf ${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/*.la
 
 	# Hack around specs file assumptions
 	test -f ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs && sed -i -e '/^*cross_compile:$/ { n; s/1/0/; }' ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/specs