From 4e29df1b8ab801856a0b5f02cb448a679407f044 Mon Sep 17 00:00:00 2001
From: Sven Dowideit <SvenDowideit@home.org.au>
Date: Wed, 1 Feb 2017 05:24:01 +0000
Subject: [PATCH] build changes needed to allow rpi release to build

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
---
 scripts/images/raspberry-pi-hypriot/Dockerfile.dapper | 8 +++++---
 scripts/images/raspberry-pi-hypriot/scripts/build.sh  | 2 ++
 scripts/package-initrd                                | 1 +
 scripts/package-installer                             | 4 ++--
 scripts/package-iso                                   | 4 ++--
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
index 3fc9194f..de19f0fc 100644
--- a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
+++ b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper
@@ -10,12 +10,14 @@ RUN mkdir -p /source/assets
 RUN curl -fL https://releases.rancher.com/os/latest/rootfs_arm.tar.gz > /source/assets/rootfs_arm.tar.gz
 #COPY rootfs_arm.tar.gz /source/assets/rootfs_arm.tar.gz
 
-# 4.4.27-hypriotos-v7+
 # see https://packagecloud.io/Hypriot/rpi/?filter=debs
 ENV URL=https://packagecloud.io/Hypriot/rpi/packages/debian/jessie/
-RUN curl -fL $URL/raspberrypi-kernel_20161028-083330_armhf.deb/download \
+# 4.4.27-hypriotos-v7+
+ENV VER=20170119-202035
+
+RUN curl -fL ${URL}/raspberrypi-kernel_${VER}_armhf.deb/download \
 	> /source/assets/kernel.deb
-RUN curl -fL $URL/raspberrypi-bootloader_20161028-083330_armhf.deb/download \
+RUN curl -fL ${URL}/raspberrypi-bootloader_${VER}_armhf.deb/download \
 	> /source/assets/bootloader.deb
 
 WORKDIR /source
diff --git a/scripts/images/raspberry-pi-hypriot/scripts/build.sh b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
index 84fe74ea..d5d44d89 100755
--- a/scripts/images/raspberry-pi-hypriot/scripts/build.sh
+++ b/scripts/images/raspberry-pi-hypriot/scripts/build.sh
@@ -29,6 +29,8 @@ fdisk -l build/run.img
 ls -al build/run.img
 
 # partition #1 - Type= c W95 FAT32 (LBA)
+losetup
+losetup -f
 losetup -d /dev/loop0 || /bin/true
 losetup --offset $BOOT_PARTITION_OFFSET --sizelimit $BOOT_PARTITION_BYTES /dev/loop0 build/run.img
 mkfs.vfat -n RancherOS /dev/loop0
diff --git a/scripts/package-initrd b/scripts/package-initrd
index 9b6447fc..846e8d82 100755
--- a/scripts/package-initrd
+++ b/scripts/package-initrd
@@ -12,6 +12,7 @@ ARTIFACTS=$(pwd)/dist/artifacts
 mkdir -p ${ARTIFACTS}
 
 if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ]; then
+    echo "skipping package-initrd due to ARM build? (no kernel artifact)"
     exit 0
 fi
 
diff --git a/scripts/package-installer b/scripts/package-installer
index 0eb013de..1db29f11 100755
--- a/scripts/package-installer
+++ b/scripts/package-installer
@@ -9,8 +9,8 @@ BASEDOCKERFILE=./scripts/installer/BaseDockerfile.${ARCH}
 DOCKERFILE=./scripts/installer/Dockerfile.${ARCH}
 
 if [ ! -f $DOCKERFILE ] || [ ! -f dist/artifacts/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then
-    echo "ERROR: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
-    exit 1
+    echo "Skipping package-installer due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
+    exit 0
 fi
 
 # TODO maybe extract the creation of the syslinux cfg files
diff --git a/scripts/package-iso b/scripts/package-iso
index f9f18f5b..985008b5 100755
--- a/scripts/package-iso
+++ b/scripts/package-iso
@@ -14,8 +14,8 @@ mkdir -p ${CD}/boot/isolinux
 mkdir -p ${CD}/rancheros
 
 if [ ! -f ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION} ] || [ ! -f ${INITRD} ]; then
-    echo "ERROR: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
-    exit 1
+    echo "Skipping package-iso due to ARM build: ${ARTIFACTS}/vmlinuz-${KERNEL_VERSION}  or ${INITRD} not found"
+    exit 0
 fi
 
 cp ${INITRD}                        ${CD}/boot