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

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

2005/05/27 14:22:44+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/27 14:22:32+02:00 uni-frankfurt.de!mickeyl
reintroduce flex(-native) 2.5.31

2005/05/27 14:03:42+02:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into marcinj.local:/home/hrw/zaurus/oe/openembedded

2005/05/27 14:03:24+02:00 local!hrw
bitbake.conf:
  switched SF mirror to heanet as aleron (previous default one) lack many files)

2005/05/27 13:49:23+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/05/27 12:44:10+02:00 uni-frankfurt.de!mickeyl
clean up the flex packages

BKrev: 4297152cMQ-C8Wem03skbqpuwH-iXw

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 178dcd4..caba7b5 100644 (file)
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -286,7 +286,7 @@ export palmqtdir = "/opt/QtPalmtop"
 
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
-SOURCEFORGE_MIRROR = "http://aleron.dl.sourceforge.net/sourceforge"
+SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
 GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"

diff --git a/packages/flex/flex-native_2.5.31.bb b/packages/flex/flex-native_2.5.31.bb
index e69de29..46b89e0 100644 (file)
--- a/packages/flex/flex-native_2.5.31.bb
+++ b/packages/flex/flex-native_2.5.31.bb
@@ -0,0 +1,6 @@
+include flex.inc
+inherit native
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lex/flex-${PV}.tar.bz2"
+S = "${WORKDIR}/flex-2.5.31"
+PR = "r0"

diff --git a/packages/flex/flex-native_2.5.4a.bb b/packages/flex/flex-native_2.5.4a.bb
index e69de29..80827a2 100644 (file)
--- a/packages/flex/flex-native_2.5.4a.bb
+++ b/packages/flex/flex-native_2.5.4a.bb
@@ -0,0 +1,5 @@
+include flex.inc
+inherit native
+
+S = "${WORKDIR}/flex-2.5.4"
+PR = "r1"

diff --git a/packages/flex/flex-2.5.31/include.patch b/packages/flex/flex.inc
similarity index 100%
rename from packages/flex/flex-2.5.31/include.patch
rename to packages/flex/flex.inc

diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index e69de29..b0ce4b9 100644 (file)
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -0,0 +1,4 @@
+include flex.inc
+PR = "r0"
+
+S = "${WORKDIR}/flex-2.5.31"

diff --git a/packages/flex/flex-2.5.4-native_2.5.4a.bb b/packages/flex/flex_2.5.4a.bb
similarity index 100%
rename from packages/flex/flex-2.5.4-native_2.5.4a.bb
rename to packages/flex/flex_2.5.4a.bb

diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.3.0.bb b/packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb
similarity index 100%
rename from packages/opie-pcmciaapplet/opie-pcmciaapplet_1.3.0.bb
rename to packages/opie-pcmciaapplet/opie-pcmciaapplet_1.2.1.bb