Commit 52ceb700 authored by Romain Naour's avatar Romain Naour Committed by Thomas Petazzoni
Browse files

boot/syslinux: bump version to 6.03 



Since 6.03 syslinux release, the gnu-efi sources are bundled whith
syslinux. We need to force the build system to use the Buildroot's
gnu-efi package.

Remove the patch for find-gnu-efi.sh script which was removed, as well
as the SYSROOT variable from the BUILD_CMDS, which is no longer
needed.

There are still some parallel build issues, so MAKE1 can't
be removed for now.

Add a hash file.

Fix indentation.

[Thomas: fix minor typos in a new comment in the .mk file.]

Signed-off-by: default avatarRomain Naour <romain.naour@openwide.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent eef1eae4

boot/syslinux/syslinux-000-user-headers-from-sysroot.patch

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
efi: look for headers and libs in the sysroot



Currently, syslinux hard-codes search paths to /usr/.... directories.

This does not play well in cross-compilation.



If $SYSROOT is defined, prepend it to the search paths.



Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>



diff -durN syslinux-6.02.orig/efi/find-gnu-efi.sh syslinux-6.02/efi/find-gnu-efi.sh

--- syslinux-6.02.orig/efi/find-gnu-efi.sh	2013-10-13 19:59:03.000000000 +0200

+++ syslinux-6.02/efi/find-gnu-efi.sh	2014-04-22 00:19:23.638483887 +0200

@@ -9,7 +9,7 @@

 find_include()

 {

     for d in $include_dirs; do

-	found=`find $d -name efi -type d 2> /dev/null`

+	found=`find $SYSROOT$d -name efi -type d 2> /dev/null`

 	if [ "$found"x != "x" ] && [ -e $found/$ARCH/efibind.h ]; then

 	    echo $found

 	    break;

@@ -20,12 +20,12 @@

 find_lib()

 {

     for d in $lib_dirs; do

-	found=`find $d -name libgnuefi.a 2> /dev/null`

+	found=`find $SYSROOT$d -name libgnuefi.a 2> /dev/null`

 	if [ "$found"x != "x" ]; then

 	    crt_name='crt0-efi-'$ARCH'.o'

-	    crt=`find $d -name $crt_name 2> /dev/null`

+	    crt=`find $SYSROOT$d -name $crt_name 2> /dev/null`

 	    if [ "$crt"x != "x" ]; then

-		echo $d

+		echo $SYSROOT$d

 		break;

 	    fi

 	fi

boot/syslinux/syslinux.hash

+1 −1
Original line number Diff line number Diff line 
# From https://www.kernel.org/pub/linux/utils/boot/syslinux/sha256sums.asc

sha256	afa31b7cbf72e1c0c1752a0636ba724ce01c0e374366e46e61db6862b4685478	syslinux-6.02.tar.xz
 
sha256	26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e	syslinux-6.03.tar.xz

boot/syslinux/syslinux.mk

+13 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#

################################################################################



SYSLINUX_VERSION = 6.02

SYSLINUX_VERSION = 6.03

SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz

SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
@@ -19,6 +19,10 @@ ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y) 
SYSLINUX_TARGET = bios

endif



# The syslinux build system must be forced to use Buildroot's gnu-efi

# package by setting EFIINC, LIBDIR and LIBEFI. Otherwise, it uses its

# own copy of gnu-efi included in syslinux's sources since 6.03

# release.

ifeq ($(BR2_TARGET_SYSLINUX_EFI),y)

ifeq ($(BR2_ARCH_IS_64),y)

SYSLINUX_EFI_BITS = efi64
@@ -27,6 +31,10 @@ SYSLINUX_EFI_BITS = efi32 
endif # 64-bit

SYSLINUX_DEPENDENCIES += gnu-efi

SYSLINUX_TARGET = $(SYSLINUX_EFI_BITS)

SYSLINUX_EFI_ARGS = \

	EFIINC=$(STAGING_DIR)/usr/include/efi \

	LIBDIR=$(STAGING_DIR)/usr/lib \

	LIBEFI=$(STAGING_DIR)/usr/lib/libefi.a

endif # EFI



# The syslinux tarball comes with pre-compiled binaries.
@@ -44,7 +52,7 @@ SYSLINUX_POST_PATCH_HOOKS += SYSLINUX_CLEANUP 
# be used.

define SYSLINUX_BUILD_CMDS

	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \

	    AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) -C $(@D) $(SYSLINUX_TARGET)

		AR="$(HOSTAR)" $(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)

endef



# While the actual bootloader is compiled for the target, several
@@ -54,7 +62,7 @@ endef 
# install time

define SYSLINUX_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(HOSTCC) -idirafter $(HOST_DIR)/usr/include $(HOST_LDFLAGS)" \

	    AR="$(HOSTAR)" SYSROOT=$(STAGING_DIR) INSTALLROOT=$(HOST_DIR) \

		AR="$(HOSTAR)" $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(HOST_DIR) \

		-C $(@D) $(SYSLINUX_TARGET) install

endef