Skip to content

M
mkimage-profiles
Commit 5285c0a8 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

basealt.mk: generalize distro/alt-workstation

The point is that it's common between the rest of the arches, no need to keep making my old mistake of growing configuration trees based on very different "roots" (.e2k-installer this time which was good for early experiments but not for production). Also get rid of long-unused distro/alt-workstation-?01 targets, unified kernel made those obsolete. And last but not least: *drop* that setup-libgl-dri3-disable, makes Radeon RX lag (half-recent AMD GPUs seem to lack 2D part rather altogether, it's emulated through 3D).
parent 8db77d64
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 29 deletions
conf.d/basealt.mk
View file @ 5285c0a8
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\ distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
3rdparty blender clamav cloud-clients freecad \ 3rdparty blender clamav cloud-clients freecad \
gtk-dictionary kvm smartcard voip-clients) gtk-dictionary kvm smartcard voip-clients)
endif
distro/alt-workstation: workstation_groups_e2k = $(addprefix workstation/,\
z-autologin e801-1seat e801-2seat e801-3seat e801-6seat \
e101-mga2 e101-modesetting)
distro/alt-workstation: distro/.base +vmguest +wireless +efi \ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \ mixin/desktop-installer mixin/alt-workstation \
...@@ -23,37 +25,26 @@ ifeq (,$(filter-out x86_64,$(ARCH))) ...@@ -23,37 +25,26 @@ ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,workstation/virtualbox) @$(call add,MAIN_GROUPS,workstation/virtualbox)
@$(call add,BASE_KMODULES,kvm virtualbox) @$(call add,BASE_KMODULES,kvm virtualbox)
endif endif
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,EFI_BOOTARGS,lang=ru_RU)
ifeq (,$(filter-out e2k%,$(ARCH))) ifeq (,$(filter-out e2k%,$(ARCH)))
distro/.alt-workstation-base: distro/.e2k-installer mixin/alt-workstation @$(call add,THE_PACKAGES,python-module-serial)
@$(call add,THE_PACKAGES,setup-mate-terminal)
@$(call add,THE_PACKAGES,setup-mate-nocomposite) @$(call add,THE_PACKAGES,setup-mate-nocomposite)
@$(call add,THE_PACKAGES,setup-libgl-dri3-disable) @$(call add,THE_PACKAGES,xorg-drv-smi) # use/x11/smi
@$(call add,THE_PACKAGES,setup-pulseaudio-plain-module-detect) ifeq (,$(filter-out e2k,$(ARCH)))
@$(call add,THE_PACKAGES,firmware-linux) @$(call add,THE_PACKAGES,setup-alsa-elbrus-401) # use/e2k/sound/401
@$(call add,THE_BRANDING,graphics) @$(call set,META_VOL_ID,ALT Workstation for Elbrus 401-PC)
@$(call set,META_APP_ID,ALT Workstation/$(ARCH)) endif # e2k
ifeq (,$(filter-out e2kv4,$(ARCH)))
distro/.alt-workstation: distro/.alt-workstation-base use/x11/lightdm/gtk; @: @$(call set,META_VOL_ID,ALT Workstation for Elbrus 801/101-PC)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-multiseat)
distro/alt-workstation-101: distro/.alt-workstation use/e2k/101 @$(call add,MAIN_GROUPS,$(workstation_groups_e2k))
@$(call set,META_VOL_ID,ALT Workstation 101) @$(call add,THE_PACKAGES,test-audio)
@$(call add,MAIN_GROUPS,workstation/e101-modesetting) endif # e2kv4
@$(call add,MAIN_GROUPS,workstation/e101-mga2) endif # e2k%
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
distro/alt-workstation-401: distro/.alt-workstation use/e2k/401; @: @$(call add,EFI_BOOTARGS,lang=ru_RU)
@$(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)
@$(call add,INSTALL2_PACKAGES,installer-feature-e2k-801-dualseat)
endif
endif endif # distro
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment