Build a separate image for each dtbo

.buildbot/openwrt/build.sh

@@ -23,7 +23,10 @@ cat ${pwd}/feeds.conf >> feeds.conf
 ./scripts/feeds install -a
 
 make defconfig
+echo 'CONFIG_PACKAGE_python3-packages=y' >> .config
+echo 'CONFIG_PACKAGE_python3-packages-list="CherryPy==18.8.0"' >> .config
 
+make package/python3-packages/compile
 make package/asterisk-chan-quectel/compile
 # no signing key
 make package/index
@@ -33,8 +36,13 @@ cd ${pwd}
 
 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}
+
 cd openwrt-imagebuilder-*/
-cp ${sdkdir}/bin/targets/bcm27xx/bcm2711/packages/*.ipk packages/
+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/
 
@@ -43,15 +51,6 @@ make info
 # Double the size of the root partition
 echo "CONFIG_TARGET_ROOTFS_PARTSIZE=208" >> .config
 
-# Setup files
-mkdir -p files/boot/overlays
-cp ${pwd}/overlays/*.dtbo overlays/*.txt files/boot/overlays/
-mkdir -p files/etc/uci-defaults
-cat << "EOF" > files/etc/uci-defaults/99-custom
-echo "dtoverlay=ed-mcp2515-spi1-can0" >> /boot/config.txt
-echo "dtoverlay=ed-sdhost" >> /boot/config.txt
-EOF
-
 PACKAGES="kmod-i2c-bcm2835 kmod-nf-nathelper-extra kmod-rtc-ds1307 \
 	  kmod-usb-audio kmod-usb-net-rtl8152 \
 	  alsa-lib pciutils usbutils \
@@ -63,6 +62,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-nf-nathelper-extra kmod-rtc-ds1307 \
 	  asterisk-codec-alaw asterisk-codec-ulaw \
 	  asterisk-res-rtp-asterisk \
 	  asterisk-chan-quectel \
+	  ca-certificates \
 	  collectd collectd-mod-contextswitch collectd-mod-cpu \
 	  collectd-mod-curl \
 	  collectd-mod-dhcpleases collectd-mod-disk \
@@ -82,16 +82,38 @@ PACKAGES="kmod-i2c-bcm2835 kmod-nf-nathelper-extra kmod-rtc-ds1307 \
 	  collectd-mod-wireless \
 	  curl etherwake fail2ban \
 	  luci-app-https-dns-proxy luci-app-mwan3 luci-app-upnp \
-	  python3-yaml \
+	  luci-ssl-nginx luci-app-acme \
+	  python3-packages python3-yaml \
 	  wireguard-tools wget-ssl \
 	 "
 
-make image PROFILE=rpi-4 PACKAGES="${PACKAGES}" FILES="files"
+# Setup files
+mkdir -p files/boot/overlays
+cp ${pwd}/overlays/ed-mcp2515-spi1-can0.dtbo overlays/dualeth.txt files/boot/overlays/
+mkdir -p files/etc/uci-defaults
+cat << "EOF" > files/etc/uci-defaults/99-custom
+echo "dtoverlay=ed-mcp2515-spi1-can0" >> /boot/config.txt
+EOF
 
-make manifest PROFILE=rpi-4 PACKAGES="${PACKAGES}"
+make image PROFILE=${PROFILE} PACKAGES="${PACKAGES}" 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/ed-sdhost.dtbo overlays/sensing.txt files/boot/overlays/
+cat << "EOF" > files/etc/uci-defaults/99-custom
+echo "dtoverlay=ed-sdhost" >> /boot/config.txt
+EOF
+
+make image PROFILE=${PROFILE} PACKAGES="${PACKAGES}" FILES="files"
+
+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
+
+make manifest PROFILE=${PROFILE} PACKAGES="${PACKAGES}"
 
 out=../../out
 
 mkdir -p ${out}
-mv bin/targets/bcm27xx/bcm2711/*.gz ${out}
+mv ${BINPATH}/*.gz ${out}
 mv packages ${out}