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

syslinux: do not use syslinux to generate config on unsupported arches

Browse Source 
These are partial commits reverts:
01ee407543
e42bcdcb30
5cfc7ede81
This commit is contained in:
Anton Midyukov 2020-01-05 22:10:07 +07:00
parent 7ae39113b0
commit 216da2366c
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,36 +1,26 @@
# default is plain text prompt
# NB: might be usbflash-ready hybrid iso
# on ppc64le, aarch64 syslinux feature is used only to generate config
# (it's converted into grub.cfg later)
ifeq (,$(filter-out i586 x86_64 ppc64le aarch64,$(ARCH)))
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/syslinux: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call add,STAGE1_PACKAGES,syslinux)
@$(call try,BOOTVGA,normal)
@$(call add,SYSLINUX_FILES,/usr/lib/syslinux/pxelinux.0)
endif
@$(call try,META_SYSTEM_ID,SYSLINUX)
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call set,IMAGE_PACKTYPE,boot)
else
use/syslinux: ; @:
endif
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
# UI is overwritten
use/syslinux/ui/%: use/syslinux
@$(call set,SYSLINUX_UI,$*)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@if [ "$*" == gfxboot ]; then \
$(call add,STAGE1_PACKAGES,gfxboot); \
$(call add,STAGE1_BRANDING,bootloader); \
fi
else
use/syslinux/ui/%: use/syslinux; @:
endif
# modules and config snippets just add up
@ -40,11 +30,5 @@ use/syslinux/%.com use/syslinux/%.c32: use/syslinux
use/syslinux/%.cfg: use/syslinux
@$(call add,SYSLINUX_CFG,$*)
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; @:
endif
use/syslinux/timeout/%: use/syslinux
@$(call set,SYSLINUX_TIMEOUT,$*)

8
features.in/syslinux/scripts.d/20-propagator-ramdisk-syslinux
View File

@ -5,16 +5,10 @@
cd "$WORKDIR"
cfgs="$(find syslinux boot/grub EFI/BOOT -name '*.cfg')"
[ -n "$cfgs" ] || {
echo "${0##*/}: did not find any config under /syslinux or /boot/grub" >&2
exit 1
}
# apply size census while looking for potential squashfs images
find -maxdepth 1 -type f -size +1M \
| sed 's,^\./,,' \
| while read image; do
size="$[ $(stat -c%s "$image") / 1024 + 1 ]"
sed -i "s,@${image}_size@,$size," $cfgs
sed -i "s,@${image}_size@,$size," syslinux/*.cfg
done

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|grubaa64boot) ;;
isolinux|syslinux) ;;
*) echo "error: weird GLOBAL_BOOTLOADER: \`$GLOBAL_BOOTLOADER'" >&2;
exit 1;;
esac