Patchwork [1/1] gcc-cross: aviod creating invalid symlinks

login
register
mail settings
Submitter Robert Yang
Date March 14, 2012, 9:13 a.m.
Message ID <34489f7f0d7f0457df45e2ee4606b51a09ed1704.1331716010.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/23283/
State Accepted
Commit 7893e74311e53882d8f93ecb95a6bd9f5b14651e
Headers show

Comments

Robert Yang - March 14, 2012, 9:13 a.m.
There are several invalid symlinks in gcc-cross-initial,
gcc-cross-intermediate and gcc-cross, these cause the error:(56 errors)

tmp/work/i586-poky-linux/gcc-cross-initial-4.6.3+svnr184847-r23/temp/log.do_populate_sysroot:
log.do_populate_sysroot:grep: /path/to/invalid/symlink: No such file or directory

Avoid creating invalid symlinks would fix this problem.

Use the:
[ ! -e file ] || do_something
But not use:
[ -e file ] && do_something
is because that if the "file" doesn't exist, then the whole statement
would return false, and bitbake treats this an error, so use the "||" to
let it always be true.

[YOCTO #2095]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
 meta/recipes-devtools/gcc/gcc-package-cross.inc    |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
Richard Purdie - March 14, 2012, 3:26 p.m.
On Wed, 2012-03-14 at 17:13 +0800, Robert Yang wrote:
> There are several invalid symlinks in gcc-cross-initial,
> gcc-cross-intermediate and gcc-cross, these cause the error:(56 errors)
> 
> tmp/work/i586-poky-linux/gcc-cross-initial-4.6.3+svnr184847-r23/temp/log.do_populate_sysroot:
> log.do_populate_sysroot:grep: /path/to/invalid/symlink: No such file or directory
> 
> Avoid creating invalid symlinks would fix this problem.
> 
> Use the:
> [ ! -e file ] || do_something
> But not use:
> [ -e file ] && do_something
> is because that if the "file" doesn't exist, then the whole statement
> would return false, and bitbake treats this an error, so use the "||" to
> let it always be true.
> 
> [YOCTO #2095]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
>  meta/recipes-devtools/gcc/gcc-package-cross.inc    |    6 ++++--
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> index ea105e6..87d11ab 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
> @@ -51,7 +51,8 @@ do_install () {
>  	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
>  	install -d $dest
>  	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
> +		[ ! -e ${BINRELPATH}/${TARGET_PREFIX}$t ] || \
> +	        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
>  	done
>  }
>  
> diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
> index e32412c..3d52d23 100644
> --- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
> +++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
> @@ -19,8 +19,10 @@ do_install () {
>  	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
>  	install -d $dest
>  	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
> +        if [ -e ${BINRELPATH}/${TARGET_PREFIX}$t ]; then
> +		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
> +		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
> +        fi
>  	done
>  
>  	# Remove things we don't need but keep share/java


I've had to revert this, it totally broke the mips/ppc/arm toolchains.
See the failures on the autobuilder, e.g.
http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/338/steps/shell_33/logs/stdio in eglibc-initial. The problem is that the location we're symlinking to may not be installed yet. For example, gcc provides "${TARGET_PREFIX}gcc" but it won't be installed at the location we point at until after gcc's populate_sysroot function runs. The tests you're using are therefore not adding as many symlinks as we need.

Cheers,

Richard
Robert Yang - March 15, 2012, 2:23 a.m.
On 03/14/2012 11:26 PM, Richard Purdie wrote:
> On Wed, 2012-03-14 at 17:13 +0800, Robert Yang wrote:
>> There are several invalid symlinks in gcc-cross-initial,
>> gcc-cross-intermediate and gcc-cross, these cause the error:(56 errors)
>>
>> tmp/work/i586-poky-linux/gcc-cross-initial-4.6.3+svnr184847-r23/temp/log.do_populate_sysroot:
>> log.do_populate_sysroot:grep: /path/to/invalid/symlink: No such file or directory
>>
>> Avoid creating invalid symlinks would fix this problem.
>>
>> Use the:
>> [ ! -e file ] || do_something
>> But not use:
>> [ -e file ]&&  do_something
>> is because that if the "file" doesn't exist, then the whole statement
>> would return false, and bitbake treats this an error, so use the "||" to
>> let it always be true.
>>
>> [YOCTO #2095]
>>
>> Signed-off-by: Robert Yang<liezhi.yang@windriver.com>
>> ---
>>   .../gcc/gcc-cross-intermediate.inc                 |    3 ++-
>>   meta/recipes-devtools/gcc/gcc-package-cross.inc    |    6 ++++--
>>   2 files changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
>> index ea105e6..87d11ab 100644
>> --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
>> @@ -51,7 +51,8 @@ do_install () {
>>   	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
>>   	install -d $dest
>>   	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
>> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
>> +		[ ! -e ${BINRELPATH}/${TARGET_PREFIX}$t ] || \
>> +	        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
>>   	done
>>   }
>>
>> diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
>> index e32412c..3d52d23 100644
>> --- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
>> +++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
>> @@ -19,8 +19,10 @@ do_install () {
>>   	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
>>   	install -d $dest
>>   	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
>> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
>> -		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
>> +        if [ -e ${BINRELPATH}/${TARGET_PREFIX}$t ]; then
>> +		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
>> +		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
>> +        fi
>>   	done
>>
>>   	# Remove things we don't need but keep share/java
>
>
> I've had to revert this, it totally broke the mips/ppc/arm toolchains.
> See the failures on the autobuilder, e.g.
> http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/338/steps/shell_33/logs/stdio in eglibc-initial. The problem is that the location we're symlinking to may not be installed yet. For example, gcc provides "${TARGET_PREFIX}gcc" but it won't be installed at the location we point at until after gcc's populate_sysroot function runs. The tests you're using are therefore not adding as many symlinks as we need.
>

I'm really sorry for this, I will drop the it.

// Robert

> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index ea105e6..87d11ab 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -51,7 +51,8 @@  do_install () {
 	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
 	install -d $dest
 	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
-		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+		[ ! -e ${BINRELPATH}/${TARGET_PREFIX}$t ] || \
+	        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
 	done
 }
 
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index e32412c..3d52d23 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -19,8 +19,10 @@  do_install () {
 	dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
 	install -d $dest
 	for t in ar as ld nm objcopy objdump ranlib strip g77 gcc cpp gfortran; do
-		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
-		ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
+        if [ -e ${BINRELPATH}/${TARGET_PREFIX}$t ]; then
+		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
+		    ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
+        fi
 	done
 
 	# Remove things we don't need but keep share/java