From 644618d9c4223148c83cc2a7e43bb50ac2a03899 Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Wed, 17 May 2023 18:17:58 +0300
Subject: [PATCH] Copy additional bootconfig as current.txt

---
 .buildbot/openwrt/build.sh   | 12 ++++++++----
 patches/bootconfig-add.patch | 10 ++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 patches/bootconfig-add.patch

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index a5513d1..18ee814 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -110,7 +110,7 @@ chmod 0400 files/etc/dropbear/authorized_keys
 mkdir -p files/etc/uci-defaults
 cp ${pwd}/defaults/* files/etc/uci-defaults
 
-cp ${pwd}/overlays/dualeth.txt ${BOOTSOURCE}
+cp ${pwd}/overlays/dualeth.txt ${BOOTSOURCE}/current.txt
 
 cp ${BOOTCONFIG} .
 
@@ -120,19 +120,23 @@ dtparam=spi=on
 dtparam=i2s=on
 dtoverlay=i2c-rtc,ds1307
 
-include dualeth.txt
+include current.txt
 EOF
 
+pushd ${BOOTSOURCE}
+git apply ${pwd}/patches/bootconfig-add.patch
+popd
+
 make image PROFILE=${PROFILE} \
      PACKAGES="${PACKAGES}" DISABLED_SERVICES="dropbear" FILES="files"
 
 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
 
-cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE}
+cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE}/current.txt
 cp ${pwd}/overlays/*.dtbo ${OVERLAYSOURCE}
 cp config.txt ${BOOTCONFIG}
-echo "include sensing.txt" >> ${BOOTCONFIG}
+echo "include current.txt" >> ${BOOTCONFIG}
 pushd ${KERNELSOURCE}
 git apply ${pwd}/patches/overlay-add.patch
 popd
diff --git a/patches/bootconfig-add.patch b/patches/bootconfig-add.patch
new file mode 100644
index 0000000..4a8ab74
--- /dev/null
+++ b/patches/bootconfig-add.patch
@@ -0,0 +1,10 @@
+--- a/Makefile	2023-05-17 03:13:19.345089802 +0300
++++ b/Makefile	2023-05-17 03:15:55.564872084 +0300
+@@ -22,6 +22,7 @@
+ 	mcopy -i $@.boot cmdline.txt ::
+ 	mcopy -i $@.boot config.txt ::
+ 	mcopy -i $@.boot distroconfig.txt ::
++	mcopy -i $@.boot current.txt ::
+ 	mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
+ 	$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
+ 	mmd -i $@.boot ::/overlays