konevsa/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

live, image.in: use function for get lists from groups (for live)

Browse Source 
A group may contain more than one list, or the group name may not
match the list name.
This commit is contained in:
Anton Midyukov 2024-08-02 14:21:09 +03:00
parent 6d696ca802
commit b71f3b67ab
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features.in/live/live/stage2cfg.mk
View File

@ -6,8 +6,8 @@ IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
$(call map,list, \
$(LIVE_LISTS) $(LIVE_GROUPS) \
$(THE_LISTS) $(THE_GROUPS) \
$(LIVE_LISTS) $(THE_LISTS) \
$(call live_groups2lists) \
$(COMMON_LISTS)) \
interactivesystem

10
image.in/functions.mk
View File

@ -54,6 +54,16 @@ $(if $(filter groups2lists,$(0)),$(shell \
))
endef
define live_groups2lists
$(if $(filter live_groups2lists,$(0)),$(shell \
if [ -n "$(THE_GROUPS)$(LIVE_GROUPS)" ]; then \
sed -rn 's,^X-Alterator-PackageList=(.*)$$,\1,p' \
$(call map,group,$(THE_GROUPS) $(LIVE_GROUPS)) | \
sed 's/;/\n/g'; \
fi; \
))
endef
# kernel package list generation; see also #24669
NULL :=
SPACE := $(NULL) # the officially documented way of getting a space