From: Ian Kelling <iank@fsf.org>
Date: Fri, 7 Jun 2024 04:46:48 +0000 (-0400)
Subject: enable ecne and noble
X-Git-Url: https://iankelling.org/git/?a=commitdiff_plain;h=fd92920315ea1ec28049041f74011324c750c667;p=automated-distro-installer

enable ecne and noble
---

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index d449c60..91c4ea3 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -48,6 +48,7 @@ EXCLUDE_NABIA=udhcpc,dibbler-client,info
 EXCLUDE_JAMMY=udhcpc,dibbler-client,info
 EXCLUDE_ARAMO=udhcpc,dibbler-client,info
 EXCLUDE_NOBLE=udhcpc,dibbler-client,info
+EXCLUDE_ECNE=udhcpc,dibbler-client,info
 
 # here you can add packages, that are needed very early
 INCLUDE_DEBIAN=
@@ -269,6 +270,7 @@ prtdists() {
                  JAMMY64
                  ARAMO64
                  NOBLE64
+                 ECNE64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
@@ -358,7 +360,7 @@ case "$target" in
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
     SLC7_64) slc amd64 7 ;;
-    BELENOS*|FLIDAS*|ETIONA*|NABIA*|ARAMO*)
+    BELENOS*|FLIDAS*|ETIONA*|NABIA*|ARAMO*|ECNE*)
         debgeneric $target $MIRROR_TRISQUEL ;;
     TRUSTY*|XENIAL*|BIONIC*|FOCAL*|JAMMY*|NOBLE*)
         debgeneric $target $MIRROR_UBUNTU ;;
diff --git a/fai/config/class/50-host-classes b/fai/config/class/50-host-classes
index 600fd1a..25567e5 100755
--- a/fai/config/class/50-host-classes
+++ b/fai/config/class/50-host-classes
@@ -31,14 +31,14 @@ echo FAIBASE STANDARD DEBIAN
 # things installed, to speed up installation.
 #
 # STRETCH64, BUSTER64, BULLSEYE64, BOOKWORM64
-# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64, ARAMO64
+# FLIDAS64, FLIDAS64BIG, ETIONA64, NABIA64, ARAMO64, ECNE64
 # XENIAL64, BIONIC64, FOCAL64,
 #
 # The distro subvol name, we can add as many of these as we want:
 # VOL_TESTING, VOL_STRETCH, VOL_BUSTER, VOL_BULLSEYE, VOL_BOOKWORM
-# VOL_FLIDAS, VOL_ETIONA, VOL_NABIA, VOL_ARAMO
-# VOL_XENIAL, VOL_BIONIC VOL_FOCAL
-# VOL_BUSTER_BOOTSTRAP.
+# VOL_FLIDAS, VOL_ETIONA, VOL_NABIA, VOL_ARAMO, VOL_ECNE
+# VOL_XENIAL, VOL_BIONIC, VOL_FOCAL, VOL_JAMMY, VOL_NOBLE
+# VOL_BULLSEYE_BOOTSTRAP, VOL_BOOKWORM_BOOTSTRAP.
 # Using VOL_BUSTER_BOOTSTRAP sets up the install to act like a pxe rom if
 # grub sets a specific var.
 #
@@ -48,7 +48,7 @@ echo FAIBASE STANDARD DEBIAN
 # BULLSEYE_FREE, BULLSEYE_NONFREE
 # BOOKWORM_FREE, BOOKWORM_NONFREE
 # TESTING_FREE, TESTING_NONFREE,
-# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, ARAMO.
+# XENIAL_FREE, BIONIC, FOCAL, FLIDAS, ETIONA, NABIA, ARAMO, ECNE.
 #
 # It's all a little redundant in some cases, but it keeps things
 # simpler.
@@ -135,6 +135,8 @@ exit 0
 #echo FSF
 if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
   case $HOSTNAME in
+    # bullseye based minimal recovery / bootstraping os:
+    _) echo BOOKWORM64 VOL_BOOKWORM_BOOTSTRAP BOOKWORM_FREE ;;
     # bullseye based minimal recovery / bootstraping os:
     _) echo BULLSEYE64 VOL_BULLSEYE_BOOTSTRAP BULLSEYE_FREE ;;
     # flidas
@@ -142,9 +144,11 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     # etiona
     _) echo UBUNTU ETIONA64 VOL_ETIONA ETIONA ;;
     # nabia
-    _) echo UBUNTU NABIA64 VOL_NABIA NABIA NABIA_EXTRA  ;;
+    _) echo UBUNTU NABIA64 VOL_NABIA NABIA ;;
     # aramo
-    _) echo UBUNTU ARAMO64 VOL_ARAMO ARAMO ARAMO_EXTRA  ;;
+    _) echo UBUNTU ARAMO64 VOL_ARAMO ARAMO ARAMO_EXTRA JAMMY_FIRMWARE ;;
+    # ecne
+    _) echo UBUNTU ECNE64 VOL_ECNE ECNE ECNE_EXTRA NOBLE_FIRMWARE ;;
     # stretch
     _) echo STRETCH64 VOL_STRETCH STRETCH_NONFREE ;;
     # buster
@@ -163,6 +167,8 @@ if [[ ! -e /a/bin/fai/fai-wrapper || $FAI_ACTION == dirinstall ]]; then
     _) echo UBUNTU FOCAL64 VOL_FOCAL FOCAL ;;
     # jammy
     _) echo UBUNTU JAMMY64 VOL_JAMMY JAMMY ;;
+    # NOBLE
+    _) echo UBUNTU NOBLE64 VOL_NOBLE NOBLE ;;
   esac
 fi
 ###### end Template for 51-multi-boot ######
diff --git a/fai/config/files/etc/apt/preferences.d/ecne-noble/ECNE b/fai/config/files/etc/apt/preferences.d/ecne-noble/ECNE
new file mode 100644
index 0000000..4e12926
--- /dev/null
+++ b/fai/config/files/etc/apt/preferences.d/ecne-noble/ECNE
@@ -0,0 +1,3 @@
+Package: *
+Pin: release n=noble,o=Ubuntu
+Pin-Priority: -100
diff --git a/fai/config/files/etc/apt/preferences.d/noble-firmware/NOBLE_FIRMWARE b/fai/config/files/etc/apt/preferences.d/noble-firmware/NOBLE_FIRMWARE
new file mode 100644
index 0000000..f26de6b
--- /dev/null
+++ b/fai/config/files/etc/apt/preferences.d/noble-firmware/NOBLE_FIRMWARE
@@ -0,0 +1,3 @@
+Package: linux-image-generic linux-firmware intel-microcode amd64-microcode
+Pin: release n=noble,o=Ubuntu
+Pin-Priority: 1001
diff --git a/fai/config/files/etc/apt/sources.list.d/aaa-ecne.list/ECNE b/fai/config/files/etc/apt/sources.list.d/aaa-ecne.list/ECNE
new file mode 100644
index 0000000..7313dac
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/aaa-ecne.list/ECNE
@@ -0,0 +1,11 @@
+deb http://archive.trisquel.org/trisquel/ ecne main
+deb-src http://archive.trisquel.org/trisquel/ ecne main
+
+deb http://archive.trisquel.org/trisquel/ ecne-updates main
+deb-src http://archive.trisquel.org/trisquel/ ecne-updates main
+
+deb http://archive.trisquel.info/trisquel/ ecne-security main
+deb-src http://archive.trisquel.info/trisquel/ ecne-security main
+
+deb http://archive.trisquel.org/trisquel/ ecne-backports main
+deb-src http://archive.trisquel.org/trisquel/ ecne-backports main
diff --git a/fai/config/files/etc/apt/sources.list.d/noble.list/ECNE_EXTRA b/fai/config/files/etc/apt/sources.list.d/noble.list/ECNE_EXTRA
new file mode 120000
index 0000000..fdba700
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/noble.list/ECNE_EXTRA
@@ -0,0 +1 @@
+NOBLE
\ No newline at end of file
diff --git a/fai/config/files/etc/apt/sources.list.d/noble.list/JAMMY_EXTRA b/fai/config/files/etc/apt/sources.list.d/noble.list/JAMMY_EXTRA
new file mode 120000
index 0000000..fdba700
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/noble.list/JAMMY_EXTRA
@@ -0,0 +1 @@
+NOBLE
\ No newline at end of file
diff --git a/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE b/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE
new file mode 100644
index 0000000..cda7d9c
--- /dev/null
+++ b/fai/config/files/etc/apt/sources.list.d/noble.list/NOBLE
@@ -0,0 +1,14 @@
+# multiverse needed for libfdk-aac1, which is actually free
+# https://www.gnu.org/licenses/license-list.html#fdk
+
+###### Ubuntu Main Repos
+deb http://archive.ubuntu.com/ubuntu/ noble main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ noble main universe multiverse
+
+###### Ubuntu Update Repos
+deb http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe
+deb-src http://archive.ubuntu.com/ubuntu/ noble-security main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ noble-updates main universe multiverse
+deb-src http://archive.ubuntu.com/ubuntu/ noble-backports main universe
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 530a34d..36f858c 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -714,6 +714,8 @@ if [[ ! $DISTRO ]]; then
     DISTRO=ubuntufocal
   elif ifclass VOL_JAMMY; then
     DISTRO=ubuntujammy
+  elif ifclass VOL_NOBLE; then
+    DISTRO=ubuntunoble
   elif ifclass VOL_FLIDAS; then
     DISTRO=trisquelflidas
   elif ifclass VOL_ETIONA; then
@@ -722,6 +724,8 @@ if [[ ! $DISTRO ]]; then
     DISTRO=trisquelnabia
   elif ifclass VOL_ARAMO; then
     DISTRO=trisquelaramo
+  elif ifclass VOL_ECNE; then
+    DISTRO=trisquelecne
   elif $mkroot2 || $mkroot2tab; then
     :
   else
diff --git a/fai/config/package_config/ARAMO.gpg b/fai/config/package_config/ARAMO.gpg
deleted file mode 100644
index 58057f6..0000000
Binary files a/fai/config/package_config/ARAMO.gpg and /dev/null differ
diff --git a/fai/config/package_config/ARAMO.gpg b/fai/config/package_config/ARAMO.gpg
new file mode 120000
index 0000000..4c6b790
--- /dev/null
+++ b/fai/config/package_config/ARAMO.gpg
@@ -0,0 +1 @@
+ECNE.gpg
\ No newline at end of file
diff --git a/fai/config/package_config/ECNE.gpg b/fai/config/package_config/ECNE.gpg
new file mode 100644
index 0000000..58057f6
Binary files /dev/null and b/fai/config/package_config/ECNE.gpg differ
diff --git a/fai/config/package_config/ECNE_EXTRA.gpg b/fai/config/package_config/ECNE_EXTRA.gpg
new file mode 120000
index 0000000..ce7b110
--- /dev/null
+++ b/fai/config/package_config/ECNE_EXTRA.gpg
@@ -0,0 +1 @@
+UBUNTU_UP.gpg
\ No newline at end of file
diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index e7b9e6d..c81dbe7 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -83,7 +83,7 @@ setrel() {
 	return
     fi
 
-    dists="jessie stretch buster bullseye bookworm trixie forky noble jammy focal bionic xenial trusty aramo nabia etiona"
+    dists="jessie stretch buster bullseye bookworm trixie forky noble jammy focal bionic xenial trusty ecne aramo nabia etiona"
     for d in $dists; do
 	if grep -iq $d $target/etc/os-release; then
 	    release=$d
diff --git a/mymk-basefile b/mymk-basefile
index 1f32665..03ef01e 100755
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -41,6 +41,7 @@ Args I've used before:
 -z STRETCH64
 -z XENIAL64
 
+-z ECNE64
 -z ARAMO64
 -z NABIA64
 -z ETIONA64