summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-01-21 11:11:52 +0000
committerRichard Purdie <richard@openedhand.com>2008-01-21 11:11:52 +0000
commit68206735923ca7cca5f47609312247cbd602ff59 (patch)
tree883be9ee7595a34562cbcd9f899abacdc6e2fc17 /meta
parent8c25ace84e05394e828d4463a4d2dece6dea58fe (diff)
downloadpoky-68206735923ca7cca5f47609312247cbd602ff59.tar.gz
meta-toolchain: Fix target and host file separation so sdk installed files are handled correctly
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3562 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/meta/meta-toolchain.bb25
1 files changed, 11 insertions, 14 deletions
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index dfa28e163a..9ac24bb3aa 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -9,7 +9,7 @@ SDK_OUTPUT = "${SDK_DIR}/image"
9SDK_DEPLOY = "${TMPDIR}/deploy/sdk" 9SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
10 10
11IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}" 11IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
12IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}" 12IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/temp-target"
13 13
14TOOLCHAIN_HOST_TASK ?= "task-sdk-host" 14TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
15TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target" 15TOOLCHAIN_TARGET_TASK ?= "task-poky-standalone-sdk-target"
@@ -34,12 +34,16 @@ do_populate_sdk() {
34 ${IPKG_TARGET} update 34 ${IPKG_TARGET} update
35 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} 35 ${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
36 36
37 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} 37 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include
38 cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS} 38 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
39 rm -rf ${SDK_OUTPUT}/${prefix}/usr/ 39 mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share
40 40 mv ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
41 cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib 41 rm -rf ${SDK_OUTPUT}/temp-target/usr/lib/ipkg/
42 rm -rf ${SDK_OUTPUT}/${prefix}/lib/* 42 cp -pPR ${SDK_OUTPUT}/temp-target/usr/include/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
43 cp -pPR ${SDK_OUTPUT}/temp-target/usr/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
44 cp -pPR ${SDK_OUTPUT}/temp-target/usr/share/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/share/
45 cp -pPR ${SDK_OUTPUT}/temp-target/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/
46 rm -rf ${SDK_OUTPUT}/temp-target/
43 47
44 for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do 48 for fn in `ls ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/`; do
45 if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then 49 if [ -h ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/$fn ]; then
@@ -52,14 +56,10 @@ do_populate_sdk() {
52 fi 56 fi
53 done 57 done
54 58
55 mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib
56
57 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so 59 echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
58 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so 60 echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
59 61
60 # remove unwanted housekeeping files 62 # remove unwanted housekeeping files
61 mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
62 rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg
63 mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host 63 mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host
64 rm -Rf ${SDK_OUTPUT}/usr/lib 64 rm -Rf ${SDK_OUTPUT}/usr/lib
65 65
@@ -93,9 +93,6 @@ do_populate_sdk() {
93 done 93 done
94 done 94 done
95 95
96 # Remove unwanted executables
97 rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
98
99 # Remove broken .la files 96 # Remove broken .la files
100 rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la 97 rm -f ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/*.la
101 98