|
@@ -4,32 +4,48 @@
|
|
|
#
|
|
|
################################################################################
|
|
|
|
|
|
-SYSLINUX_VERSION = 4.07
|
|
|
-SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2
|
|
|
-SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
|
|
|
+SYSLINUX_VERSION = 6.02
|
|
|
+SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
|
|
|
+SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/
|
|
|
|
|
|
SYSLINUX_LICENSE = GPLv2+
|
|
|
SYSLINUX_LICENSE_FILES = COPYING
|
|
|
|
|
|
SYSLINUX_INSTALL_IMAGES = YES
|
|
|
|
|
|
-SYSLINUX_DEPENDENCIES = host-nasm host-util-linux
|
|
|
+SYSLINUX_DEPENDENCIES = host-nasm host-util-linux host-upx
|
|
|
+
|
|
|
+# The syslinux tarball comes with pre-compiled binaries.
|
|
|
+# Since timestamps might not be in the correct order, a rebuild is
|
|
|
+# not always triggered for all the different images.
|
|
|
+# Cleanup the mess even before we attempt a build, so we indeed
|
|
|
+# build everything from source.
|
|
|
+define SYSLINUX_CLEANUP
|
|
|
+ rm -rf $(@D)/bios $(@D)/efi32 $(@D)/efi64
|
|
|
+endef
|
|
|
+SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP
|
|
|
|
|
|
# syslinux build system has no convenient way to pass CFLAGS,
|
|
|
# and the internal zlib should take precedence so -I shouldn't
|
|
|
# be used.
|
|
|
define SYSLINUX_BUILD_CMDS
|
|
|
- $(TARGET_MAKE_ENV) $(MAKE) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" AR="$(HOSTAR)" -C $(@D)
|
|
|
+ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \
|
|
|
+ AR="$(HOSTAR)" -C $(@D) bios
|
|
|
endef
|
|
|
|
|
|
# While the actual bootloader is compiled for the target, several
|
|
|
# utilities for installing the bootloader are meant for the host.
|
|
|
+# Repeat the target, otherwise syslinux will try to build everything
|
|
|
+# Repeat CC and AR, since syslinux really wants to check them at
|
|
|
+# install time
|
|
|
define SYSLINUX_INSTALL_TARGET_CMDS
|
|
|
- $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALLROOT=$(HOST_DIR) install
|
|
|
+ $(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \
|
|
|
+ AR="$(HOSTAR)" INSTALLROOT=$(HOST_DIR) \
|
|
|
+ -C $(@D) bios install
|
|
|
endef
|
|
|
|
|
|
-SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += core/isolinux.bin
|
|
|
-SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += core/pxelinux.bin
|
|
|
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin
|
|
|
+SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin
|
|
|
|
|
|
define SYSLINUX_INSTALL_IMAGES_CMDS
|
|
|
for i in $(SYSLINUX_IMAGES-y); do \
|