main, live, rescue: reorder package list variables

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#c5Suggested-by: Leonid Krivoshein <klark@altlinux.org>

main, live, rescue: reorder package list variables
77908d8a · Michael Shigorin · a2d55319 · 77908d8a · 77908d8a · 77908d8a
Commit 77908d8a authored Jun 11, 2018 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 16 deletions

stage2cfg.mk features.in/live/live/stage2cfg.mk +6 -7

stage2cfg.mk features.in/rescue/rescue/stage2cfg.mk +2 -2

Makefile sub.in/main/Makefile +7 -7

No files found.
--- a/features.in/live/live/stage2cfg.mk
+++ b/features.in/live/live/stage2cfg.mk
 # stage2 mod: livecd

-STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
+STAGE2_KMODULES = $(LIVE_KMODULES) $(THE_KMODULES)

-IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
-			$(LIVE_PACKAGES_REGEXP)
+IMAGE_PACKAGES_REGEXP = $(LIVE_PACKAGES_REGEXP) $(THE_PACKAGES_REGEXP)

-IMAGE_PACKAGES = $(call map,list, \
-			$(THE_LISTS) $(THE_GROUPS) \
-			$(LIVE_LISTS) $(LIVE_GROUPS)) \
-		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
+IMAGE_PACKAGES = $(COMMON_PACKAGES) $(LIVE_PACKAGES) $(THE_PACKAGES) \
+		 $(call map,list, \
+			$(LIVE_LISTS) $(LIVE_GROUPS) \
+			$(THE_LISTS) $(THE_GROUPS)) \
 		 interactivesystem

 MKI_PACK_RESULTS = squash:live

--- a/features.in/rescue/rescue/stage2cfg.mk
+++ b/features.in/rescue/rescue/stage2cfg.mk
 # stage2 mod: rescue "live" image

-IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
-		 $(COMMON_PACKAGES) \
+IMAGE_PACKAGES = $(COMMON_PACKAGES) \
 		 $(RESCUE_PACKAGES) \
+		 $(call list,$(RESCUE_LISTS)) \
 		 interactivesystem startup-rescue

 MKI_PACK_RESULTS = squash:rescue

--- a/sub.in/main/Makefile
+++ b/sub.in/main/Makefile
@@ -12,20 +12,20 @@ include $(MKIMAGE_PREFIX)/config.mk

 CHROOT_PACKAGES = apt-utils rsync

-IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
-			$(BASE_PACKAGES_REGEXP) \
+IMAGE_PACKAGES_REGEXP = $(BASE_PACKAGES_REGEXP) \
+			$(THE_PACKAGES_REGEXP) \
 			$(MAIN_PACKAGES_REGEXP) \
 			$(call kpackages, \
 			       $(KFLAVOURS), \
-			       $(THE_KMODULES) \
 			       $(BASE_KMODULES) \
 			       $(BASE_KMODULES_REGEXP) \
+			       $(THE_KMODULES) \
 			       $(MAIN_KMODULES))

-IMAGE_PACKAGES = $(call map,list,$(THE_LISTS) $(BASE_LISTS) $(MAIN_LISTS) \
-				 $(call groups2lists)) \
-		 $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
-		 $(THE_PACKAGES) $(BASE_PACKAGES) $(MAIN_PACKAGES)
+IMAGE_PACKAGES = $(SYSTEM_PACKAGES) $(COMMON_PACKAGES) \
+		 $(BASE_PACKAGES) $(THE_PACKAGES) $(MAIN_PACKAGES) \
+		 $(call map,list,$(BASE_LISTS) $(THE_LISTS) $(MAIN_LISTS) \
+				 $(call groups2lists))

 -include $(sort $(wildcard lib/*.mk))