From 403625fef43537053f84387c1d4ea79c7a5fdc57 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 21 Aug 2020 19:34:59 +0300 Subject: [PATCH] mixin-basealt.mk: avoid things broken/missing on e2k 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 :-/ --- conf.d/mixin-basealt.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk index 79721289..38cc0cb0 100644 --- a/conf.d/mixin-basealt.mk +++ b/conf.d/mixin-basealt.mk @@ -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)