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 c06f8753.

alt-server.mk: do not override targets on e2k
c9c83be4 · Michael Shigorin · 1cf05b63 · c9c83be4
Commit c9c83be4 authored Aug 21, 2020 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

alt-server.mk conf.d/alt-server.mk +4 -2

No files found.
--- 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