summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-02-08 22:54:53 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-02-08 22:54:53 +0000
commitf4861e01de9675d481fffcb6c4d4a46b217e619a (patch)
tree0c9a7deb74686ce47c9cedfabd8198e8d9d07e80 /packages/meta
parent1071e2166b71593939df38fc60f251af5a5ad49e (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/08 22:27:17+01:00 (none)!koen kbdd_20040904.bb: lower default preference 2005/02/08 18:38:39+00:00 nexus.co.uk!pb apply shepherd keymap patch from <mardy@users.sourceforge.net> 2005/02/08 18:17:45+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/02/08 18:17:38+00:00 nexus.co.uk!pb apply meta-sdk patch from Florian Boor BKrev: 4209433dtFxGsRd-6vWcwSTyyVnWEA
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/meta-sdk.bb11
1 files changed, 7 insertions, 4 deletions
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 6a286ccc27..dd15eacb1c 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r2"
DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
@@ -27,6 +27,7 @@ libatk-1.0-dev \
libaudiofile-dev \
libbluetooth-dev \
libcairo-dev \
+libdisplaymigration-dev \
libesd-dev \
libeventdb-dev \
libexpat-dev \
@@ -37,6 +38,7 @@ libglade-2.0-dev \
libglib-2.0-dev \
libgpelaunch-dev \
libgpepimc-dev \
+libgpevtype-dev \
libgpewidget-dev \
libgpg-error-dev \
libice-dev \
@@ -124,7 +126,8 @@ EOF
mkdir -p ${SDK_OUTPUT}
${IPKG_HOST} update
- ${IPKG_HOST} --nodeps install ${HOST_INSTALL}
+ ${IPKG_HOST} -nodeps install ${HOST_INSTALL}
+
${IPKG_TARGET} update
${IPKG_TARGET} install ${TARGET_INSTALL}
@@ -134,7 +137,8 @@ EOF
cp -a ${SDK_OUTPUT}/${prefix}/lib/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib
rm -rf ${SDK_OUTPUT}/${prefix}/lib/*
- mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc ${SDK_OUTPUT}/${prefix}/lib
+
+ mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/gcc* ${SDK_OUTPUT}/${prefix}/lib
cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/linux/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
cp -a ${TMPDIR}/cross/${TARGET_SYS}/include/asm/ ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/include/
@@ -143,7 +147,6 @@ 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}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
rm -rf ${SDK_OUTPUT}/usr/lib/ipkg