Skip to content

M
mkimage-profiles
Commit 9dc43646 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular.mk: change conditions of restrictions of sisyphus, p11 to except p10

parent fdcbb380
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
conf.d/regular.mk
View file @ 9dc43646
...@@ -105,7 +105,7 @@ distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \ ...@@ -105,7 +105,7 @@ distro/.regular-jeos: distro/.regular-jeos-base use/cleanup \
distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @: distro/regular-jeos-sysv: distro/.regular-jeos +sysvinit +power; @:
distro/regular-jeos-systemd: distro/.regular-jeos +systemd; @: distro/regular-jeos-systemd: distro/.regular-jeos +systemd; @:
ifeq (,$(filter-out sisyphus p11,$(BRANCH))) ifneq (,$(filter-out p10,$(BRANCH)))
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
endif endif
...@@ -199,7 +199,7 @@ distro/.regular-server-full: distro/.regular-server-managed \ ...@@ -199,7 +199,7 @@ distro/.regular-server-full: distro/.regular-server-managed \
distro/regular-server-systemd: distro/.regular-server-full \ distro/regular-server-systemd: distro/.regular-server-full \
+systemd; @: +systemd; @:
ifeq (,$(filter-out sisyphus p11,$(BRANCH))) ifneq (,$(filter-out p10,$(BRANCH)))
@$(call add,LIVE_PACKAGES,livecd-net-eth) @$(call add,LIVE_PACKAGES,livecd-net-eth)
endif endif
......
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