keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alt-server.mk: do not override targets on e2k

Browse Source 
Looks like aarch64 addition was done in haste,
the targets were split by architecture families
before commit c06f875.
This commit is contained in:
Michael Shigorin 2020-08-21 21:34:32 +03:00
parent 1cf05b639c
commit c9c83be408
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.d/alt-server.mk
View File

@ -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