JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- https://tracker.debian.org/news/1579223/software-properties-removed-from-testing/
- that provides add-apt-repository, but we don't use that on Debian, hopefully
- move also cpufrequtils hack (which requires release) to specific function after userspace checks and when DISTRIBUTION is set
- `software-properties-gtk` if of course also gone, so remove that for desktop's sake
This commit is contained in:
Ricardo Pardini
2024-11-11 23:17:04 +01:00
committed by Igor
parent 9b68c85c6c
commit 37d9200e6a
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/functions/configuration/main-config.sh
View File

@@ -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"
}

16
lib/functions/main/config-prepare.sh
View File

@@ -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'
@@ -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##*:}"