Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hack: trixie has lost its software-properties-common package so get rid of it for all Debian releases #7464

Merged
merged 1 commit into from
Nov 12, 2024
Merged

hack: trixie has lost its software-properties-common package so get rid of it for all Debian releases #7464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/functions/configuration/main-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,6 @@ 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"
}

Expand Down
16 changes: 16 additions & 0 deletions lib/functions/main/config-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ function config_post_main() {
# Do some sanity checks for userspace stuff, if RELEASE/DESKTOP_ENVIRONMENT is set.
check_config_userspace_release_and_desktop

# late Userspace / package list fixes; RELEASE and DISTRIBUTION must be set.
fix_userspace_packages_release_and_distro

track_general_config_variables "before calling extension_finish_config"
display_alert "Extensions: finish configuration" "extension_finish_config" "debug"
call_extension_method "extension_finish_config" <<- 'EXTENSION_FINISH_CONFIG'
Expand Down Expand Up @@ -380,6 +383,19 @@ function check_config_userspace_release_and_desktop() {
return 0
}

function fix_userspace_packages_release_and_distro() {
display_alert "fix_userspace_packages_release_and_distro" "For distro '${DISTRIBUTION}' release '${RELEASE}'" "debug"

# Some old hack from the past, not sure if it's still needed. Originally from https://github.com/armbian/build/pull/5881
if [[ $RELEASE == trixie || $ARCH == riscv64 ]]; then remove_packages "cpufrequtils"; fi # this will remove from rootfs as well

# Debian: no need for this package in the rootfs, as it provides add-apt-repository which is not used on our Debian builds
if [[ "${DISTRIBUTION}" == "Debian" ]]; then
display_alert "Not-installing software-properties-common" "For distro '${DISTRIBUTION}' release '${RELEASE}'" "warn"
remove_packages "software-properties-common" "software-properties-gtk" "software-properties-common"
fi
}

# Some utility functions
function branch2dir() {
[[ "${1}" == "head" ]] && echo "HEAD" || echo "${1##*:}"
Expand Down
Loading