From 4e29df1b8ab801856a0b5f02cb448a679407f044 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 1 Feb 2017 05:24:01 +0000 Subject: [PATCH 1/3] build changes needed to allow rpi release to build Signed-off-by: Sven Dowideit --- 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 From 7d3630d981e0e4ba6ca763ccc8e657d69fd8b60c Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 1 Feb 2017 06:08:40 +0000 Subject: [PATCH 2/3] allow the rpi image build to work on rpi too Signed-off-by: Sven Dowideit --- scripts/images/raspberry-pi-hypriot/Dockerfile.dapper | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper index de19f0fc..725b09ed 100644 --- a/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper +++ b/scripts/images/raspberry-pi-hypriot/Dockerfile.dapper @@ -1,4 +1,6 @@ -FROM debian:jessie +FROM rancher/os-debianconsole-base +# FROM amd64=debian:jessie arm64=aarch64/debian:jessie arm=armhf/debian:jessie + ENV DAPPER_RUN_ARGS --privileged ENV DAPPER_OUTPUT dist RUN apt-get update -y From 1813c0a0d284dc782d5c8507984f5869b18e9d28 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 1 Feb 2017 11:43:46 +0000 Subject: [PATCH 3/3] use the resize patched buildroot for rpi Signed-off-by: Sven Dowideit --- Dockerfile.dapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 91b98497..3cf9d70a 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -76,7 +76,7 @@ ARG DFS_IMAGE=${OS_REPO}/docker:v${DOCKER_VERSION}-2 ARG OS_BASE_URL_amd64=https://github.com/rancher/os-base/releases/download/v2016.08.1-2/os-base_amd64.tar.xz ARG OS_BASE_URL_arm64=https://github.com/rancher/os-base/releases/download/v2016.08.1-2/os-base_arm64.tar.xz -ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2016.08.1-2/os-base_arm.tar.xz +ARG OS_BASE_URL_arm=https://github.com/rancher/os-base/releases/download/v2016.08.1-3/os-base_arm.tar.xz ###################################################### # Set up environment and export all ARGS as ENV