From 2b5cbe32df303532e9ccca8dcfc5554d7ad27edf Mon Sep 17 00:00:00 2001
From: Lee Miller <lee.miller@tutanota.com>
Date: Tue, 7 Nov 2023 00:25:56 +0200
Subject: [PATCH] Use EXTRA_IMAGE_NAME Image Builder variable instead of moving

---
 .buildbot/openwrt/build.sh | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh
index 70d6306..87cec19 100755
--- a/.buildbot/openwrt/build.sh
+++ b/.buildbot/openwrt/build.sh
@@ -134,25 +134,20 @@ pushd ${BOOTSOURCE}
 git apply ${pwd}/patches/bootconfig-add.patch
 popd
 
-make image PROFILE=${PROFILE} \
+make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="dualeth" \
      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
 
 sed -i "s|,i2c_csi_dsi||g" ${BOOTSOURCE}/current.txt
 sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=768/g" .config
 
-make image PROFILE=${PROFILE} \
+make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="waveshare" \
      PACKAGES=" \
 	${PACKAGES} cryptsetup kmod-ata-ahci smartmontools hdparm fdisk parted \
 	kmod-hwmon-drivetemp btrfs-progs kmod-fs-btrfs kmod-nvme nvme-cli \
         docker dockerd docker-compose block-mount" \
      DISABLED_SERVICES="dropbear" FILES="files" || exit 1
 
-mv ${IMAGE_PATH}-squashfs-factory.img.gz ${IMAGE_PATH}-squashfs-factory-waveshare.img.gz
-mv ${IMAGE_PATH}-squashfs-sysupgrade.img.gz ${IMAGE_PATH}-squashfs-sysupgrade-waveshare.img.gz
-
 
 cp ${pwd}/overlays/sensing.txt ${BOOTSOURCE}/current.txt
 cp ${pwd}/overlays/*.dtbo ${OVERLAYSOURCE}
@@ -164,8 +159,7 @@ popd
 
 sed -i "s/CONFIG_TARGET_ROOTFS_PARTSIZE=.*/CONFIG_TARGET_ROOTFS_PARTSIZE=308/g" .config
 
-
-make image PROFILE=${PROFILE} \
+make image PROFILE=${PROFILE} EXTRA_IMAGE_NAME="sensing" \
      PACKAGES="${PACKAGES} asterisk \
 	  asterisk-app-sms asterisk-pjsip asterisk-bridge-simple \
 	  asterisk-codec-alaw asterisk-codec-ulaw \
@@ -173,9 +167,6 @@ make image PROFILE=${PROFILE} \
 	  asterisk-chan-quectel" \
      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
-
 
 cat ${BINPATH}/*.manifest