From d799b5a6dfbd73a2d7287bae51e61d8893c6cf2a Mon Sep 17 00:00:00 2001 From: Igor Date: Fri, 3 Nov 2023 08:10:59 +0100 Subject: [PATCH] Remove cpufrequtils from trixie as its not / will not be present anymore (#5881) * Remove cpufrequtils from trixie as its not / will not be present anymore * Remove aggregation hacks for cpufrequtils while adding another condition --- config/cli/common/main/packages | 1 + .../amd64/_config/cli/_all_distributions/main/packages | 1 - .../arm64/_config/cli/_all_distributions/main/packages | 1 - .../armhf/_config/cli/_all_distributions/main/packages | 1 - lib/functions/configuration/main-config.sh | 2 ++ 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/cli/common/main/packages b/config/cli/common/main/packages index 1b4794f75..3493e87b2 100644 --- a/config/cli/common/main/packages +++ b/config/cli/common/main/packages @@ -4,6 +4,7 @@ bridge-utils chrony command-not-found console-setup +cpufrequtils cron curl dbus-user-session diff --git a/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages b/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages index d4a25a894..ef2bb7c35 100644 --- a/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages +++ b/config/optional/architectures/amd64/_config/cli/_all_distributions/main/packages @@ -1,3 +1,2 @@ gpiod -cpufrequtils nocache diff --git a/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages b/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages index 770d21f5c..9ed0fca10 100644 --- a/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages +++ b/config/optional/architectures/arm64/_config/cli/_all_distributions/main/packages @@ -1,4 +1,3 @@ gpiod -cpufrequtils mtd-utils nocache diff --git a/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages b/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages index 770d21f5c..9ed0fca10 100644 --- a/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages +++ b/config/optional/architectures/armhf/_config/cli/_all_distributions/main/packages @@ -1,4 +1,3 @@ gpiod -cpufrequtils mtd-utils nocache diff --git a/lib/functions/configuration/main-config.sh b/lib/functions/configuration/main-config.sh index f66a5cae3..aca73a98e 100644 --- a/lib/functions/configuration/main-config.sh +++ b/lib/functions/configuration/main-config.sh @@ -281,6 +281,8 @@ function do_main_configuration() { declare -g -r PACKAGE_LIST_FAMILY="${PACKAGE_LIST_FAMILY}" declare -g -r PACKAGE_LIST_FAMILY_REMOVE="${PACKAGE_LIST_FAMILY_REMOVE}" + if [[ $RELEASE == trixie || $ARCH == riscv64 ]]; then remove_packages "cpufrequtils"; fi # this will remove from rootfs as well + display_alert "Done with do_main_configuration" "do_main_configuration" "debug" }