Commit d75f4518 authored by Anton Midyukov's avatar Anton Midyukov

slinux: do not set KFLAVOURS for sisyphus

kernel-image-un-def will be removed from Sisyphus soon.
parent ee0c284d
......@@ -63,8 +63,10 @@ endif
ifeq (,$(filter-out riscv64,$(ARCH)))
use/slinux/vm-base:: use/oem/vnc
@$(call add,THE_PACKAGES,xfce-reduced-resource)
ifneq (,$(filter-out sisyphus,$(BRANCH)))
@$(call set,KFLAVOURS,un-def)
endif
endif
use/slinux/mixin-base: use/slinux \
+x11 use/x11/3d \
......@@ -88,9 +90,11 @@ use/slinux/mixin-base: use/slinux \
ifeq (,$(filter-out e2k%,$(ARCH)))
@$(call add,THE_LISTS,$(call tags,xscreensaver && (base || desktop)))
endif
ifneq (,$(filter-out sisyphus,$(BRANCH)))
ifeq (,$(filter-out aarch64 i586 x86_64,$(ARCH)))
@$(call set,KFLAVOURS,std-def)
endif
endif
use/slinux/live: use/live/x11 use/live/rw \
use/live/repo \
......@@ -121,8 +125,10 @@ endif
use/slinux/full: use/slinux/base
ifeq (,$(filter-out x86_64,$(ARCH)))
ifneq (,$(filter-out sisyphus,$(BRANCH)))
@$(call set,KFLAVOURS,un-def std-def)
endif
endif
@$(call add,MAIN_LISTS,slinux/not-install-full)
@$(call add,THE_LISTS,slinux/misc-full)
ifeq (,$(filter-out i586 x86_64,$(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