From 3260b1adc171b715a1c9d6a83581ba1383a1f69b Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Sat, 4 Jun 2005 17:40:10 +0000 Subject: [PATCH] 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 --- packages/ipkg/ipkg-collateral/poodle/dest | 0 packages/ipkg/ipkg-collateral/tosa/dest | 6 +++--- packages/kaffe/kaffeh-native_1.1.5.bb | 2 ++ packages/kaffe/kaffeh-native_cvs.bb | 2 ++ 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 packages/ipkg/ipkg-collateral/poodle/dest diff --git a/packages/ipkg/ipkg-collateral/poodle/dest b/packages/ipkg/ipkg-collateral/poodle/dest new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/ipkg/ipkg-collateral/tosa/dest b/packages/ipkg/ipkg-collateral/tosa/dest index 154ce57587..c76101a5b2 100644 --- 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 1a268dddbb..764631955d 100644 --- 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 8108e9615d..c8fb560baa 100644 --- 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 \ -- 2.39.5