[oe-commits] org.oe.dev u-boot-openmoko: enable autorev

[john_lee commit]

u-boot-openmoko: enable autorev
* also update pn-u-boot-openmoko in sane-srcrevs.inc
* also update patch uboot-20070311-tools_makefile_ln_sf.patch

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 5c73ea03cf696ea03d768c708d7495d87be1b52c
ViewMTN: http://monotone.openembedded.org/revision/info/5c73ea03cf696ea03d768c708d7495d87be1b52c
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Diffs:

#
# mt diff -r2a6396f37cbf4052ffacebe87582099650de0ad2 -r5c73ea03cf696ea03d768c708d7495d87be1b52c
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [62c397ed5dfa475bf74868efbccb04ed7039ba5e]
#    to [cd4fb60d55b5706223cc1455bf1cad9b1269b7cf]
# 
# patch "packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch"
#  from [575298514df1fc14f35e686d68f10eb0e1584978]
#    to [2bc3dcecb39e5c4fcd3b9c7b27cd5efde31380e3]
# 
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
#  from [db78f04c96cb5d27ad12ca8a87b74256bfcbe02d]
#    to [9bb8f7f724382e4eefd1ee89dda392bc20c877d0]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	62c397ed5dfa475bf74868efbccb04ed7039ba5e
+++ conf/distro/include/sane-srcrevs.inc	cd4fb60d55b5706223cc1455bf1cad9b1269b7cf
@@ -146,7 +146,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-sjf2410-linux-native ?= "933"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4100"
+SRCREV_pn-u-boot-openmoko ?= "4138"
 SRCREV_pn-usbpath ?= "3108"
 SRCREV_pn-usbpath-native ?= "3108"
 SRCREV_pn-webkit-gtk ?= "28656"
============================================================
--- packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch	575298514df1fc14f35e686d68f10eb0e1584978
+++ packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch	2bc3dcecb39e5c4fcd3b9c7b27cd5efde31380e3
@@ -1,6 +1,8 @@
---- a/tools/Makefile	2007-03-11 00:55:44.000000000 +0000
-+++ b/tools/Makefile	2007-03-11 00:55:52.000000000 +0000
-@@ -194,14 +194,14 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile	2008-03-03 13:32:32.000000000 +0800
++++ git/tools/Makefile	2008-03-03 13:40:23.000000000 +0800
+@@ -208,18 +208,18 @@
  
  $(obj)environment.c:
  		@rm -f $(obj)environment.c
@@ -15,5 +17,10 @@
 -		ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
 +		ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c
  
+ $(obj)sha1.c:
+ 		@rm -f $(obj)sha1.c
+-		ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c
++		ln -sf $(src)../lib_generic/sha1.c $(obj)sha1.c
+ 
  $(LOGO_H):	$(obj)bmp_logo $(LOGO_BMP)
  		$(obj)./bmp_logo $(LOGO_BMP) >$@
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	db78f04c96cb5d27ad12ca8a87b74256bfcbe02d
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb	9bb8f7f724382e4eefd1ee89dda392bc20c877d0
@@ -5,18 +5,18 @@ UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18
 PRIORITY = "optional"
 
 UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
-UBOOT_OPENMOKO_REV = "4118"
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PV = "1.3.1${LOCALVERSION}"
+SRCREV_FORMAT = "+gitupstream+svnpatchset"
+
+PV = "1.3.1${SRCREV}"
 PR = "r3"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
 
 SRC_URI = "\
-  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
-  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
+  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \
+  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
 #  file://makefile-no-dirafter.patch;patch=1 \
 #  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \