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

armbian-next: aggregation: don't include packages.additional if BUILD_MINIMAL=yes

Browse Source
This commit is contained in:
Ricardo Pardini
2023-02-10 03:29:07 +01:00
parent 46b14d28c9
commit 49947ec373
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/functions/configuration/aggregation.sh
View File

@@ -65,6 +65,7 @@ function aggregate_all_packages_python() {
"BOARD=" # empty. Important: BOARD is no longer considered for package aggregation
"USERPATCHES_PATH=${USERPATCHES_PATH}"
"SELECTED_CONFIGURATION=${SELECTED_CONFIGURATION}"
"BUILD_MINIMAL=${BUILD_MINIMAL}" # if yes, it does not include packages.additional, on top of differences of SELECTED_CONFIGURATION
# Removals. Will remove from all lists.
"REMOVE_PACKAGES=${REMOVE_PACKAGES[*]}"

7
lib/tools/aggregation.py
View File

@@ -29,6 +29,7 @@ with open(output_file, "w") as bash:
bash.write("")
BUILD_DESKTOP = armbian_utils.yes_or_no_or_bomb(armbian_utils.get_from_env_or_bomb("BUILD_DESKTOP"))
BUILD_MINIMAL = armbian_utils.yes_or_no_or_bomb(armbian_utils.get_from_env_or_bomb("BUILD_MINIMAL"))
INCLUDE_EXTERNAL_PACKAGES = True
ARCH = armbian_utils.get_from_env_or_bomb("ARCH")
DESKTOP_ENVIRONMENT = armbian_utils.get_from_env("DESKTOP_ENVIRONMENT")
@@ -74,11 +75,13 @@ debootstrap_packages_remove = util.aggregate_all_debootstrap("packages.remove")
# both main and additional result in the same thing, just different filenames.
rootfs_packages_main = util.aggregate_all_cli("packages")
rootfs_packages_additional = util.aggregate_all_cli("packages.additional")
rootfs_packages_external = util.aggregate_all_cli("packages.external") # @TODO: enable/disable this
rootfs_packages_all = util.merge_lists(rootfs_packages_main, rootfs_packages_additional, "add")
rootfs_packages_all = rootfs_packages_main
rootfs_packages_all = util.merge_lists(rootfs_packages_all, rootfs_packages_external, "add")
rootfs_packages_remove = util.aggregate_all_cli("packages.remove")
if not BUILD_MINIMAL:
rootfs_packages_additional = util.aggregate_all_cli("packages.additional")
rootfs_packages_all = util.merge_lists(rootfs_packages_all, rootfs_packages_additional, "add")
# Desktop environment packages; packages + packages.external
desktop_packages_main = util.aggregate_all_desktop("packages")