diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch | 13 | ||||
| -rw-r--r-- | packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 10 |
2 files changed, 15 insertions, 8 deletions
diff --git a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch index e90cc0de71..eca50615ad 100644 --- a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch +++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch @@ -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) >$@ diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb index 020fd421c6..1fb9be4f43 100644 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -5,18 +5,18 @@ SECTION = "bootloader" 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 \ |