Update Armbian to 23.08, add overlay that enables USB-C peripheral, a…

…dd overlay for SPI1

armbian/customize-image-barebone.sh

@@ -22,9 +22,26 @@ install_bins(){
     chmod +x /usr/local/bin/*
 }
 
+add_overlays(){
+    mkdir /boot/overlay-user
+    cp /tmp/overlay/dts/* /boot/overlay-user
+    armbian-add-overlay /boot/overlay-user/sun50i-a64-usb-device.dts
+}
+
+fix_netplan(){
+    cat <<- EOF > /etc/netplan/armbian-default.yaml
+		network:
+		  version: 2
+		  renderer: NetworkManager
+	EOF
+}
+
 echo "🍰 Rebuild starting..."
 
 install_bins
+add_overlays
+fix_netplan
+
 cp /tmp/overlay/rebuild/rebuild-version /etc/
 
 echo "🍰 Rebuild finished"

armbian/customize-image-fluidd.sh

@@ -155,6 +155,21 @@ post_build() {
     # Force debian to change password
     chage -d 0 debian
 }
+
+add_overlays(){
+    mkdir /boot/overlay-user
+    cp /tmp/overlay/dts/* /boot/overlay-user
+    armbian-add-overlay /boot/overlay-user/sun50i-a64-usb-device.dts
+}
+
+fix_netplan(){
+    cat <<- EOF > /etc/netplan/armbian-default.yaml
+		network:
+		  version: 2
+		  renderer: NetworkManager
+	EOF
+}
+
 echo "🍰 Rebuild starting..."
 
 set -e
@@ -168,6 +183,8 @@ install_klipperscreen
 install_ustreamer
 install_bins
 install_autohotspot
+add_overlays
+fix_netplan
 post_build
 
 echo "🍰 Rebuild finished"

armbian/customize-image-mainsail.sh

@@ -166,6 +166,20 @@ post_build() {
     chage -d 0 debian
 }
 
+add_overlays(){
+    mkdir /boot/overlay-user
+    cp /tmp/overlay/dts/* /boot/overlay-user
+    armbian-add-overlay /boot/overlay-user/sun50i-a64-usb-device.dts
+}
+
+fix_netplan(){
+    cat <<- EOF > /etc/netplan/armbian-default.yaml
+		network:
+		  version: 2
+		  renderer: NetworkManager
+	EOF
+}
+
 set -e
 echo "🍰 Rebuild starting..."
 prepare_build
@@ -177,6 +191,8 @@ install_klipperscreen
 install_ustreamer
 install_bins
 install_autohotspot
+add_overlays
+fix_netplan
 post_build
 
 echo "🍰 Rebuild finished"

rebuild.sh

@@ -27,8 +27,8 @@ NAME="rebuild-${VERSION}-${TAG}"
 
 cd $BUILD_DIR
 git reset --hard
-git checkout v23.05.2
 git pull
+git checkout v23.08
 rm -rf "userpatches"
 
 cd "$ROOT_DIR"
@@ -37,11 +37,7 @@ cp armbian/customize-image-"${VERSION}".sh "${BUILD_DIR}"/userpatches/customize-
 cp armbian/recore.csc "${BUILD_DIR}"/config/boards
 rm -f "${BUILD_DIR}/patch/u-boot/u-boot-sunxi/allwinner-boot-splash.patch"
 
-if [ "$VERSION" == "reflash" ]; then
-    cp armbian/watermark-reflash.png "${BUILD_DIR}"/packages/plymouth-theme-armbian/watermark.png
-else
-    cp armbian/watermark.png "${BUILD_DIR}"/packages/plymouth-theme-armbian/watermark.png
-fi
+cp armbian/watermark.png "${BUILD_DIR}"/packages/plymouth-theme-armbian/watermark.png
 
 echo "${NAME}" > "${BUILD_DIR}"/userpatches/overlay/rebuild/rebuild-version