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

mixin-basealt.mk: avoid things broken/missing on e2k

Browse Source 
Wonder if installer-feature-quota-stage2 was a problem
on other arches but having it in LIVE_PACKAGES fails
image build for me:

  livecd-installer-features: Conflicts: installer-common-stage2

and having it INSTALL2_PACKAGES results in another startup
problem (seems like quotas try to start a bit too early);
not that this one is a blocker but spoils the party nevertheless.

NB: relevant package versions are the same.

Also avoid workstation/extras pkglist: it's strongly hardwired,
seems like last-minute implementation :-/
This commit is contained in:
Michael Shigorin 2020-08-21 19:34:59 +03:00
parent f31f305f8e
commit 403625fef4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/mixin-basealt.mk
View File

@ -62,11 +62,13 @@ mixin/alt-workstation-install: +installer \
@$(call add,INSTALL2_PACKAGES,btrfs-progs)
@$(call add,INSTALL2_PACKAGES,open-iscsi)
@$(call add,INSTALL2_PACKAGES,xorg-conf-libinput-touchpad)
ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,installer-feature-quota-stage2)
@$(call add,LIVE_PACKAGES,installer-feature-quota-stage2)
@$(call add,MAIN_LISTS,workstation/extras)
endif
@$(call add,LIVE_PACKAGES,livecd-installer-features)
@$(call add,LIVE_PACKAGES,installer-feature-lightdm-stage3)
@$(call add,MAIN_LISTS,workstation/extras)
@$(call add,MAIN_LISTS,$(call tags,xorg vaapi))
@$(call add,MAIN_PACKAGES,solaar)
@$(call add,STAGE2_PACKAGES,chrony)