Add COMMON_LISTS variable support by analogy COMMON_PACKAGES
The commit 9969571369478c23c1abc0f5c03364c92ddd255e used this variable even though it didn't exist yet. A good reason to add this variable.
This commit is contained in:
parent
94213d29b4
commit
b16288bb90
@ -23,8 +23,9 @@
|
||||
* для пользовательского окружения (live, main) предназначены
|
||||
THE_PACKAGES, THE_LISTS, THE_GROUPS, THE_PACKAGES_REGEXP
|
||||
|
||||
* для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES
|
||||
(NB: тоже попадают в базовую установку)
|
||||
* для "обычного общего" (live, main, rescue) есть COMMON_PACKAGES и
|
||||
COMMON_LISTS
|
||||
(NB: тоже попадают в базовую установку, ve/ и vm/ сборки)
|
||||
|
||||
* SYSTEM_PACKAGES стоит применять крайне осторожно -- эти пакеты попадут
|
||||
во все стадии, в том числе в образ чувствительной к объёму install2
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
* main: пакетная база для установки
|
||||
** sub.in/main/Makefile, features.in/*/main/lib/
|
||||
** THE_LISTS, BASE_LISTS, MAIN_LISTS
|
||||
** THE_LISTS, BASE_LISTS, MAIN_LISTS, COMMON_LISTS
|
||||
** THE_GROUPS, MAIN_GROUPS
|
||||
** THE_PACKAGES, BASE_PACKAGES, MAIN_PACKAGES,
|
||||
SYSTEM_PACKAGES, COMMON_PACKAGES
|
||||
@ -31,7 +31,7 @@
|
||||
** см. stage2
|
||||
** features.in/live/live/stage2cfg.mk,
|
||||
features.in/*/live/lib/
|
||||
** THE_LISTS, LIVE_LISTS
|
||||
** THE_LISTS, LIVE_LISTS, COMMON_LISTS
|
||||
** THE_GROUPS, LIVE_GROUPS
|
||||
** THE_PACKAGES, LIVE_PACKAGES, COMMON_PACKAGES
|
||||
** THE_PACKAGES_REGEXP, LIVE_PACKAGES_REGEXP
|
||||
@ -41,7 +41,7 @@
|
||||
** см. stage2
|
||||
** features.in/rescue/rescue/stage2cfg.mk
|
||||
** RESCUE_PACKAGES, COMMON_PACKAGES
|
||||
** RESCUE_LISTS
|
||||
** RESCUE_LISTS, COMMON_LISTS
|
||||
|
||||
* stage1: ядро и загрузчик второй стадии
|
||||
** sub.in/stage1/Makefile, features.in/*/stage1/lib/
|
||||
|
@ -19,7 +19,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
|
||||
$(COMMON_PACKAGES) \
|
||||
$(BASE_PACKAGES) \
|
||||
$(THE_PACKAGES) \
|
||||
$(call list,$(BASE_LISTS) $(THE_LISTS))
|
||||
$(call list,$(BASE_LISTS) $(THE_LISTS) $(COMMON_LISTS))
|
||||
|
||||
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
|
||||
$(BASE_PACKAGES_REGEXP)
|
||||
|
@ -5,7 +5,7 @@ IMAGE_PACKAGES = $(DOT_BASE) \
|
||||
$(COMMON_PACKAGES) \
|
||||
$(BASE_PACKAGES) \
|
||||
$(THE_PACKAGES) \
|
||||
$(call list,$(BASE_LISTS) $(THE_LISTS))
|
||||
$(call list,$(BASE_LISTS) $(THE_LISTS) $(COMMON_LISTS))
|
||||
|
||||
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
|
||||
$(BASE_PACKAGES_REGEXP)
|
||||
|
@ -7,7 +7,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)) \
|
||||
$(THE_LISTS) $(THE_GROUPS) \
|
||||
$(COMMON_LISTS)) \
|
||||
interactivesystem
|
||||
|
||||
MKI_PACK_RESULTS = squash:live
|
||||
|
@ -27,7 +27,7 @@ metadata-.base:
|
||||
{ \
|
||||
echo "## generated by features.in/metadata/lib/50-metadata.mk";\
|
||||
$(foreach p,SYSTEM COMMON THE BASE,$(call dump,PACKAGES,$(p))) \
|
||||
$(foreach l,THE BASE,$(call dump,LISTS,$(l))) \
|
||||
$(foreach l,COMMON THE BASE,$(call dump,LISTS,$(l))) \
|
||||
if [ -n "$(DOT_BASE)" ]; then \
|
||||
echo -e "\n## DOT_BASE\n$(DOT_BASE)"; \
|
||||
fi; \
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
IMAGE_PACKAGES = $(COMMON_PACKAGES) \
|
||||
$(RESCUE_PACKAGES) \
|
||||
$(call list,$(RESCUE_LISTS)) \
|
||||
$(call list,$(RESCUE_LISTS) $(COMMON_LISTS)) \
|
||||
interactivesystem startup-rescue
|
||||
|
||||
MKI_PACK_RESULTS = squash:rescue
|
||||
|
@ -27,6 +27,7 @@ IMAGE_PACKAGES_REGEXP = $(BASE_PACKAGES_REGEXP) \
|
||||
IMAGE_PACKAGES = $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
|
||||
$(BASE_PACKAGES) $(THE_PACKAGES) $(MAIN_PACKAGES) \
|
||||
$(call map,list,$(BASE_LISTS) $(THE_LISTS) $(MAIN_LISTS) \
|
||||
$(COMMON_LISTS) \
|
||||
$(call groups2lists))
|
||||
|
||||
-include $(sort $(wildcard lib/*.mk))
|
||||
|
Loading…
x
Reference in New Issue
Block a user