live, rescue: fix stage2cfg.mk LISTS/PACKAGES order

The reason is that package lists and individual packages are processed in different dependency resolution "transactions" by mkimage; thus if packages (the more precise form of specifying the contents) come first they can't override the lists appearing later, and that's wrong: we should be able to specify the more generic things and then pinpoint the specifics. This became apparent while authoring [[Mkimage/Profiles/m-p/howto]] asked for by drool@.

live, rescue: fix stage2cfg.mk LISTS/PACKAGES order
6c00e10b · Michael Shigorin · cb764516 · 6c00e10b · 6c00e10b
Commit 6c00e10b authored Jul 19, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

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

No files found.
--- a/features.in/live/live/stage2cfg.mk
+++ b/features.in/live/live/stage2cfg.mk
@@ -5,10 +5,10 @@ STAGE2_KMODULES = $(THE_KMODULES) $(LIVE_KMODULES)
 IMAGE_PACKAGES_REGEXP = $(THE_PACKAGES_REGEXP) \
 			$(LIVE_PACKAGES_REGEXP)

-IMAGE_PACKAGES = $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
-		 $(call map,list, \
+IMAGE_PACKAGES = $(call map,list, \
 			$(THE_LISTS) $(THE_GROUPS) \
 			$(LIVE_LISTS) $(LIVE_GROUPS)) \
+		 $(COMMON_PACKAGES) $(THE_PACKAGES) $(LIVE_PACKAGES) \
 		 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 = $(COMMON_PACKAGES) \
+IMAGE_PACKAGES = $(call list,$(RESCUE_LISTS)) \
+		 $(COMMON_PACKAGES) \
 		 $(RESCUE_PACKAGES) \
-		 $(call list,$(RESCUE_LISTS)) \
 		 interactivesystem startup-rescue

 MKI_PACK_RESULTS = squash:rescue