summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-10 12:40:10 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-10 12:40:10 +0000
commit8cfed7bad561d9ef0cf0e405248148a941de6147 (patch)
treeab34752734268b5abfb7b8c89945925a87b89d4a
parent3eb5c4cf54427a7ce0448a0ce309bb1be4cc45dd (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/10 14:22:14+02:00 utwente.nl!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into bitbake.utwente.nl:/home/koen/OE/openembedded 2005/06/10 14:21:58+02:00 utwente.nl!koen preferred-gpe-versions.inc: prefer the xextenstion 20050610 snapshot 2005/06/10 14:06:58+02:00 uni-frankfurt.de!mickeyl flex: install libflex into STAGING BKrev: 42a98a2ao10DbwJ9IKdeXRh0OU9NhQ
-rw-r--r--conf/distro/preferred-gpe-versions.inc2
-rw-r--r--packages/flex/flex_2.5.31.bb7
2 files changed, 7 insertions, 2 deletions
diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc
index 62c343c7b9..e6235054ee 100644
--- a/conf/distro/preferred-gpe-versions.inc
+++ b/conf/distro/preferred-gpe-versions.inc
@@ -30,7 +30,7 @@ PREFERRED_VERSION_xproto ?= "6.6.2"
PREFERRED_VERSION_rxvt-unicode ?= "5.3"
#PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3"
#PREFERRED_VERSION_xst ?= "0.14"
-#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}"
+PREFERRED_VERSION_xextensions ?= "0.0cvs20050610"
PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}"
PREFERRED_VERSION_xhost ?= "0.0cvs20040413"
PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}"
diff --git a/packages/flex/flex_2.5.31.bb b/packages/flex/flex_2.5.31.bb
index 5cec08d8f5..2263d8f7c1 100644
--- a/packages/flex/flex_2.5.31.bb
+++ b/packages/flex/flex_2.5.31.bb
@@ -1,4 +1,9 @@
include flex.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://include.patch;patch=1"
+
+do_stage() {
+ oe_libinstall -a libfl ${STAGING_LIBDIR}
+}
+