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

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index de0f6a2..8c48846 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -166,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006"
 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"

diff --git a/packages/u-boot/u-boot-openmoko-devel_git.bb b/packages/u-boot/u-boot-openmoko-devel_git.bb
index c1a5cef..3659241 100644 (file)
--- a/packages/u-boot/u-boot-openmoko-devel_git.bb
+++ b/packages/u-boot/u-boot-openmoko-devel_git.bb
@@ -1,72 +1,8 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@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

diff --git a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
deleted file mode 100644 (file)
index 2610e16..0000000
--- a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-
-UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7"
-UBOOT_OPENMOKO_REV = "2943"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4"
-
-LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PV = "1.2.0${LOCALVERSION}"
-PR = "r2"
-
-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 \
-  file://uboot-eabi-fix-HACK.patch \
-  file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
-  file://makefile-no-dirafter.patch;patch=1 \
-"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        rm -Rf patches .pc
-}
-
-do_svnrev() {
-        mv -f tools/setlocalversion tools/setlocalversion.old
-        echo "echo ${LOCALVERSION}" >>tools/setlocalversion
-}
-
-do_configure_prepend() {
-       find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
-       find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \;
-       cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1
-}
-
-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

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
deleted file mode 100644 (file)
index 502a62b..0000000
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>, Openmoko <openmoko-kernel@lists.openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-
-UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8"
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-SRCREV_FORMAT = "patchset"
-
-PV = "1.3.1+svnr${SRCREV}+git${UBOOT_UPSTREAM_REV}"
-PR = "r3"
-
-PROVIDES = "virtual/bootloader"
-S = "${WORKDIR}/git"
-
-SRC_URI = "\
-  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 \
-"
-
-EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_quilt() {
-        mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-        rm -Rf patches .pc
-}
-
-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

diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb
deleted file mode 100644 (file)
index ba172c0..0000000
--- a/packages/u-boot/u-boot-openmoko_svn.bb
+++ /dev/null
@@ -1,82 +0,0 @@
-DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support"
-AUTHOR = "Harald Welte <laforge@openmoko.org>"
-LICENSE = "GPL"
-SECTION = "bootloader"
-PRIORITY = "optional"
-PROVIDES = "virtual/bootloader"
-LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}"
-PV = "1.3.1${LOCALVERSION}"
-PR = "r1"
-
-SRCREV_FORMAT = "patches"
-
-UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5"
-
-DEFAULT_PREFERENCE = "-1"
-
-BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6"
-
-SRC_URI = "\
-  
-git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \
-  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \
-  file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \
-  file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
-  file://makefile-no-dirafter.patch;patch=1 \
-  file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1;maxrev=3775 \
-"
-S = "${WORKDIR}/git"
-
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-do_quilt() {
-       mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av
-       rm -Rf patches .pc
-}
-
-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