summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-03-14 17:13:21 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-14 13:12:43 +0000
commit7893e74311e53882d8f93ecb95a6bd9f5b14651e (patch)
tree7a1ad047cb376c05709480c3a55e5c55dbe24f6b /meta
parente1f656492475fb65d1203afe0afeeec7e279a317 (diff)
downloadopenembedded-core-7893e74311e53882d8f93ecb95a6bd9f5b14651e.tar.gz
openembedded-core-7893e74311e53882d8f93ecb95a6bd9f5b14651e.tar.bz2
openembedded-core-7893e74311e53882d8f93ecb95a6bd9f5b14651e.tar.xz
openembedded-core-7893e74311e53882d8f93ecb95a6bd9f5b14651e.zip
gcc-cross: aviod creating invalid symlinks
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-intermediate.inc3
-rw-r--r--meta/recipes-devtools/gcc/gcc-package-cross.inc6
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 ea105e6eb..87d11ab47 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 e32412c12..3d52d23f9 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