keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

main, live, rescue: reorder package list variables

Browse Source 
The places of the terms *do* affect the sum in apt's case;
start with lowlevel items like SYSTEM_PACKAGES and end with
high-level ones like THE_LISTS to reduce the chance of getting
hit by premature virtual dependency expansion/fixation.

Adapt live and rescue features accordingly.

See-also: https://bugzilla.altlinux.org/show_bug.cgi?id=30806#c5
Suggested-by: Leonid Krivoshein <klark@altlinux.org>
This commit is contained in:
Michael Shigorin 2018-06-11 15:34:11 +03:00
parent a2d55319e1
commit 77908d8a08
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,13 @@
# stage2 mod: livecd # stage2 mod: livecd
STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES) STAGE2_KMODULES = $(LIVE_KMODULES) $(THE_KMODULES)
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \ IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)
$(LIVE_PACKAGES_REGEXP)
IMAGE_PACKAGES = $(call map,list, \ IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
$(THE_LISTS) $(THE_GROUPS) \ $(call map,list, \
$(LIVE_LISTS) $(LIVE_GROUPS)) \ $(LIVE_LISTS) $(LIVE_GROUPS) \
$(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \ $(THE_LISTS) $(THE_GROUPS)) \
interactivesystem interactivesystem
MKI_PACK_RESULTS = squash:live MKI_PACK_RESULTS = squash:live

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

@ -1,8 +1,8 @@
# stage2 mod: rescue "live" image # stage2 mod: rescue "live" image
IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \ IMAGE_PACKAGES = $(COMMON_PACKAGES) \
$(COMMON_PACKAGES) \
$(RESCUE_PACKAGES) \ $(RESCUE_PACKAGES) \
$(call list,$(RESCUE_LISTS)) \
interactivesystem startup-rescue interactivesystem startup-rescue
MKI_PACK_RESULTS = squash:rescue MKI_PACK_RESULTS = squash:rescue

14
sub.in/main/Makefile
View File

@ -12,20 +12,20 @@ include $(MKIMAGE_PREFIX)/config.mk
CHROOT_PACKAGES = apt-utils rsync CHROOT_PACKAGES = apt-utils rsync
IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \ IMAGE_PACKAGES_REGEXP = $(BASE_PACKAGES_REGEXP) \
$(BASE_PACKAGES_REGEXP) \ $(THE_PACKAGES_REGEXP) \
$(MAIN_PACKAGES_REGEXP) \ $(MAIN_PACKAGES_REGEXP) \
$(call kpackages, \ $(call kpackages, \
$(KFLAVOURS), \ $(KFLAVOURS), \
$(THE_KMODULES) \
$(BASE_KMODULES) \ $(BASE_KMODULES) \
$(BASE_KMODULES_REGEXP) \ $(BASE_KMODULES_REGEXP) \
$(THE_KMODULES) \
$(MAIN_KMODULES)) $(MAIN_KMODULES))
IMAGE_PACKAGES = $(call map,list,$(THE_LISTS) $(BASE_LISTS) $(MAIN_LISTS) \ IMAGE_PACKAGES = $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
$(call groups2lists)) \ $(BASE_PACKAGES) $(THE_PACKAGES) $(MAIN_PACKAGES) \
$(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \ $(call map,list,$(BASE_LISTS) $(THE_LISTS) $(MAIN_LISTS) \
$(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES) $(call groups2lists))
-include $(sort $(wildcard lib/*.mk)) -include $(sort $(wildcard lib/*.mk))