Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit d75f4518 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

slinux: do not set KFLAVOURS for sisyphus

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