[oe-commits] org.oe.dev u-boot-openmoko * remove deprecated svn versions, add git versions

[mickeyl commit]

u-boot-openmoko * remove deprecated svn versions, add git versions

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: cb5719fdc6d79a22de2efd030cf22c8df91b706a
ViewMTN: http://monotone.openembedded.org/revision/info/cb5719fdc6d79a22de2efd030cf22c8df91b706a
Files:
1
packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
packages/u-boot/u-boot-openmoko_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/u-boot/u-boot-openmoko-devel_git.bb
Diffs:

#
# mt diff -r308247314ea9d37a28e6f636f2c27dee9764192d -rcb5719fdc6d79a22de2efd030cf22c8df91b706a
#
#
#
# delete "packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb"
# 
# delete "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# 
# delete "packages/u-boot/u-boot-openmoko_svn.bb"
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [cd4d9a24621db28587ab53e1d344cbea50c5e8fb]
#    to [6a60fa40b76df44f1df9b736ea95b7a6ae11a7c1]
# 
# patch "packages/u-boot/u-boot-openmoko-devel_git.bb"
#  from [3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719]
#    to [86254e6c66bd76fc8b47aa0114e6c26646cee6f0]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	cd4d9a24621db28587ab53e1d344cbea50c5e8fb
+++ conf/distro/include/sane-srcrevs.inc	6a60fa40b76df44f1df9b736ea95b7a6ae11a7c1
@@ -166,7 +166,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
-SRCREV_pn-u-boot-openmoko ?= "4297"
+SRCREV_pn-u-boot-openmoko ?= "1dd080c17b105da5cd4720307fa62de38276796a"
 SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
============================================================
--- packages/u-boot/u-boot-openmoko-devel_git.bb	3f3b61ce6d5f6076fd65a8304d08f6a13b5c2719
+++ packages/u-boot/u-boot-openmoko-devel_git.bb	86254e6c66bd76fc8b47aa0114e6c26646cee6f0
@@ -1,72 +1,8 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge at openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-PROVIDES = "virtual/bootloader"
-LOCALVERSION = "+git${SRCREV}"
-PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
+require u-boot-openmoko.inc
 
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRCREV_FORMAT = "git.openmoko.org"
-
-SRCREV = "1dd080c17b105da5cd4720307fa62de38276796a"
-
-SRC_URI = "git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \
-  file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+SRC_URI = "\
+  git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \
   file://makefile-no-dirafter.patch;patch=1 \
 "
 S = "${WORKDIR}/git"
 
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_svnrev() {
-	mv -f tools/setlocalversion tools/setlocalversion.old
-	echo "echo ${LOCALVERSION}" >>tools/setlocalversion
-}
-
-do_compile () {
-	chmod +x board/neo1973/gta*/split_by_variant.sh
-	for mach in ${UBOOT_MACHINES}
-	do
-		oe_runmake ${mach}_config
-		oe_runmake clean
-		find board -name lowlevel_foo.bin -exec rm '{}' \;
-		oe_runmake all
-		oe_runmake u-boot.udfu
-		if [ -f u-boot.udfu ]; then
-			mv u-boot.udfu u-boot_${mach}.bin
-		else
-			mv u-boot.bin u-boot_${mach}.bin
-		fi
-		if [ -f board/${mach}/lowlevel_foo.bin ]; then
-			mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin
-		else
-			find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \;
-		fi
-	done
-}
-
-do_deploy () {
-	install -d ${DEPLOY_DIR_IMAGE}
-	for mach in ${UBOOT_MACHINES}
-	do
-		install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin
-		ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin
-		if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then
-			install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin
-			ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin
-		fi
-	done
-	install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage
-}
-
-do_deploy[dirs] = "${S}"
-addtask deploy before do_package after do_install
-addtask quilt before do_patch after do_unpack
-addtask svnrev before do_patch after do_quilt