summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-06-14 15:06:42 +0000
committerRichard Purdie <richard@openedhand.com>2007-06-14 15:06:42 +0000
commitce69ac4f71e177e90c6260580741a099b89b0282 (patch)
tree2a94d51c3c5dc679c761814a92700930cd5d828b
parent0a46762039a594fa32778b419ec9ff1c0002e642 (diff)
downloadpoky-ce69ac4f71e177e90c6260580741a099b89b0282.tar.gz
meta-toolchain: Fix symlinks after moving files around (gross hack)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1941 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/meta/external-poky-toolchain.bb3
-rw-r--r--meta/packages/meta/meta-toolchain.bb12
2 files changed, 15 insertions, 0 deletions
diff --git a/meta/packages/meta/external-poky-toolchain.bb b/meta/packages/meta/external-poky-toolchain.bb
index 7cf657f5c6..c54ad91742 100644
--- a/meta/packages/meta/external-poky-toolchain.bb
+++ b/meta/packages/meta/external-poky-toolchain.bb
@@ -8,7 +8,10 @@ PROVIDES = "\
8 virtual/libintl \ 8 virtual/libintl \
9 virtual/libiconv \ 9 virtual/libiconv \
10 glibc-thread-db \ 10 glibc-thread-db \
11
11 virtual/linux-libc-headers " 12 virtual/linux-libc-headers "
13
14RPROVIDES = "glibc-gconv-iso8859-1"
12PR = "r1" 15PR = "r1"
13 16
14inherit sdk 17inherit sdk
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index bf922cd31b..72513dff6a 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -64,6 +64,18 @@ EOF
64 cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib 64 cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
65 rm -rf ${SDK_OUTPUT}/${prefix}/lib/* 65 rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
66 66
67 for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do
68 if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then
69 link=`readlink ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn`
70 bname=`basename $link`
71 if [ ! -e $link -a -e ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$bame ]; then
72 rm ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn
73 ln -s $bname ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn
74 fi
75
76 fi
77 done
78
67 mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib 79 mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
68 80
69 cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ 81 cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/