From 6c00e10b31829c5f5d58dab314a5992818b906f2 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Thu, 19 Jul 2012 13:32:53 +0300 Subject: [PATCH] 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@. --- features.in/live/live/stage2cfg.mk | 4 ++-- features.in/rescue/rescue/stage2cfg.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/features.in/live/live/stage2cfg.mk b/features.in/live/live/stage2cfg.mk index fb477842..161903cb 100644 --- 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 diff --git a/features.in/rescue/rescue/stage2cfg.mk b/features.in/rescue/rescue/stage2cfg.mk index e0f30596..fc975d9b 100644 --- a/features.in/rescue/rescue/stage2cfg.mk +++ b/features.in/rescue/rescue/stage2cfg.mk @@ -1,8 +1,8 @@ # 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