From 6e6f7f38d73371bc09a3170d09c1daa799026de0 Mon Sep 17 00:00:00 2001 From: Jason-ZW Date: Tue, 14 May 2019 16:41:42 +0800 Subject: [PATCH] Bump up rpi to 4.14.114 --- scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper | 4 ++-- scripts/images/raspberry-pi-hypriot64/scripts/build.sh | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper index f7a1aa81..46ff0391 100644 --- a/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper +++ b/scripts/images/raspberry-pi-hypriot64/Dockerfile.dapper @@ -12,8 +12,8 @@ RUN mkdir -p /source/assets #RUN curl -fL https://releases.rancher.com/os/latest/rootfs_arm64.tar.gz > /source/assets/rootfs_arm64.tar.gz COPY rootfs_arm64.tar.gz /source/assets/rootfs_arm64.tar.gz -ENV KERNEL_URL=https://github.com/DieterReuter/rpi64-kernel/releases/download/v20180426-171616/4.9.80-hypriotos-v8.tar.gz -ENV BOOTLOADER_URL=https://github.com/DieterReuter/rpi-bootloader/releases/download/v20180320-071222/rpi-bootloader.tar.gz +ENV KERNEL_URL=https://github.com/Jason-ZW/os-rpi-kernel/releases/download/v4.14.114-rancher/4.14.114-rancheros-v8.tar.gz +ENV BOOTLOADER_URL=https://github.com/Jason-ZW/os-rpi-kernel/releases/download/v4.14.114-rancher/rpi-bootloader.tar.gz RUN curl -fL ${KERNEL_URL} > /source/assets/kernel.tar.gz RUN curl -fL ${BOOTLOADER_URL} > /source/assets/rpi-bootfiles.tar.gz diff --git a/scripts/images/raspberry-pi-hypriot64/scripts/build.sh b/scripts/images/raspberry-pi-hypriot64/scripts/build.sh index 6b799621..877360a1 100755 --- a/scripts/images/raspberry-pi-hypriot64/scripts/build.sh +++ b/scripts/images/raspberry-pi-hypriot64/scripts/build.sh @@ -13,7 +13,7 @@ cp assets/*.tar.gz build/ # size of root and boot partion (in MByte) IMAGE_TOTAL_SIZE=2048 BOOT_PARTITION_START=2048 -BOOT_PARTITION_SIZE=25 +BOOT_PARTITION_SIZE=30 #---don't change here--- BOOT_PARTITION_OFFSET="$((BOOT_PARTITION_START*512))" BOOT_PARTITION_BYTES="$((BOOT_PARTITION_SIZE*1024*1024))" @@ -70,12 +70,11 @@ echo "enable_uart=1" > build/root/boot/config.txt ## wireless support mkdir -p build/root/lib/firmware/brcm pushd build/root/lib/firmware/brcm -BRCM_URL_BASE=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/master/brcm -curl -sL -o brcmfmac43430-sdio.txt ${BRCM_URL_BASE}/brcmfmac43430-sdio.txt +BRCM_URL_BASE=https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/brcm/ +curl -sL -o brcmfmac43430-sdio.txt ${BRCM_URL_BASE}/brcmfmac43430-sdio.raspberrypi,3-model-b.txt curl -sL -o brcmfmac43430-sdio.bin ${BRCM_URL_BASE}/brcmfmac43430-sdio.bin curl -sL -o brcmfmac43455-sdio.bin ${BRCM_URL_BASE}/brcmfmac43455-sdio.bin -curl -sL -o brcmfmac43455-sdio.clm_blob ${BRCM_URL_BASE}/brcmfmac43455-sdio.clm_blob -curl -sL -o brcmfmac43455-sdio.txt ${BRCM_URL_BASE}/brcmfmac43455-sdio.txt +curl -sL -o brcmfmac43455-sdio.txt ${BRCM_URL_BASE}/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt popd # TODO: we need to remove these lines