From 1477b478c5bc73f1b9e6beb2ba3b9051128d1eb8 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 23 Jan 2025 09:38:33 +0100 Subject: [PATCH] Add upstream release as csc target: Ubuntu plucky 25.04 --- config/cli/plucky | 1 + config/desktop/plucky | 1 + config/distributions/oracular/support | 2 +- config/distributions/plucky/architectures | 1 + config/distributions/plucky/name | 1 + config/distributions/plucky/order | 1 + config/distributions/plucky/support | 1 + config/distributions/plucky/upgrade | 1 + lib/functions/configuration/main-config.sh | 2 +- lib/functions/rootfs/distro-specific.sh | 4 ++-- 10 files changed, 11 insertions(+), 4 deletions(-) create mode 120000 config/cli/plucky create mode 120000 config/desktop/plucky create mode 100644 config/distributions/plucky/architectures create mode 100644 config/distributions/plucky/name create mode 100644 config/distributions/plucky/order create mode 100644 config/distributions/plucky/support create mode 100644 config/distributions/plucky/upgrade diff --git a/config/cli/plucky b/config/cli/plucky new file mode 120000 index 000000000000..c44ffafd2e46 --- /dev/null +++ b/config/cli/plucky @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/desktop/plucky b/config/desktop/plucky new file mode 120000 index 000000000000..c44ffafd2e46 --- /dev/null +++ b/config/desktop/plucky @@ -0,0 +1 @@ +noble \ No newline at end of file diff --git a/config/distributions/oracular/support b/config/distributions/oracular/support index 03cd47015043..bc2264ca197d 100644 --- a/config/distributions/oracular/support +++ b/config/distributions/oracular/support @@ -1 +1 @@ -csc +eos diff --git a/config/distributions/plucky/architectures b/config/distributions/plucky/architectures new file mode 100644 index 000000000000..6103381d1881 --- /dev/null +++ b/config/distributions/plucky/architectures @@ -0,0 +1 @@ +arm64,armhf,riscv64,amd64 diff --git a/config/distributions/plucky/name b/config/distributions/plucky/name new file mode 100644 index 000000000000..01514921cb01 --- /dev/null +++ b/config/distributions/plucky/name @@ -0,0 +1 @@ +Ubuntu plucky 25.04 diff --git a/config/distributions/plucky/order b/config/distributions/plucky/order new file mode 100644 index 000000000000..45a4fb75db86 --- /dev/null +++ b/config/distributions/plucky/order @@ -0,0 +1 @@ +8 diff --git a/config/distributions/plucky/support b/config/distributions/plucky/support new file mode 100644 index 000000000000..03cd47015043 --- /dev/null +++ b/config/distributions/plucky/support @@ -0,0 +1 @@ +csc diff --git a/config/distributions/plucky/upgrade b/config/distributions/plucky/upgrade new file mode 100644 index 000000000000..621e94f0ec95 --- /dev/null +++ b/config/distributions/plucky/upgrade @@ -0,0 +1 @@ +none diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index 498caa28f638..3ebea21a048b 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -361,7 +361,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)$ ]]; then + if [[ "$RELEASE" =~ ^(focal|jammy|noble|oracular|plucky)$ ]]; then DISTRIBUTION="Ubuntu" else DISTRIBUTION="Debian" diff --git a/lib/functions/rootfs/distro-specific.sh b/lib/functions/rootfs/distro-specific.sh index db40363be3ff..010ff4b3c907 100644 --- a/lib/functions/rootfs/distro-specific.sh +++ b/lib/functions/rootfs/distro-specific.sh @@ -69,7 +69,7 @@ function install_distribution_specific() { # create_sources_list_and_deploy_repo_key # # : rootfs|image -# : bullseye|bookworm|sid|focal|jammy|noble|oracular +# : bullseye|bookworm|sid|focal|jammy|noble|oracular|plucky # : path to root directory # function create_sources_list_and_deploy_repo_key() { @@ -139,7 +139,7 @@ function create_sources_list_and_deploy_repo_key() { fi ;; - focal | jammy | noble | oracular) + focal | jammy | noble | oracular | plucky) cat <<- EOF > "${basedir}"/etc/apt/sources.list deb http://${UBUNTU_MIRROR} $release main restricted universe multiverse #deb-src http://${UBUNTU_MIRROR} $release main restricted universe multiverse