From 604299e7cef07871d472b15ec440432b7ce633cf Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Sun, 19 Mar 2023 02:13:32 +0200
Subject: [PATCH 1/4] Comment out downloading of toolchain - it's not used

---
 .buildbot/openwrt/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildbot/openwrt/Dockerfile b/.buildbot/openwrt/Dockerfile
index 5b374be..6088b5b 100644
--- a/.buildbot/openwrt/Dockerfile
+++ b/.buildbot/openwrt/Dockerfile
@@ -21,7 +21,7 @@ RUN wget -qP /Downloads \
 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"
 
-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"
+# 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"
 
 ADD . .
-- 
2.45.1


From 78bcedaf6063c31379c132605c6bec4870c01fe5 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Sun, 19 Mar 2023 06:24:08 +0200
Subject: [PATCH 2/4] Cleanup build.sh:

  - show the manifest existing after make image instead of making a new one;
  - don't move packages to out - the directory is ignored by multibuild;
  - don't make package index, because imagebuilder builds it's own.
---
 .buildbot/openwrt/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index 18ee814..82d80f7 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -32,8 +32,6 @@ make package/kmod-i2c-mux-pinctrl/compile
 make package/kmod-rtc-pcf85063/compile
 make package/asterisk-chan-quectel/compile
 make package/collectd/compile
-# no signing key
-make package/index
 
 sdkdir=$(pwd)
 cd ${pwd}
@@ -148,10 +146,9 @@ mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-sensing.
 mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-sensing.img.gz
 
 
-make manifest PROFILE=${PROFILE} PACKAGES="${PACKAGES}"
+cat ${BINPATH}/*.manifest
 
 out=../../out
 
 mkdir -p ${out}
 mv ${BINPATH}/*.gz ${out}
-mv packages ${out}
-- 
2.45.1


From afa793799c1b8160193da43a4536de0dab25a7a1 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Fri, 26 May 2023 01:48:20 +0300
Subject: [PATCH 3/4] Rename feed to local

---
 .buildbot/openwrt/build.sh | 2 +-
 feeds.conf                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index 82d80f7..e331b35 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -46,7 +46,7 @@ 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/quectel/*.ipk packages/
+cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/
 
 make info
 
diff --git a/feeds.conf b/feeds.conf
index dc06164..9b1eead 100644
--- a/feeds.conf
+++ b/feeds.conf
@@ -1,2 +1,2 @@
 
-src-link quectel ../feed
+src-link local ../feed
-- 
2.45.1


From a3ddbfac67dae9b4c960172748f6bf1cdca2d0e9 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Fri, 26 May 2023 01:50:19 +0300
Subject: [PATCH 4/4] Exit early if imagebuilder fails

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

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index e331b35..b2872e4 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -126,7 +126,7 @@ git apply ${pwd}/patches/bootconfig-add.patch
 popd
 
 make image PROFILE=${PROFILE} \
-     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
+     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-dualeth.img.gz
 mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-dualeth.img.gz
@@ -140,7 +140,7 @@ git apply ${pwd}/patches/overlay-add.patch
 popd
 
 make image PROFILE=${PROFILE} \
-     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
+     PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
 mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-sensing.img.gz
 mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-sensing.img.gz
-- 
2.45.1