diff options
| -rw-r--r-- | packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb | 15 | ||||
| -rw-r--r-- | packages/uboot/uboot-openmoko_svn.bb | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb index 6256363500..2a09c76f09 100644 --- a/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb +++ b/packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb @@ -9,7 +9,7 @@ UBOOT_OPENMOKO_REV = "2943" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4" PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" -PR = "r0" +PR = "r1" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" @@ -30,16 +30,9 @@ do_quilt() { } do_svnrev() { - FILE=${S}/tools/setlocalversion - OLDFILE=$FILE.old - NEWFILE=$FILE.new - cp $FILE $OLDFILE - LINES=`cat $OLDFILE | wc -l` - LINES_WE_WANT=$(($LINES-1)) - LASTLINE=`cat $OLDFILE | tail -n 1` - cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE - echo ${LASTLINE}_${PR} >> $NEWFILE - rm $FILE && mv $NEWFILE $FILE + mv -f tools/setlocalversion tools/setlocalversion.old + echo -n "echo " >>tools/setlocalversion + echo ${PV} >>tools/setlocalversion } do_configure_prepend() { diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index e1575884c2..3669b409da 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -5,7 +5,7 @@ SECTION = "bootloader" PRIORITY = "optional" PROVIDES = "virtual/bootloader" PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRCREV_FORMAT = "patches" @@ -30,16 +30,9 @@ do_quilt() { } do_svnrev() { - FILE=${S}/tools/setlocalversion - OLDFILE=$FILE.old - NEWFILE=$FILE.new - cp $FILE $OLDFILE - LINES=`cat $OLDFILE | wc -l` - LINES_WE_WANT=$(($LINES-1)) - LASTLINE=`cat $OLDFILE | tail -n 1` - cat $OLDFILE | head -n $LINES_WE_WANT > $NEWFILE - echo ${LASTLINE}_${PR} >> $NEWFILE - rm $FILE && mv $NEWFILE $FILE + mv -f tools/setlocalversion tools/setlocalversion.old + echo -n "echo " >>tools/setlocalversion + echo ${PV} >>tools/setlocalversion } do_configure_prepend() { |