Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/04 19:22:01+02:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/06/04 19:21:43+02:00 handhelds.org!CoreDump
ipkg.conf (tosa): s/mnt/media

2005/06/04 19:12:55+02:00 dyndns.org!reenoo
kaffe (kaffeh-native): add --without-gmp to EXTRA_OECONF to avoid relying on a native gmp.

2005/06/04 19:01:10+02:00 handhelds.org!CoreDump
Add propper ipkg destinations for poodle

BKrev: 42a1e77aE-9M14lRXoWEIa1SIVXtKA

diff --git a/packages/ipkg/ipkg-collateral/poodle/dest b/packages/ipkg/ipkg-collateral/poodle/dest
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/ipkg/ipkg-collateral/tosa/dest b/packages/ipkg/ipkg-collateral/tosa/dest
index 154ce57..c76101a 100644 (file)
--- a/packages/ipkg/ipkg-collateral/tosa/dest
+++ b/packages/ipkg/ipkg-collateral/tosa/dest
@@ -1,4 +1,4 @@
 dest root /
-dest cf /mnt/cf/packages/
-dest sd /mnt/card/packages/
-dest ram /mnt/ram/packages/
+dest cf /media/cf/packages/
+dest sd /media/card/packages/
+dest ram /media/ram/packages/

diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index 1a268dd..7646319 100644 (file)
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -1,5 +1,6 @@
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
+PR = "r1"
 
 include kaffe.inc
 
@@ -10,6 +11,7 @@ EXTRA_OECONF = "--disable-alsatest \
        --disable-sound \
        --with-jikes \
        --without-classpath-gtk-awt \
+       --without-gmp \
        --disable-native-awt \
        --disable-sound \
        --without-x \

diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index 8108e96..c8fb560 100644 (file)
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,5 +1,6 @@
 PV = "1.1.5+cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
+PR = "r1"
 
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
@@ -13,6 +14,7 @@ EXTRA_OECONF = "--disable-alsatest \
        --disable-sound \
        --with-jikes \
        --without-classpath-gtk-awt \
+       --without-gmp \
        --disable-native-awt \
        --disable-sound \
        --without-x \