From 3f0dfe5832fab4422e69b46fd2234bdb0bdfddfd Mon Sep 17 00:00:00 2001
From: jbu <pullmoll@t-online.de>
Date: Thu, 14 May 2015 17:51:25 +0200
Subject: [PATCH 1/4] installer.sh.in: really fix the md parsing

---
 installer.sh.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/installer.sh.in b/installer.sh.in
index aac3bee..70700b5 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -166,11 +166,12 @@ show_partitions() {
     done
     # Software raid (md)
     for p in $(ls -d /dev/md* 2>/dev/null|grep '[0-9]'); do
-        if cat /proc/mdstat|grep -qw $(echo $p|sed -e 's|/dev/||g'); then
-            fstype=$(lsblk -nfr /dev/$p|awk '{print $2}')
+        part=$(basename $p)
+        if cat /proc/mdstat|grep -qw $part; then
+            fstype=$(lsblk -nfr /dev/$part|awk '{print $2}')
             [ "$fstype" = "crypto_LUKS" ] && continue
             [ "$fstype" = "LVM2_member" ] && continue
-            fssize=$(lsblk -nr /dev/$p|awk '{print $4}')
+            fssize=$(lsblk -nr /dev/$part|awk '{print $4}')
             echo "$p"
             echo "size:${fssize:-unknown};fstype:${fstype:-none}"
         fi

From 08b105b511bc994154d020c0464a99eebdf46025 Mon Sep 17 00:00:00 2001
From: jbu <pullmoll@t-online.de>
Date: Sat, 16 May 2015 19:42:47 +0200
Subject: [PATCH 2/4] build-arm-images.sh.in: add cubietruck

---
 build-arm-images.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-arm-images.sh.in b/build-arm-images.sh.in
index 875d00e..08ecf66 100644
--- a/build-arm-images.sh.in
+++ b/build-arm-images.sh.in
@@ -4,7 +4,7 @@ TARGET="$1"
 
 set -e
 
-PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory"
+PLATFORMS="beaglebone cubieboard2 cubietruck odroid-u2 rpi rpi2 usbarmory"
 DATE=$(date '+%Y%m%d')
 
 for f in ${PLATFORMS}; do

From ed2337f7c6e4e2923a3177853ea7a2936b34c158 Mon Sep 17 00:00:00 2001
From: jbu <pullmoll@t-online.de>
Date: Sat, 16 May 2015 19:45:51 +0200
Subject: [PATCH 3/4] build-rootfs.sh.in: add cubietruck

---
 build-rootfs.sh.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-rootfs.sh.in b/build-rootfs.sh.in
index 16ae5bf..b4de345 100644
--- a/build-rootfs.sh.in
+++ b/build-rootfs.sh.in
@@ -4,7 +4,7 @@ set -e
 
 TARGET="$1"
 
-PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory"
+PLATFORMS="beaglebone cubieboard2 cubietruck odroid-u2 rpi rpi2 usbarmory"
 
 for f in ${PLATFORMS}; do
 	if [ -z "$TARGET" -o "$TARGET" = "$f" ]; then

From f3b9e9d2e42f307634402e5ae85bde76a378cd3b Mon Sep 17 00:00:00 2001
From: jbu <pullmoll@t-online.de>
Date: Sat, 16 May 2015 20:16:32 +0200
Subject: [PATCH 4/4] mkimage.sh.in: add cubietruck

---
 mkimage.sh.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/mkimage.sh.in b/mkimage.sh.in
index a0359a7..379a378 100644
--- a/mkimage.sh.in
+++ b/mkimage.sh.in
@@ -113,7 +113,7 @@ fi
 
 # double check PLATFORM is supported...
 case "$PLATFORM" in
-    bananapi|beaglebone|cubieboard2|odroid-u2|rpi|rpi2|usbarmory);;
+    bananapi|beaglebone|cubieboard2|cubietruck|odroid-u2|rpi|rpi2|usbarmory);;
     *) die "The $PLATFORM is not supported, exiting..."
 esac
 
@@ -175,16 +175,20 @@ fi
 echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 ${fspassno}" >> ${ROOTFSDIR}/etc/fstab
 echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> ${ROOTFSDIR}/etc/fstab
 
-if [ "$PLATFORM" = "cubieboard2" -o "$PLATFORM" = "bananapi" ]; then
+case "$PLATFORM" in
+bananapi|cubieboard2|cubietruck)
     dd if=${ROOTFSDIR}/boot/u-boot-sunxi-with-spl.bin of=${LOOPDEV} bs=1024 seek=8 >/dev/null 2>&1
-elif [ "$PLATFORM" = "odroid-u2" ]; then
+    ;;
+odroid-u2)
     dd if=${ROOTFSDIR}/boot/E4412_S.bl1.HardKernel.bin of=${LOOPDEV} seek=1 >/dev/null 2>&1
     dd if=${ROOTFSDIR}/boot/bl2.signed.bin of=${LOOPDEV} seek=31 >/dev/null 2>&1
     dd if=${ROOTFSDIR}/boot/u-boot.bin of=${LOOPDEV} seek=63 >/dev/null 2>&1
     dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1
-elif [ "$PLATFORM" = "usbarmory" ]; then
+    ;;
+usbarmory)
     dd if=${ROOTFSDIR}/boot/u-boot.imx of=${LOOPDEV} bs=512 seek=2 conv=fsync
-fi
+    ;;
+esac
 
 mountpoint -q ${ROOTFSDIR}/boot && umount ${ROOTFSDIR}/boot
 umount $ROOTFSDIR