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@.
This commit is contained in:
parent
cb764516eb
commit
6c00e10b31
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user