[oe-commits] org.oe.dev uboot-openmoko: set localversion to PV

[mickeyl commit]

uboot-openmoko: set localversion to PV

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cc4ff44ab8858d40dac79ae6b3e11d75dbd68c10
ViewMTN: http://monotone.openembedded.org/revision/info/cc4ff44ab8858d40dac79ae6b3e11d75dbd68c10
Files:
1
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
packages/uboot/uboot-openmoko_svn.bb
Diffs:

#
# mt diff -r72cbd7b7dd4bd99f3028bf07cf357606cfcb006f -rcc4ff44ab8858d40dac79ae6b3e11d75dbd68c10
#
# 
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [b42ad01a57090bd2d30d7aab77b4aa9e3607b31c]
#    to [d3999509e6f8e1b8cbcd12aafad259da103400de]
# 
# patch "packages/uboot/uboot-openmoko_svn.bb"
#  from [a9daac10326cc7c8c5b0dfea1c25a605b5855bc9]
#    to [32f83f5ac25253fffe2da4176c4bce6897bd83a1]
# 
============================================================
--- packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	b42ad01a57090bd2d30d7aab77b4aa9e3607b31c
+++ packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	d3999509e6f8e1b8cbcd12aafad259da103400de
@@ -9,7 +9,7 @@ PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn
 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_svnrev() {
 }
 
 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() {
============================================================
--- packages/uboot/uboot-openmoko_svn.bb	a9daac10326cc7c8c5b0dfea1c25a605b5855bc9
+++ packages/uboot/uboot-openmoko_svn.bb	32f83f5ac25253fffe2da4176c4bce6897bd83a1
@@ -5,7 +5,7 @@ PV = "1.2.0+git${SRCDATE}+svnr${SRCREV}"
 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_svnrev() {
 }
 
 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() {