From d876323952295a319c4588dd9c9d3f08a2625f89 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Tue, 4 Jul 2023 16:57:52 +0300
Subject: [PATCH 1/2] Improve Dockerfile:

 - fully parametrize downloads,
 - move env parameters down after apt packages install,
 - add python3-distutils for building without buildbot.
---
 .buildbot/openwrt/Dockerfile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile
index 6088b5b..953f9cf 100644
--- a/.buildbot/openwrt/Dockerfile
+++ b/.buildbot/openwrt/Dockerfile
@@ -1,27 +1,28 @@
 FROM ubuntu:focal
 
-ENV OPENWRT_VERSION=22.03.2
-ENV OPENWRT_TARGET=bcm27xx
-ENV OPENWRT_DEVICE=bcm2711
-ENV OPENWRT_CC=gcc-11.2.0_musl
-
 RUN apt -y update
 
 RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \
   apt -yq install \
   build-essential rsync git-core subversion mercurial libssl-dev \
   libncurses5-dev unzip  gawk zlib1g-dev libncursesw5-dev zlib1g-dev \
-  gettext xsltproc wget unzip python
+  gettext xsltproc wget unzip python python3-distutils
+
+# Board build parameters
+ENV OPENWRT_VERSION=22.03.2
+ENV OPENWRT_TARGET=bcm27xx
+ENV OPENWRT_DEVICE=bcm2711
+ENV OPENWRT_CC=gcc-11.2.0_musl
 
 RUN mkdir /Downloads
 
 RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}.Linux-x86_64.tar.xz"
+     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-imagebuilder-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}.Linux-x86_64.tar.xz"
 
 RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
 # RUN wget -qP /Downloads \
-#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
 ADD . .
-- 
2.45.1


From be26956e3e67a8b301dd47adb0b5697e12af14ca Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Tue, 4 Jul 2023 17:04:46 +0300
Subject: [PATCH 2/2] Add a PKG_ARCH variable, reuse packages built from feed
 base

---
 .buildbot/openwrt/build.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index c0e6c7a..cf359c8 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -45,12 +45,14 @@ tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz
 PROFILE=rpi-4
 BINPATH=bin/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}
 IMAGE_PATH=${BINPATH}/openwrt-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}-${PROFILE}
+PKG_ARCH=aarch64_cortex-a72
 
 cd openwrt-imagebuilder-*/
 cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/base/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/packages/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/telephony/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/local/*.ipk packages/
 
 make info
 
@@ -96,7 +98,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
 
 BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image
 BOOTCONFIG=${BOOTSOURCE}/config.txt
-KERNELSOURCE=build_dir/target-aarch64_cortex-a72_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
+KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
 OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays
 
 # Setup files
-- 
2.45.1