Skip to content

M
mkimage-profiles
Commit 33436b6b authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

alt-server.mk: generalize distro/alt-server

This commit includes summary of the work done within RELENG-alt-server branch, and goes over the existing bits regarding architecture support. It was somewhat hard to keep separate so I finally chose to lump these parts together.
parent cb222bb8
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 22 deletions
conf.d/alt-server.mk
View file @ 33436b6b
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\ distro/alt-server: server_groups_primary = $(addprefix centaurus/,\
emulators freenx-server \ ipmi netinst sogo)
ipmi netinst sogo 80-desktop mate office pidgin vlc xorg)
ifeq (,$(filter-out x86_64 ppc64le aarch64,$(ARCH))) ifeq (,$(filter-out x86_64 ppc64le aarch64,$(ARCH)))
distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ distro/alt-server: server_groups_virtipa = $(addprefix centaurus/,\
freeipa-server v12n-server) v12n-server freeipa-server)
distro/alt-server: use/efi/refind use/memtest +efi
endif endif
endif endif
ifeq (,$(filter-out ppc64le aarch64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 e2k%,$(ARCH)))
distro/.alt-server-vnc: use/install2/vnc/listen; @: distro/alt-server: server_groups_desktop = $(addprefix centaurus/,\
else 80-desktop emulators freenx-server mate office pidgin vlc xorg)
distro/.alt-server-vnc: ; @:
endif endif
ifneq (,$(filter-out e2k%,$(ARCH))) ifeq (,$(filter-out x86_64 i586,$(ARCH)))
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
# FIXME: generalize vm-profile # FIXME: generalize vm-profile
distro/alt-server: distro/.base distro/.alt-server-vnc \ distro/alt-server:: distro/.base mixin/alt-server use/vmguest/base \
mixin/alt-server use/vmguest/base \
use/bootloader/grub use/rescue/base use/stage2/kms\ use/bootloader/grub use/rescue/base use/stage2/kms\
use/stage2/fs use/stage2/hid use/stage2/md \ use/stage2/fs use/stage2/hid use/stage2/md \
use/stage2/mmc use/stage2/net use/stage2/net-nfs \ use/stage2/mmc use/stage2/net use/stage2/net-nfs \
use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \ use/stage2/rtc use/stage2/sbc use/stage2/scsi use/stage2/usb \
use/docs/license use/docs/license
@$(call add,MAIN_GROUPS,$(server_groups_x86)) @$(call add,MAIN_GROUPS,$(server_groups_primary))
@$(call add,MAIN_GROUPS,$(server_groups_x86_64)) @$(call add,MAIN_GROUPS,$(server_groups_virtipa))
@$(call add,MAIN_GROUPS,$(server_groups_desktop))
@$(call add,MAIN_LISTS,centaurus/disk-dvd) @$(call add,MAIN_LISTS,centaurus/disk-dvd)
@$(call add,MAIN_LISTS,centaurus/disk-server-light) @$(call add,MAIN_LISTS,centaurus/disk-server-light)
ifneq (,$(filter-out e2k%,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2) @$(call add,INSTALL2_PACKAGES,installer-feature-desktop-suspend-stage2)
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth) @$(call add,INSTALL2_PACKAGES,installer-feature-setup-plymouth)
endif endif
...@@ -43,12 +52,6 @@ endif ...@@ -43,12 +52,6 @@ endif
@$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power) @$(call add,CLEANUP_BASE_PACKAGES,acpid-events-power)
@$(call add,RESCUE_BOOTARGS,nomodeset vga=0) @$(call add,RESCUE_BOOTARGS,nomodeset vga=0)
@$(call add,EFI_BOOTARGS,lang=ru_RU) @$(call add,EFI_BOOTARGS,lang=ru_RU)
distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \
zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
else
distro/alt-server: distro/.e2k-installer mixin/alt-server
ifeq (,$(filter-out e2k,$(ARCH))) ifeq (,$(filter-out e2k,$(ARCH)))
@$(call set,META_APP_ID,ALT Server for Elbrus-4.4) @$(call set,META_APP_ID,ALT Server for Elbrus-4.4)
endif endif
...@@ -56,6 +59,7 @@ ifeq (,$(filter-out e2kv4,$(ARCH))) ...@@ -56,6 +59,7 @@ 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
endif # e2k distro/alt-server:: monitoring = $(addprefix server-v/, 90-monitoring \
zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
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