qiurui/armbian-build
1
0
Fork 0
mirror of https://github.com/armbian/build.git synced 2026-09-08 23:59:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

host: strip optional group:: prefix in install_host_side_packages

Browse Source 
Introduces HOSTDEP_GROUP_DELIMITER/HOSTDEP_DEFAULT_GROUP and strips the
optional "group::package" prefix before dpkg matching / apt install.
Prep for Docker layer grouping.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Ricardo Pardini
2026-06-21 23:04:42 +02:00
co-authored by Claude Opus 4.8
parent 89f27bbdb1
commit 9cabafe201
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/functions/host/host-utils.sh
+8
View File
@@ -42,7 +42,14 @@ wait_for_package_manager() {
done
}
# Host dependency entries may carry an optional "group::package" prefix (see prepare-host.sh).
# The group is only meaningful for Docker layer splitting (docker.sh); everywhere else the
# bare package name is used. Split on the *first* "::" so apt multiarch names (pkg:arch) survive.
declare -g HOSTDEP_GROUP_DELIMITER="::"
declare -g HOSTDEP_DEFAULT_GROUP="core"
# Install the whitespace-delimited packages listed in the first parameter, in the host (not chroot).
# Entries may be "group::package"; the optional group prefix is stripped before installing.
# It handles correctly the case where all wanted packages are already installed, and in that case does nothing.
# If packages are to be installed, it does an apt-get update first.
function install_host_side_packages() {
@@ -63,6 +70,7 @@ function install_host_side_packages() {
currently_provided_packages=($(dpkg-query --show --showformat='${Provides}\n' | grep -v "^$" | sed -e 's/([^()]*)//g' | sed -e 's|,||g' | tr -s "\n" " "))
for PKG_TO_INSTALL in ${wanted_packages_string}; do
PKG_TO_INSTALL="${PKG_TO_INSTALL#*"${HOSTDEP_GROUP_DELIMITER}"}" # drop optional "group::" prefix
# shellcheck disable=SC2076 # I wanna match literally, thanks.
if [[ ! " ${currently_installed_packages[*]} " =~ " ${PKG_TO_INSTALL} " ]]; then
if [[ ! " ${currently_provided_packages[*]} " =~ " ${PKG_TO_INSTALL} " ]]; then