Commit 01ee4075 authored by Anton Midyukov's avatar Anton Midyukov Committed by Michael Shigorin

syslinux: copy config for grub2 on aarch64

parent 48aab205
# default is plain text prompt # default is plain text prompt
# NB: might be usbflash-ready hybrid iso # NB: might be usbflash-ready hybrid iso
# on ppc64le syslinux feature is used only to generate config # on ppc64le, aarch64 syslinux feature is used only to generate config
# (it's converted into grub.cfg later) # (it's converted into grub.cfg later)
ifeq (,$(filter-out i586 x86_64 ppc64le,$(ARCH))) ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid) use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature) @$(call add_feature)
...@@ -39,7 +39,7 @@ use/syslinux/%.com use/syslinux/%.c32: use/syslinux ...@@ -39,7 +39,7 @@ use/syslinux/%.com use/syslinux/%.c32: use/syslinux
use/syslinux/%.cfg: use/syslinux use/syslinux/%.cfg: use/syslinux
@$(call add,SYSLINUX_CFG,$*) @$(call add,SYSLINUX_CFG,$*)
ifeq (,$(filter-out 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/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-connect.cfg: use/syslinux/grub-install-vnc-connect.cfg; @:
use/syslinux/install-vnc-listen.cfg: use/syslinux/grub-install-vnc-listen.cfg; @: use/syslinux/install-vnc-listen.cfg: use/syslinux/grub-install-vnc-listen.cfg; @:
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
cd "$WORKDIR" cd "$WORKDIR"
cfgs="$(find syslinux boot/grub -name '*.cfg')" cfgs="$(find syslinux boot/grub EFI/BOOT -name '*.cfg')"
[ -n "$cfgs" ] || { [ -n "$cfgs" ] || {
echo "${0##*/}: did not find any config under /syslinux or /boot/grub" >&2 echo "${0##*/}: did not find any config under /syslinux or /boot/grub" >&2
exit 1 exit 1
......
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