summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Karlstrom <daka@thg.se>2005-07-23 15:57:13 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-23 15:57:13 +0000
commit3f81c29c0ce906d1e779eab3e4aa44bf5b851143 (patch)
tree4ef35e2956f46edb3d1098e392d58b8cfc3d851b
parentb0d7bf3406b07cf2162a457b42382c1356781cb2 (diff)
parent0391f8e37836721c0d309c1374b1789c6e72d757 (diff)
merge of 494c257ade51ecd2039f966953f2f83ab5fbb95c
and cbe32b306c5e7609bbe24ffbbb6c1f179f6bede5
-rw-r--r--packages/gpsdrive/files/gpsdrive-pda-fix.patch4
-rw-r--r--packages/meta/meta-sdk.bb13
-rw-r--r--packages/meta/openslug-native.bb42
-rw-r--r--packages/meta/openslug-packages.bb1
4 files changed, 52 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
diff --git a/packages/meta/openslug-native.bb b/packages/meta/openslug-native.bb
new file mode 100644
index 0000000000..4ac2cfd4b1
--- /dev/null
+++ b/packages/meta/openslug-native.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Packages that are required for the OpenSlug native build environment"
+LICENSE = MIT
+PR = "r2"
+
+INHIBIT_DEFAULT_DEPS = "1"
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+OPENSLUG_NATIVE = "\
+ automake \
+ bash \
+ binutils binutils-dev \
+ bison \
+ bzip2 \
+ coreutils \
+ cpp \
+ cvs \
+ flex \
+ gawk \
+ g++ g++-symlinks \
+ gcc gcc-symlinks \
+ glibc-extra-nss glibc-utils \
+ gnu-config \
+ libc6 libc6-dev \
+ libg2c-dev \
+ libgdbm3 \
+ libperl5 \
+ libreadline4 libreadline-dev \
+ libstdc++-dev \
+ libthread-db1 \
+ lrzsz \
+ m4 \
+ make \
+ ncurses ncurses-dev ncurses-terminfo \
+ patch \
+ sed \
+ tar \
+ util-linux \
+ wget \
+ "
+
+RDEPENDS = '${OPENSLUG_NATIVE}'
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 3fb0587727..37ad7ba542 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -114,4 +114,5 @@ BROKEN_PACKAGES = "\
DEPENDS = 'openslug-image \
${OPENSLUG_PACKAGES} \
${OPENSLUG_DEVELOPMENT} \
+ openslug-native \
package-index'