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

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

2005/05/30 19:46:14+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/30 19:46:01+02:00 uni-frankfurt.de!mickeyl
fix for people upgrading from earlier versions with sa populated STAGING_BINDIR

BKrev: 429b5e0encyG7paZ5TG-beVg9dBMvw

diff --git a/packages/bison/bison-native_2.0.bb b/packages/bison/bison-native_2.0.bb
index 624ece4..57065cd 100644 (file)
--- a/packages/bison/bison-native_2.0.bb
+++ b/packages/bison/bison-native_2.0.bb
@@ -2,11 +2,13 @@ include bison_${PV}.bb
 SECTION = "devel"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/bison-${PV}"
 S = "${WORKDIR}/bison-${PV}"
-PR = "r1"
+PR = "r2"
 
 inherit native autotools
 
 do_stage() {
+       rm -f ${STAGING_BINDIR}/yacc
+       rm -f ${STAGING_BINDIR}/bison
        install -m 0755 src/bison ${STAGING_BINDIR}/
        cat >${STAGING_BINDIR}/yacc <<EOF
 #!/bin/sh