Add Ubuntu 25.10 / 26.04 questing and resolute as csc build target, demote Bookworm to csc

2026-01-06 09:58:46 -08:00 · 2025-11-15 13:34:05 +01:00
parent 28b459d8a7
commit 06dbd0074c
18 changed files with 20 additions and 6 deletions
--- a/config/cli/questing
+++ b/config/cli/questing
@@ -0,0 +1 @@
+noble
--- a/config/cli/resolute
+++ b/config/cli/resolute
@@ -0,0 +1 @@
+noble
--- a/config/desktop/questing
+++ b/config/desktop/questing
@@ -0,0 +1 @@
+noble
--- a/config/desktop/resolute
+++ b/config/desktop/resolute
@@ -0,0 +1 @@
+noble
--- a/config/distributions/bookworm/support
+++ b/config/distributions/bookworm/support
@@ -1 +1 @@
-supported
+csc
--- a/config/distributions/questing/architectures
+++ b/config/distributions/questing/architectures
@@ -0,0 +1 @@
+arm64,armhf,riscv64,amd64
--- a/config/distributions/questing/name
+++ b/config/distributions/questing/name
@@ -0,0 +1 @@
+Ubuntu questing 25.10
--- a/config/distributions/questing/order
+++ b/config/distributions/questing/order
@@ -0,0 +1 @@
+11
--- a/config/distributions/questing/support
+++ b/config/distributions/questing/support
@@ -0,0 +1 @@
+csc
--- a/config/distributions/questing/upgrade
+++ b/config/distributions/questing/upgrade
@@ -0,0 +1 @@
+none
--- a/config/distributions/resolute/architectures
+++ b/config/distributions/resolute/architectures
@@ -0,0 +1 @@
+arm64,armhf,riscv64,amd64
--- a/config/distributions/resolute/name
+++ b/config/distributions/resolute/name
@@ -0,0 +1 @@
+Ubuntu resolute 26.04
--- a/config/distributions/resolute/order
+++ b/config/distributions/resolute/order
@@ -0,0 +1 @@
+12
--- a/config/distributions/resolute/support
+++ b/config/distributions/resolute/support
@@ -0,0 +1 @@
+csc
--- a/config/distributions/resolute/upgrade
+++ b/config/distributions/resolute/upgrade
@@ -0,0 +1 @@
+none
--- a/config/distributions/sid/order
+++ b/config/distributions/sid/order
@@ -1 +1 @@
-11
+13
--- a/lib/functions/configuration/main-config.sh
+++ b/lib/functions/configuration/main-config.sh
@@ -368,7 +368,7 @@ function do_extra_configuration() {
 	[[ -z $BOOTPATCHDIR ]] && BOOTPATCHDIR="u-boot-$LINUXFAMILY" # @TODO move to hook
 	[[ -z $ATFPATCHDIR ]] && ATFPATCHDIR="atf-$LINUXFAMILY"

-	if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular|plucky)$ ]]; then
+	if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular|plucky|questing|resolute)$ ]]; then
 		DISTRIBUTION="Ubuntu"
 	else
 		DISTRIBUTION="Debian"
--- a/lib/functions/rootfs/distro-specific.sh
+++ b/lib/functions/rootfs/distro-specific.sh
@@ -89,7 +89,7 @@ function fetch_distro_keyring() {
 		buster | bullseye | bookworm | trixie | forky | sid)
 			distro="debian"
 			;;
-		focal | jammy | noble | oracular | plucky | raccoon)
+		focal | jammy | noble | oracular | plucky | questing | resolute )
 			distro="ubuntu"
 			;;
 		*)
@@ -157,7 +157,7 @@ function fetch_distro_keyring() {
 # create_sources_list_and_deploy_repo_key <when> <release> <basedir>
 #
 # <when>: rootfs|image
-# <release>: bullseye|bookworm|trixie|forky|sid|focal|jammy|noble|oracular|plucky
+# <release>: bullseye|bookworm|trixie|forky|sid|focal|jammy|noble|oracular|plucky|questing|resolute
 # <basedir>: path to root directory
 #
 function create_sources_list_and_deploy_repo_key() {
@@ -239,7 +239,7 @@ function create_sources_list_and_deploy_repo_key() {
 			fi
 			;;

-		focal | jammy | noble | oracular | plucky)
+		focal | jammy | noble | oracular | plucky | questing | resolute)
 			distro="ubuntu"

 			cat <<- EOF > "${basedir}/etc/apt/sources.list.d/${distro}.sources"