From 8ce700380ca9c558946c82007966f79f568829b4 Mon Sep 17 00:00:00 2001
From: Oleg Kalachev <okalachev@gmail.com>
Date: Thu, 8 Apr 2021 02:12:16 +0300
Subject: [PATCH] image: update Raspberry Pi OS to 2021-03-04

---
 builder/image-build.sh   |  3 ++-
 builder/image-network.sh | 10 ++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/builder/image-build.sh b/builder/image-build.sh
index 9f41c64a..7459336e 100755
--- a/builder/image-build.sh
+++ b/builder/image-build.sh
@@ -15,7 +15,8 @@
 
 set -e # Exit immidiately on non-zero result
 
-SOURCE_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-01-12/2021-01-11-raspios-buster-armhf-lite.zip"
+# https://www.raspberrypi.org/software/operating-systems/#raspberry-pi-os-32-bit
+SOURCE_IMAGE="https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-03-25/2021-03-04-raspios-buster-armhf-lite.zip"
 
 export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:='noninteractive'}
 export LANG=${LANG:='C.UTF-8'}
diff --git a/builder/image-network.sh b/builder/image-network.sh
index 4e4def78..64bc7491 100755
--- a/builder/image-network.sh
+++ b/builder/image-network.sh
@@ -61,8 +61,6 @@ quiet-dhcp6
 EOF
 
 echo_stamp "#4 Build the RTL8814AU Wi-Fi adapter driver"
-wget http://archive.raspberrypi.org/debian/pool/main/r/raspberrypi-firmware/raspberrypi-kernel-headers_1.20210108-1_armhf.deb
-dpkg -i raspberrypi-kernel-headers_1.20210108-1_armhf.deb
 cd /home/pi
 git clone https://github.com/aircrack-ng/rtl8812au.git --depth=1
 cd rtl8812au
@@ -73,12 +71,12 @@ sed -i 's/CONFIG_PLATFORM_I386_PC = y/CONFIG_PLATFORM_I386_PC = n/g' Makefile #
 sed -i 's/CONFIG_PLATFORM_ARM_RPI = n/CONFIG_PLATFORM_ARM_RPI = y/g' Makefile
 # sed -i 's/CONFIG_PLATFORM_ARM64_RPI = n/CONFIG_PLATFORM_ARM64_RPI = y/g' Makefile
 apt-cache policy raspberrypi-kernel-headers
-# apt-get install -y raspberrypi-kernel-headers=1.20210108 dkms
-apt-get install -y dkms
+apt-get install -y raspberrypi-kernel-headers dkms
 ls /lib/modules
+KERNEL_VERSION=5.10.17-v7l+ # TODO: get kernel version from the fs
 echo make
-make KERNEL_VER=5.4.83-v7l+ KVER=5.4.83-v7l+ # TODO: determine kernel version from fs
+make KERNEL_VER=$KERNEL_VERSION KVER=$KERNEL_VERSION # TODO: determine kernel version from fs
 echo make install
-make install KERNEL_VER=5.4.83-v7l+ KVER=5.4.83-v7l+
+make install KERNEL_VER=$KERNEL_VERSION KVER=$KERNEL_VERSION
 
 echo_stamp "#5 End of network installation"