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

aarch64: use syslinux cfg for convert to grub

Browse Source
This commit is contained in:
Алексей Шабалин 2019-08-16 16:55:15 +03:00
parent 67df18e642
commit 12588547f0
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.d/server-v.mk
View File

@ -60,7 +60,7 @@ distro/server-v: distro/.server-v-base +installer \
use/kernel/server use/init/systemd/multiuser \
use/services use/ntp/chrony \
use/server/virt use/firmware use/firmware/cpu \
use/l10n/default/ru_RU use/install2/vnc \
use/l10n/default/ru_RU use/install2/vnc/full \
use/isohybrid \
use/install2/xfs use/install2/fat \
use/init/systemd \
@ -68,7 +68,10 @@ distro/server-v: distro/.server-v-base +installer \
use/apt-conf/branch use/install2/repo \
use/fonts/install2 use/plymouth/install2 \
use/efi/shell +efi
@$(call set,BOOTVGA,)
ifeq (,$(filter-out aarch64,$(ARCH)))
@$(call set,EFI_BOOTLOADER,)
@$(call set,IMAGE_PACKTYPE,boot)
endif
@$(call set,IMAGE_FLAVOUR,$(subst alt-9-,,$(IMAGE_NAME)))
@$(call set,META_VOL_ID,ALT Server-V 9.0.0 $(ARCH))
@$(call set,META_PUBLISHER,BaseALT Ltd)
@ -123,5 +126,6 @@ endif
@$(call add,DEFAULT_SERVICES_DISABLE,ahttpd alteratord)
@$(call add,DEFAULT_SERVICES_DISABLE,systemd-networkd systemd-resolved)
# @$(call set,BOOTVGA,)
# @$(call add,MAIN_GROUPS,server-v/141-cockpit $(cockpit))
endif

4
features.in/syslinux/config.mk
View File

@ -2,7 +2,7 @@
# NB: might be usbflash-ready hybrid iso
# on ppc64le syslinux feature is used only to generate config
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH)))
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature)
@ -38,7 +38,7 @@ use/syslinux/%.com use/syslinux/%.c32: use/syslinux
use/syslinux/%.cfg: use/syslinux
@$(call add,SYSLINUX_CFG,$*)
ifeq (,$(filter-out aarch64 ppc64le,$(ARCH)))
ifeq (,$(filter-out ppc64le aarch64,$(ARCH)))
use/syslinux/localboot.cfg use/syslinux/removable.cfg use/syslinux/lateboot.cfg use/syslinux/sdab.cfg: use/syslinux; @:
use/syslinux/install-vnc-connect.cfg: use/syslinux/grub-install-vnc-connect.cfg; @:
use/syslinux/install-vnc-listen.cfg: use/syslinux/grub-install-vnc-listen.cfg; @:

2
features.in/syslinux/stage1/scripts.d/01-syslinux
View File

@ -10,7 +10,7 @@ cd "$WORKDIR/syslinux"
# validate just in case (see also stage1 Makefile)
case "$GLOBAL_BOOTLOADER" in
isolinux|syslinux|ieee1275boot) ;;
isolinux|syslinux|ieee1275boot|grubaa64boot) ;;
*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
exit 1;;
esac