Skip to content

M
mkimage-profiles
Commit 1aec6cee authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

alt-server.mk: put the horse before the tug

There was something wrong about that order of additives and the base configuration; let's make it straight, putting the foundation first and architecture-dependent additions on top of it. Note that double-colon syntax is specifically allowing for multiple rules adding up their recipes (and prereqs), but all of those rules must be specified as double-colon (this was violated in the previous state of alt-server.mk). See-also: http://www.gnu.org/software/make/manual/make.html#Double_002dColon Fixes: 33436b6b Fixes: c06f8753
parent 181b7e84
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
conf.d/alt-server.mk
View file @ 1aec6cee
...@@ -15,17 +15,9 @@ distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\ ...@@ -15,17 +15,9 @@ distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
80-desktop emulators freenx-server mate office pidgin vlc xorg) 80-desktop emulators freenx-server mate office pidgin vlc xorg)
endif endif
ifeq (,$(filter-out x86_64 i586,$(ARCH))) distro/alt-server: monitoring = $(addprefix server-v/,\
distro/alt-server:: use/memtest 90-monitoring zabbix-agent telegraf prometheus-node_exporter \
endif monit collectd nagios-nrpe)
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
distro/alt-server:: use/efi/refind +efi
endif
ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))
distro/alt-server:: use/install2/vnc/listen; @:
endif
# FIXME: generalize vm-profile # FIXME: generalize vm-profile
distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \ distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
...@@ -59,7 +51,16 @@ ifeq (,$(filter-out e2kv4,$(ARCH))) ...@@ -59,7 +51,16 @@ ifeq (,$(filter-out e2kv4,$(ARCH)))
@$(call set,META_APP_ID,ALT Server for Elbrus-80x) @$(call set,META_APP_ID,ALT Server for Elbrus-80x)
endif endif
distro/alt-server:: monitoring = $(addprefix server-v/, 90-monitoring \ ifeq (,$(filter-out x86_64 i586,$(ARCH)))
zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe) distro/alt-server:: use/memtest; @:
endif
ifeq (,$(filter-out x86_64 aarch64,$(ARCH)))
distro/alt-server:: use/efi/refind +efi; @:
endif
ifeq (,$(filter-out ppc64le aarch64 e2k%,$(ARCH)))
distro/alt-server:: use/install2/vnc/listen; @:
endif
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