From 06dbd0074c9788f99e0ef444a068d1012e86366a Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 15 Nov 2025 13:34:05 +0100 Subject: [PATCH] Add Ubuntu 25.10 / 26.04 questing and resolute as csc build target, demote Bookworm to csc --- config/cli/questing | 1 + config/cli/resolute | 1 + config/desktop/questing | 1 + config/desktop/resolute | 1 + config/distributions/bookworm/support | 2 +- config/distributions/questing/architectures | 1 + config/distributions/questing/name | 1 + config/distributions/questing/order | 1 + config/distributions/questing/support | 1 + config/distributions/questing/upgrade | 1 + config/distributions/resolute/architectures | 1 + config/distributions/resolute/name | 1 + config/distributions/resolute/order | 1 + config/distributions/resolute/support | 1 + config/distributions/resolute/upgrade | 1 + config/distributions/sid/order | 2 +- lib/functions/configuration/main-config.sh | 2 +- lib/functions/rootfs/distro-specific.sh | 6 +++--- 18 files changed, 20 insertions(+), 6 deletions(-) create mode 120000 config/cli/questing create mode 120000 config/cli/resolute create mode 120000 config/desktop/questing create mode 120000 config/desktop/resolute create mode 100644 config/distributions/questing/architectures create mode 100644 config/distributions/questing/name create mode 100644 config/distributions/questing/order create mode 100644 config/distributions/questing/support create mode 100644 config/distributions/questing/upgrade create mode 100644 config/distributions/resolute/architectures create mode 100644 config/distributions/resolute/name create mode 100644 config/distributions/resolute/order create mode 100644 config/distributions/resolute/support create mode 100644 config/distributions/resolute/upgrade diff --git a/config/cli/questing b/config/cli/questing new file mode 120000 index 0000000000..c44ffafd2e --- /dev/null +++ b/config/cli/questing @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/cli/resolute b/config/cli/resolute new file mode 120000 index 0000000000..c44ffafd2e --- /dev/null +++ b/config/cli/resolute @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/desktop/questing b/config/desktop/questing new file mode 120000 index 0000000000..c44ffafd2e --- /dev/null +++ b/config/desktop/questing @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/desktop/resolute b/config/desktop/resolute new file mode 120000 index 0000000000..c44ffafd2e --- /dev/null +++ b/config/desktop/resolute @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/distributions/bookworm/support b/config/distributions/bookworm/support index a23e5fb945..03cd470150 100644 --- a/config/distributions/bookworm/support +++ b/config/distributions/bookworm/support @@ -1 +1 @@ -supported +csc diff --git a/config/distributions/questing/architectures b/config/distributions/questing/architectures new file mode 100644 index 0000000000..6103381d18 --- /dev/null +++ b/config/distributions/questing/architectures @@ -0,0 +1 @@ +arm64,armhf,riscv64,amd64 diff --git a/config/distributions/questing/name b/config/distributions/questing/name new file mode 100644 index 0000000000..c14c294d0d --- /dev/null +++ b/config/distributions/questing/name @@ -0,0 +1 @@ +Ubuntu questing 25.10 diff --git a/config/distributions/questing/order b/config/distributions/questing/order new file mode 100644 index 0000000000..b4de394767 --- /dev/null +++ b/config/distributions/questing/order @@ -0,0 +1 @@ +11 diff --git a/config/distributions/questing/support b/config/distributions/questing/support new file mode 100644 index 0000000000..03cd470150 --- /dev/null +++ b/config/distributions/questing/support @@ -0,0 +1 @@ +csc diff --git a/config/distributions/questing/upgrade b/config/distributions/questing/upgrade new file mode 100644 index 0000000000..621e94f0ec --- /dev/null +++ b/config/distributions/questing/upgrade @@ -0,0 +1 @@ +none diff --git a/config/distributions/resolute/architectures b/config/distributions/resolute/architectures new file mode 100644 index 0000000000..6103381d18 --- /dev/null +++ b/config/distributions/resolute/architectures @@ -0,0 +1 @@ +arm64,armhf,riscv64,amd64 diff --git a/config/distributions/resolute/name b/config/distributions/resolute/name new file mode 100644 index 0000000000..e39c80aeed --- /dev/null +++ b/config/distributions/resolute/name @@ -0,0 +1 @@ +Ubuntu resolute 26.04 diff --git a/config/distributions/resolute/order b/config/distributions/resolute/order new file mode 100644 index 0000000000..48082f72f0 --- /dev/null +++ b/config/distributions/resolute/order @@ -0,0 +1 @@ +12 diff --git a/config/distributions/resolute/support b/config/distributions/resolute/support new file mode 100644 index 0000000000..03cd470150 --- /dev/null +++ b/config/distributions/resolute/support @@ -0,0 +1 @@ +csc diff --git a/config/distributions/resolute/upgrade b/config/distributions/resolute/upgrade new file mode 100644 index 0000000000..621e94f0ec --- /dev/null +++ b/config/distributions/resolute/upgrade @@ -0,0 +1 @@ +none diff --git a/config/distributions/sid/order b/config/distributions/sid/order index b4de394767..b1bd38b62a 100644 --- a/config/distributions/sid/order +++ b/config/distributions/sid/order @@ -1 +1 @@ -11 +13 diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 8db608135f..ac3760f015 100644 --- 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" diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index c124b60762..7e9ee05a38 100644 --- 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 # # : rootfs|image -# : bullseye|bookworm|trixie|forky|sid|focal|jammy|noble|oracular|plucky +# : bullseye|bookworm|trixie|forky|sid|focal|jammy|noble|oracular|plucky|questing|resolute # : 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"