diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk index 4d672bdc..08bc0bd4 100644 --- a/conf.d/basealt.mk +++ b/conf.d/basealt.mk @@ -12,7 +12,7 @@ distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \ use/install2/repo use/install2/suspend use/live/suspend \ use/live/install use/live/x11 use/live/repo use/live/rw \ use/branding/complete use/docs/license \ - use/domain-client/full use/x11/amdgpu + use/domain-client/full use/x11/amdgpu use/x11/lightdm/gtk @$(call add,INSTALL2_PACKAGES,open-iscsi) @$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,MAIN_PACKAGES,solaar) @@ -28,14 +28,26 @@ distro/alt-workstation: distro/.base +power +vmguest +wireless +efi \ endif ifeq (,$(filter-out e2k%,$(ARCH))) -distro/.alt-workstation: distro/.e2k-installer mixin/alt-workstation +distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation @$(call add,THE_PACKAGES,setup-mate-terminal) @$(call add,THE_PACKAGES,setup-mate-nocomposite) + @$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect) @$(call add,THE_PACKAGES,firmware-linux) + @$(call add,THE_BRANDING,graphics) + @$(call set,META_APP_ID,ALT Workstation/$(ARCH)) + +distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @: + +distro/alt-workstation-101: distro/.alt-workstation use/e2k/101 + @$(call set,META_VOL_ID,ALT Workstation/101) -distro/alt-workstation-101: distro/.alt-workstation use/e2k/101; @: distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @: -distro/alt-workstation-801: distro/.alt-workstation use/e2k/801; @: + @$(call set,META_VOL_ID,ALT Workstation/401) + +# avoid lightdm; NB: mate-settings pulls it in (hence the dummy) +distro/alt-workstation-801: distro/.alt-workstation-base use/e2k/install2/801 + @$(call set,META_VOL_ID,ALT Workstation/801) + @$(call add,MAIN_GROUPS,workstation/e801-1seat workstation/e801-2seat) endif endif diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk index 45d1928a..9914ad96 100644 --- a/conf.d/mixin-basealt.mk +++ b/conf.d/mixin-basealt.mk @@ -8,12 +8,13 @@ mixin/alt-workstation: workstation_groups = $(addprefix workstation/,\ mixin/alt-workstation: +installer +systemd +pulse +nm \ use/kernel/net use/l10n/default/ru_RU \ - use/x11/xorg use/x11/lightdm/gtk use/x11/gtk/nm \ - use/install2/fs use/install2/vnc use/fonts/install2 \ + use/x11/xorg use/x11-autostart use/x11/gtk/nm \ + use/install2/fs use/install2/fat use/install2/vnc \ + use/fonts/install2 \ use/fonts/otf/adobe use/fonts/otf/mozilla \ use/fonts/ttf/google use/fonts/ttf/google/extra \ use/fonts/ttf/redhat use/fonts/ttf/ubuntu \ - use/control use/services \ + use/branding use/control use/services \ use/sound use/xdg-user-dirs use/docs/manual \ use/browser/firefox use/browser/firefox/esr @$(call set,BRANDING,alt-workstation)