From 1c7d23d3a79411ffd71a9733ab2d7807ed09a40b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 26 Jan 2014 00:53:16 +0100
Subject: [PATCH] cubieboard2-boot: switch to 2 partitions layout (boot and
 root).

---
 srcpkgs/cubieboard2-uboot/template | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/cubieboard2-uboot/template b/srcpkgs/cubieboard2-uboot/template
index fce57fda0c..b08dccf775 100644
--- a/srcpkgs/cubieboard2-uboot/template
+++ b/srcpkgs/cubieboard2-uboot/template
@@ -1,9 +1,9 @@
 # Template file for 'cubieboard2-uboot'
 pkgname=cubieboard2-uboot
 version=v2013.10
-revision=2
+revision=3
 wrksrc="u-boot-sunxi-${version/v/}-sunxi"
-hostmakedepends="sunxi-tools"
+hostmakedepends="sunxi-tools uboot-mkimage"
 short_desc="Cubieboard2 U-Boot files for SD booting"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -12,27 +12,23 @@ distfiles="https://github.com/linux-sunxi/u-boot-sunxi/archive/${version}-sunxi.
 checksum=a2a606939574795598d29f04852b1a40ddfcced96e9535d1d31fad30c68e0326
 
 create_srcdir=yes
-onlu_for_archs="armv7l"
+only_for_archs="armv7l"
 
 do_build() {
 	unset CFLAGS CXXFLAGS LDFLAGS
   
-	for i in Cubieboard2; do
-		mkdir bin_${i}
-		make distclean
-		if [ "$CROSS_BUILD" ]; then
-			make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- ${i}
-		else
-			make ${i}
-		fi
-		mv u-boot.bin spl/sunxi-spl.bin bin_${i}
-	done
+	if [ "$CROSS_BUILD" ]; then
+		make CROSS_COMPILE=${XBPS_CROSS_TRIPLET}- Cubieboard2
+	else
+		make Cubieboard2
+	fi
+	mkimage -C none -A arm -T script -d ${FILESDIR}/cubieboard2.bootcmd boot.scr
+	fex2bin ${FILESDIR}/cubieboard2.fex script.bin
 }
 
 do_install() {
-	vmkdir boot
-	cp bin_Cubieboard2/{u-boot.bin,sunxi-spl.bin} ${DESTDIR}/boot
-
-	fex2bin ${FILESDIR}/cubieboard2.fex ${DESTDIR}/boot/script.bin
+	vinstall u-boot-sunxi-with-spl.bin 644 boot
+	vinstall script.bin 644 boot
+	vinstall boot.scr 644 boot
 	vinstall ${FILESDIR}/cubieboard2.env 644 boot uEnv.txt
 }