stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

buildable alt-server on aarch64

Browse Source
This commit is contained in:
Anton V. Boyarshinov 2019-09-03 16:11:47 +03:00 committed by Anton Midyukov
parent 0d8468b10f
commit c06f87539d
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,22 +1,20 @@
ifeq (distro,$(IMAGE_CLASS)) ifeq (distro,$(IMAGE_CLASS))
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\
emulators freenx-server \ emulators freenx-server \
ipmi netinst sogo) ipmi netinst sogo 80-desktop mate office pidgin vlc xorg)
distro/alt-server: monitoring = $(addprefix server-v/, 90-monitoring \
zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
ifeq (,$(filter-out x86_64,$(ARCH))) ifeq (,$(filter-out x86_64,$(ARCH)))
distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\ distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
ganeti freeipa-server v12n-server) ganeti freeipa-server v12n-server)
distro/alt-server: use/efi/refind use/memtest +efi
endif
endif endif
# FIXME: generalize vm-profile # FIXME: generalize vm-profile
distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \ distro/alt-server: distro/.base mixin/alt-server +vmguest \
use/efi/refind use/memtest use/bootloader/grub use/rescue/base \ use/bootloader/grub use/rescue/base \
use/docs/license use/docs/license
@$(call add,MAIN_GROUPS,$(server_groups_x86)) @$(call add,MAIN_GROUPS,$(server_groups_x86))
@$(call add,MAIN_GROUPS,$(server_groups_x86_64)) @$(call add,MAIN_GROUPS,$(server_groups_x86_64))
@ -28,8 +26,8 @@ distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \
@$(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 \
endif zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe)
ifeq (,$(filter-out e2k%,$(ARCH))) ifeq (,$(filter-out e2k%,$(ARCH)))

8
conf.d/mixin-alt-server.mk
View File

@ -1,5 +1,5 @@
mixin/alt-server: server_groups = $(addprefix centaurus/,\ mixin/alt-server: server_groups = $(addprefix centaurus/,\
10-alterator 20-server-apps 50-freeipa 70-dev 80-desktop 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mate mediawiki office owncloud pidgin vlc xorg domain-server freeipa-client) 10-alterator 20-server-apps 50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client)
mixin/alt-server: +installer +systemd \ mixin/alt-server: +installer +systemd \
use/branding/complete use/control use/services \ use/branding/complete use/control use/services \
@ -28,7 +28,9 @@ mixin/alt-server: +installer +systemd \
@$(call add,MAIN_LISTS,centaurus/disk) @$(call add,MAIN_LISTS,centaurus/disk)
@$(call add,THE_PROFILES,centaurus/10-server) @$(call add,THE_PROFILES,centaurus/10-server)
@$(call add,THE_PROFILES,centaurus/20-serverDC) @$(call add,THE_PROFILES,centaurus/20-serverDC)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,THE_PROFILES,centaurus/30-desktop) @$(call add,THE_PROFILES,centaurus/30-desktop)
endif
@$(call add,THE_PROFILES,minimal) @$(call add,THE_PROFILES,minimal)
@$(call add,STAGE1_MODLISTS,stage2-mmc) @$(call add,STAGE1_MODLISTS,stage2-mmc)
@$(call add,INSTALL2_PACKAGES,installer-feature-multipath) @$(call add,INSTALL2_PACKAGES,installer-feature-multipath)
@ -42,7 +44,7 @@ mixin/alt-server: +installer +systemd \
@$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics) @$(call add,INSTALL2_PACKAGES,xorg-conf-synaptics)
@$(call add,COMMON_PACKAGES,vim-console) @$(call add,COMMON_PACKAGES,vim-console)
@$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind) @$(call add,DEFAULT_SERVICES_ENABLE,rpcbind sshd bind)
@$(call set,META_VOL_ID,ALT Server 8.95 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(call set,META_VOL_SET,ALT)
@$(call set,META_VOL_ID,ALT Server 9.0 $(ARCH)) @$(call set,META_APP_ID,ALT Server 9.0.0 $(ARCH) $(shell date +%F))
@$(call set,META_APP_ID,ALT Server 9.0 $(ARCH) $(shell date +%F))

2
pkg.in/lists/centaurus/disk-dvd
View File

@ -65,7 +65,7 @@ screen
perl-Crypt-Rijndael perl-Crypt-Rijndael
#needed for crypto #needed for crypto
lsb #lsb
python-module-Crypto python-module-Crypto
postgresql-jdbc postgresql-jdbc

13
pkg.in/lists/centaurus/disk-server-light
View File

@ -27,7 +27,7 @@ gear
hasher hasher
help2man help2man
indent indent
john john@X86
ltrace ltrace
patchutils patchutils
srpmcmp srpmcmp
@ -65,7 +65,7 @@ mar
mkisofs mkisofs
propagator propagator
squashfsprogs squashfsprogs
syslinux syslinux@X86
# kernel # kernel
kernel-build-tools kernel-build-tools
@ -78,7 +78,7 @@ acct
adjtimex adjtimex
apt-scripts apt-scripts
autossh autossh
cpuburn cpuburn@X86
fhs fhs
mtree mtree
vlock vlock
@ -149,7 +149,7 @@ rrd-perl rrd-tcl rrd-utils
#heartbeat #heartbeat
# force@ # force@
bonnie bonnie@X86
bridge-utils bridge-utils
ccze ccze
ddrescue ddrescue
@ -164,9 +164,8 @@ iptstate
#spamassassin #spamassassin
lshw lshw
lsof lsof
make-initrd-ucode make-initrd-ucode@X86
iucode_tool firmware-intel-ucode@X86
firmware-intel-ucode
#mod_geoip #mod_geoip
p0f p0f
star star