summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-04-06 12:12:05 +0000
committerKoen Kooi <koen@openembedded.org>2007-04-06 12:12:05 +0000
commitd979498abcf3f3f7ff19425f2e63e89d913b0418 (patch)
treecbdbd92b2269d6a96247b71a50c01773d0710781 /packages/meta
parentf19d9e69c8c394d5c23acce0d4043a17af821acf (diff)
meta-sdk, meta-sdk-sbox: these are general targets, so they should only contain a basic toolchain
* attempt to make them generic instead of hardcoding 'arm-linux'
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/meta-sdk-sbox.bb9
-rw-r--r--packages/meta/meta-sdk.bb19
2 files changed, 11 insertions, 17 deletions
diff --git a/packages/meta/meta-sdk-sbox.bb b/packages/meta/meta-sdk-sbox.bb
index 98fb6053c0..f3a19a4773 100644
--- a/packages/meta/meta-sdk-sbox.bb
+++ b/packages/meta/meta-sdk-sbox.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta package for a Scratchbox SDK"
LICENSE = "MIT"
PACKAGES = ""
-PR = "r4"
+PR = "r5"
inherit rootfs_ipk sdk meta
@@ -16,10 +16,7 @@ FILES_${PN} = "${prefix}"
TARGET_INSTALL = "\
task-sdk-base \
task-sdk-sbox \
- task-sdk-x11 \
- task-sdk-x11-ext \
- task-sdk-gpe \
- task-sdk-gpephone"
+ "
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
RDEPENDS = "${TARGET_INSTALL}"
@@ -62,7 +59,7 @@ EOF
#cp -pPR ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
#rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
- cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/usr/include/
+ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/usr/include/
cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/usr/include/
chmod -R a+r ${SDK_OUTPUT}/${prefix}/usr/include/
find ${SDK_OUTPUT}/${prefix}/usr/include/ -type d | xargs chmod +x
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index e49858398f..a7fe8884c1 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta package for SDK including GPE and Opie"
LICENSE = "MIT"
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
-PR = "r11"
+PR = "r12"
inherit sdk meta
@@ -19,10 +19,7 @@ HOST_INSTALL = "\
TARGET_INSTALL = "\
task-sdk-base \
- task-sdk-opie \
- task-sdk-x11 \
- task-sdk-x11-ext \
- task-sdk-gpe"
+ "
RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
@@ -65,7 +62,7 @@ EOF
mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
- cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
+ cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/${TARGET_OS}/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
cp -pPR ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
chmod -R a+r ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
find ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/ -type d | xargs chmod +x
@@ -73,22 +70,22 @@ EOF
echo 'GROUP ( libpthread.so.0 libpthread_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libpthread.so
echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so
# remove unwanted housekeeping files
- mv ${SDK_OUTPUT}${libdir}/../arm-linux/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
+ mv ${SDK_OUTPUT}${libdir}/../${TARGET_ARCH}-${TARGET_OS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
rm -rf ${SDK_OUTPUT}${libdir}/ipkg
# remove unwanted executables
rm -rf ${SDK_OUTPUT}/${prefix}/sbin ${SDK_OUTPUT}/${prefix}/etc
# remove broken .la files
- rm ${SDK_OUTPUT}/${prefix}/arm-linux/lib/*.la
+ rm ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/*.la
# fix pkgconfig data files
- cd ${SDK_OUTPUT}/${prefix}/arm-linux/lib/pkgconfig
+ cd ${SDK_OUTPUT}/${prefix}/${TARGET_ARCH}-${TARGET_OS}/lib/pkgconfig
for f in *.pc ; do
- sed -i 's%=/usr%=${prefix}/arm-linux%g' "$f"
+ sed -i 's%=/usr%=${prefix}/${TARGET_ARCH}-${TARGET_OS}%g' "$f"
done
for f in *.pc ; do
- sed -i 's%${STAGING_DIR}%/usr/local/arm/oe%g' "$f"
+ sed -i 's%${STAGING_DIR}%/usr/local/${TARGET_ARCH}/oe%g' "$f"
done
mkdir -p ${SDK_DEPLOY}