Bring back missing dev/stable switch support for iso

build.sh

@@ -72,7 +72,7 @@ build () {
     YYYYMMDD="$(date +%Y%m%d%H%M)"
     OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
     mkdir -p "$OUTPUT_DIR"
-    FNAME="ubuntusway-$VERSION-$BUILD_ARCH-$YYYYMMDD-$OUTPUT_SUFFIX"
+    FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX"
     mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
 
     md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"

etc/config/archives/mozillateam.list

@@ -1 +1 @@
-deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu jammy main
+deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu @BASECODENAME main

etc/config/archives/ubuntu-sway-dev.list

@@ -1 +0,0 @@
-deb https://ppa.launchpadcontent.net/ubuntusway-dev/dev/ubuntu jammy main 

etc/config/archives/ubuntusway.list

@@ -0,0 +1,2 @@
+deb https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main
+deb-src https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main

etc/config/package-lists.calamares/pool.list.binary

@@ -5,11 +5,14 @@ intel-microcode
 iucode-tool
 setserial
 user-setup
+
 efibootmgr
-grub-efi
 secureboot-db
+
+#if ARCHITECTURES amd64
 grub-efi-amd64
 grub-efi-amd64-bin
 grub-efi-amd64-signed
 shim
 shim-signed
+#endif

etc/terraform.conf

@@ -14,8 +14,8 @@ CODENAME="jammy"
 VERSION="22.04"
 
 # distribution channel
-#CHANNEL="unstable"
-CHANNEL="stable"
+#CHANNEL="stable"
+CHANNEL="dev"
 
 # distribution name
 NAME="Ubuntu Sway Remix"