summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-21 13:11:58 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-21 13:11:58 +0000
commit0391f8e37836721c0d309c1374b1789c6e72d757 (patch)
treed968baaaa2b86cac121a9f07815ff0023d066af6
parent937643546f3e05a97b1157298f8cc224f9ba6bc1 (diff)
parente062e7e64b0eebad0a4c9b179795df2c67cffbf3 (diff)
propagate from branch 'org.openembedded.dev' (head c726ad470daf6245c24f25c514358fa645cf7553)
to branch 'org.openembedded.nslu2-linux' (head 76260c1a1c26719fdeda8da7bad3535973428c29)
-rw-r--r--packages/gpsdrive/files/gpsdrive-pda-fix.patch4
-rw-r--r--packages/meta/meta-sdk.bb13
2 files changed, 9 insertions, 8 deletions
diff --git a/packages/gpsdrive/files/gpsdrive-pda-fix.patch b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
index f76d83e3ad..85f220bd16 100644
--- a/packages/gpsdrive/files/gpsdrive-pda-fix.patch
+++ b/packages/gpsdrive/files/gpsdrive-pda-fix.patch
@@ -1,5 +1,5 @@
---- src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200
-+++ src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200
+--- gpsdrive/src/gpsdrive.c 2005-07-22 23:17:36.452918848 +0200
++++ gpsdrive/src/gpsdrive.c 2005-07-23 01:02:40.482560672 +0200
@@ -10516,7 +10516,7 @@
PangoFontDescription *font_desc;
font_desc =
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 962572d546..757c72ecb3 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -1,7 +1,6 @@
-PR = "r3"
+PR = "r2"
DEPENDS = "ipkg-native ipkg-utils-native binutils-cross-sdk gcc-cross-sdk gdb-cross fakeroot-native meta-gpe"
-DEPENDS += "libidl libsvg-cairo"
PACKAGES = ""
@@ -20,7 +19,7 @@ compositeext-dev \
damageext-dev \
dbus-dev \
fixesext-dev \
-gconf-dbus-dev \
+gconf-dev \
gtk+-dev \
gtk-engines-dev \
libapm-dev \
@@ -87,15 +86,17 @@ libxtst-dev \
libz-dev \
matchbox-desktop-dev \
ncurses-dev \
+orbit2-dev \
pango-dev \
randrext-dev \
recordext-dev \
renderext-dev \
resourceext-dev \
-libiw-dev \
+rxvt-unicode-dev \
+wireless-tools-dev \
xcalibrateext-dev \
xextensions-dev \
-libxmu-dev \
+xmu-dev \
xproto-dev \
xtrans-dev \
"
@@ -147,7 +148,7 @@ 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}/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status
rm -rf ${SDK_OUTPUT}${libdir}/ipkg
# remove unwanted executables