Skip to content

M
mkimage-profiles
Commit f485b3d2 authored by Michael Shigorin's avatar Michael Shigorin Committed by Anton Midyukov
Browse files
Options

basealt.mk: generalize mediaplayers

VLC used to suit everyone (32-/64-bit x86) but not anymore; let's at least refactor the mess it all turned into by now. The only non-NOP difference obvious to me should be the addition of a media player to mipsel variant of alt-workstation; a bugfix to me as I've first spotted the lack of a mediaplayer in e2k one.
parent c42c600e
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 11 deletions
conf.d/basealt.mk
View file @ f485b3d2
......@@ -2,7 +2,17 @@ ifeq (distro,$(IMAGE_CLASS))
distro/alt-workstation: workstation_groups_x86 = $(addprefix workstation/,\
3rdparty kvm clamav cloud-clients freecad \
gtk-dictionary smartcard voip-clients vlc)
gtk-dictionary smartcard voip-clients)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/alt-workstation: mediaplayer = workstation/vlc
endif
ifeq (,$(filter-out aarch64 armh mipsel riscv64,$(ARCH)))
distro/alt-workstation: mediaplayer = workstation/celluloid
endif
ifeq (,$(filter-out e2k%,$(ARCH)))
distro/alt-workstation: mediaplayer = workstation/smplayer
endif
distro/alt-workstation: distro/.base +vmguest +wireless +efi \
mixin/desktop-installer mixin/alt-workstation \
......@@ -17,17 +27,12 @@ distro/alt-workstation: distro/.base +vmguest +wireless +efi \
use/e2k/multiseat/full use/e2k/x11/101 use/e2k/sound/401
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,$(workstation_groups_x86))
@$(call add,LIVE_LISTS,workstation/vlc)
endif
ifeq (,$(filter-out x86_64,$(ARCH)))
@$(call add,MAIN_GROUPS,workstation/blender)
@$(call add,MAIN_GROUPS,workstation/virtualbox)
@$(call add,BASE_KMODULES,kvm virtualbox)
endif
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
@$(call add,MAIN_GROUPS,workstation/celluloid)
@$(call add,LIVE_LISTS,workstation/celluloid)
endif
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_PACKAGES,python-module-serial)
@$(call add,THE_PACKAGES,setup-mate-nocomposite)
......@@ -36,6 +41,8 @@ ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,MAIN_PACKAGES,alterator-secsetup)
@$(call add,MAIN_GROUPS,workstation/alterator-web)
@$(call add,SERVICES_ENABLE,ahttpd) # in case it gets installed
@$(call add,MAIN_GROUPS,$(mediaplayer))
@$(call add,LIVE_LISTS,$(mediaplayer))
ifeq (,$(filter-out e2k,$(ARCH)))
@$(call set,META_VOL_ID,ALT Workstation for Elbrus 401-PC)
endif # e2k
......@@ -63,15 +70,12 @@ else
@$(call add,THE_LISTS,workstation/libreoffice)
endif
vm/alt-workstation:: vm/.alt-workstation +vmguest
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_LISTS,workstation/vlc)
endif
vm/alt-workstation:: vm/.alt-workstation +vmguest
@$(call add,THE_LISTS,$(mediaplayer))
ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH)))
vm/alt-workstation:: use/uboot
@$(call add,BASE_LISTS,uboot)
@$(call add,THE_LISTS,workstation/celluloid)
endif
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