diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index 7992a95b..6ae6debf 100644 --- a/conf.d/slinux.mk +++ b/conf.d/slinux.mk @@ -26,26 +26,17 @@ distro/slinux-bloat: distro/slinux use/slinux/live ifeq (vm,$(IMAGE_CLASS)) vm/slinux:: use/slinux/vm-base use/auto-resize +vmguest; @: -ifeq (,$(filter-out aarch64 armh riscv64,$(ARCH))) +ifeq (,$(filter-out aarch64 riscv64,$(ARCH))) vm/slinux:: use/uboot @$(call add,BASE_LISTS,uboot) endif -ifeq (,$(filter-out aarch64 armh,$(ARCH))) +ifeq (,$(filter-out aarch64,$(ARCH))) vm/slinux:: use/no-sleep use/arm-rpi4; @: endif -ifeq (,$(filter-out aarch64 armh,$(ARCH))) +ifeq (,$(filter-out aarch64,$(ARCH))) vm/slinux-rpi: use/slinux/vm-base use/arm-rpi4/full; @: endif -ifeq (,$(filter-out mipsel,$(ARCH))) -vm/slinux:: - @$(call add,THE_PACKAGES,installer-feature-bell-off-stage3) - @$(call add,THE_PACKAGES,xfce-reduced-resource) - -vm/slinux-tavolga: vm/slinux use/mipsel-mitx/x11; @: -vm/slinux-bfk3: vm/slinux use/mipsel-bfk3/x11; @: -endif - endif diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index d64f409e..ffa7b786 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -86,15 +86,11 @@ use/slinux/mixin-base: use/slinux \ @$(call add,THE_LISTS,$(call tags,base l10n)) @$(call add,THE_KMODULES,staging) @$(call add,THE_LISTS,slinux/browser) -ifeq (,$(filter-out armh mipsel,$(ARCH))) - @$(call add,THE_LISTS,slinux/multimedia-player-celluloid) -else @$(call add,THE_LISTS,slinux/multimedia-player-vlc) -endif ifeq (,$(filter-out e2k%,$(ARCH))) @$(call add,THE_LISTS,$(call tags,xscreensaver && (base || desktop))) endif -ifeq (,$(filter-out armh aarch64 i586 x86_64,$(ARCH))) +ifeq (,$(filter-out aarch64 i586 x86_64,$(ARCH))) @$(call set,KFLAVOURS,std-def) endif