From c9c83be408e98b0e56bdc3c9a05d4715cec2e909 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Fri, 21 Aug 2020 21:34:32 +0300 Subject: [PATCH] alt-server.mk: do not override targets on e2k Looks like aarch64 addition was done in haste, the targets were split by architecture families before commit c06f875. --- conf.d/alt-server.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf.d/alt-server.mk b/conf.d/alt-server.mk index 440587a6..d13cf46f 100644 --- a/conf.d/alt-server.mk +++ b/conf.d/alt-server.mk @@ -18,6 +18,8 @@ else distro/.alt-server-vnc: ; @: endif +ifneq (,$(filter-out e2k%,$(ARCH))) + # FIXME: generalize vm-profile distro/alt-server: distro/.base distro/.alt-server-vnc \ mixin/alt-server use/vmguest/base \ @@ -44,7 +46,7 @@ endif distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \ zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe) -ifeq (,$(filter-out e2k%,$(ARCH))) +else distro/alt-server: distro/.e2k-installer mixin/alt-server ifeq (,$(filter-out e2k,$(ARCH))) @@ -54,6 +56,6 @@ ifeq (,$(filter-out e2kv4,$(ARCH))) @$(call set,META_APP_ID,ALT Server for Elbrus-80x) endif -endif +endif # e2k endif