From 8cfed7bad561d9ef0cf0e405248148a941de6147 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 10 Jun 2005 12:40:10 +0000 Subject: [PATCH] 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 --- conf/distro/preferred-gpe-versions.inc | 2 +- packages/flex/flex_2.5.31.bb | 7 ++++++- 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} +} + -- 2.39.5