2013-06-06 23:54:13 +02:00
|
|
|
################################################################################
|
2005-06-23 07:09:05 +02:00
|
|
|
#
|
|
|
|
|
# syslinux to make target msdos/iso9660 filesystems bootable
|
|
|
|
|
#
|
2013-06-06 23:54:13 +02:00
|
|
|
################################################################################
|
2005-06-23 07:09:05 +02:00
|
|
|
|
2015-03-03 22:33:07 +01:00
|
|
|
SYSLINUX_VERSION = 6.03
|
.mk files: bulk aligment and whitespace cleanup of assignments
The Buildroot coding style defines one space around make assignments and
does not align the assignment symbols.
This patch does a bulk fix of offending packages. The package
infrastructures (or more in general assignments to calculated variable
names, like $(2)_FOO) are not touched.
Alignment of line continuation characters (\) is kept as-is.
The sed command used to do this replacement is:
find * -name "*.mk" | xargs sed -i \
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#'
-e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#'
Brief explanation of this command:
^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line
\([?:+]\?=\) any assignment character =, :=, ?=, +=
\([^\\]\+\) any string not containing a line continuation
\([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a
line continuation character
\(\s*\\\) optional whitespace, followed by a line
continuation character
Hence, the first subexpression handles empty assignments, the second
handles regular assignments, the third handles regular assignments with
line continuation, and the fourth empty assignments with line
continuation.
This expression was tested on following test text: (initial tab not
included)
FOO = spaces before
FOO = spaces before and after
FOO = tab before
FOO = tab and spaces before
FOO = tab after
FOO = tab and spaces after
FOO = spaces and tab after
FOO = \
FOO = bar \
FOO = bar space \
FOO = \
GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse
FOO += spaces before
FOO ?= spaces before and after
FOO :=
FOO =
FOO =
FOO =
FOO =
$(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C
AT91BOOTSTRAP3_DEFCONFIG = \
AXEL_DISABLE_I18N=--i18n=0
After this bulk change, following manual fixups were done:
- fix line continuation alignment in cegui06 and spice (the sed
expression leaves the number of whitespace between the value and line
continuation character intact, but the whitespace before that could have
changed, causing misalignment.
- qt5base was reverted, as this package uses extensive alignment which
actually makes the code more readable.
Finally, the end result was manually reviewed.
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
|
|
|
SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
|
|
|
|
|
SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
|
2005-06-23 07:09:05 +02:00
|
|
|
|
2017-03-30 15:43:32 +02:00
|
|
|
SYSLINUX_LICENSE = GPL-2.0+
|
2012-08-18 11:25:39 +02:00
|
|
|
SYSLINUX_LICENSE_FILES = COPYING
|
|
|
|
|
|
2011-07-05 21:54:04 +02:00
|
|
|
SYSLINUX_INSTALL_IMAGES = YES
|
2005-06-23 07:09:05 +02:00
|
|
|
|
2017-06-11 15:21:30 +02:00
|
|
|
# host-util-linux needed to provide libuuid when building host tools
|
|
|
|
|
SYSLINUX_DEPENDENCIES = host-nasm host-upx util-linux host-util-linux
|
boot/syslinux: bump version
This new version has a very, very weird build system. There are different
images that syslinux can now build:
- the plain legacy-bios images we already supported previously
- two new EFI32 and EFI64 applications
To build one or the other, the Makefile accepts one or more of:
make (bios|efi32|efi64)
Specify all of them, and it builds all. Specify 'install', and it installs
all of them, as one may expect.
Still a regular behaviour, is to build only a subset (down to one):
make bios <-- builds just the legacy-bios images
make efi32 bios <-- builds just the legacy-bios and efi32 images
Where it gets weird is the install procedure. Can you guess how it's done?
Hint: the syslinux guys have invented the multiple-argument parsing in
pure Makefiles. To build then install only the bios images, one would do:
make bios
make bios install
Yep, that's it. make bios install. Two arguments, one action.
That makes for some funky workarounds in our install procedure...
'bios' is the only image we support so far, with efi to come in a future
patch.
Using MAKE1, as there are issues with highly-parallel builds.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-02 19:10:34 +02:00
|
|
|
|
2014-05-02 19:10:35 +02:00
|
|
|
ifeq ($(BR2_TARGET_SYSLINUX_LEGACY_BIOS),y)
|
2016-03-17 09:09:16 +01:00
|
|
|
SYSLINUX_TARGET += bios
|
2014-05-02 19:10:35 +02:00
|
|
|
endif
|
|
|
|
|
|
2015-03-03 22:33:07 +01:00
|
|
|
# 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.
|
2014-05-02 19:10:35 +02:00
|
|
|
ifeq ($(BR2_TARGET_SYSLINUX_EFI),y)
|
|
|
|
|
ifeq ($(BR2_ARCH_IS_64),y)
|
|
|
|
|
SYSLINUX_EFI_BITS = efi64
|
|
|
|
|
else
|
|
|
|
|
SYSLINUX_EFI_BITS = efi32
|
|
|
|
|
endif # 64-bit
|
|
|
|
|
SYSLINUX_DEPENDENCIES += gnu-efi
|
2016-03-17 09:09:16 +01:00
|
|
|
SYSLINUX_TARGET += $(SYSLINUX_EFI_BITS)
|
2015-03-03 22:33:07 +01:00
|
|
|
SYSLINUX_EFI_ARGS = \
|
|
|
|
|
EFIINC=$(STAGING_DIR)/usr/include/efi \
|
|
|
|
|
LIBDIR=$(STAGING_DIR)/usr/lib \
|
|
|
|
|
LIBEFI=$(STAGING_DIR)/usr/lib/libefi.a
|
2014-05-02 19:10:35 +02:00
|
|
|
endif # EFI
|
|
|
|
|
|
boot/syslinux: bump version
This new version has a very, very weird build system. There are different
images that syslinux can now build:
- the plain legacy-bios images we already supported previously
- two new EFI32 and EFI64 applications
To build one or the other, the Makefile accepts one or more of:
make (bios|efi32|efi64)
Specify all of them, and it builds all. Specify 'install', and it installs
all of them, as one may expect.
Still a regular behaviour, is to build only a subset (down to one):
make bios <-- builds just the legacy-bios images
make efi32 bios <-- builds just the legacy-bios and efi32 images
Where it gets weird is the install procedure. Can you guess how it's done?
Hint: the syslinux guys have invented the multiple-argument parsing in
pure Makefiles. To build then install only the bios images, one would do:
make bios
make bios install
Yep, that's it. make bios install. Two arguments, one action.
That makes for some funky workarounds in our install procedure...
'bios' is the only image we support so far, with efi to come in a future
patch.
Using MAKE1, as there are issues with highly-parallel builds.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-02 19:10:34 +02:00
|
|
|
# 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
|
2007-02-04 17:34:56 +01:00
|
|
|
|
2012-07-05 22:01:31 +02:00
|
|
|
# syslinux build system has no convenient way to pass CFLAGS,
|
|
|
|
|
# and the internal zlib should take precedence so -I shouldn't
|
|
|
|
|
# be used.
|
2011-07-05 21:54:04 +02:00
|
|
|
define SYSLINUX_BUILD_CMDS
|
2017-04-07 11:05:13 +02:00
|
|
|
$(TARGET_MAKE_ENV) $(MAKE1) \
|
|
|
|
|
CC="$(TARGET_CC)" \
|
|
|
|
|
LD="$(TARGET_LD)" \
|
2017-07-05 13:14:19 +02:00
|
|
|
NASM="$(HOST_DIR)/bin/nasm" \
|
2017-04-07 11:05:13 +02:00
|
|
|
CC_FOR_BUILD="$(HOSTCC)" \
|
|
|
|
|
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
|
|
|
|
|
LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
|
|
|
|
|
$(SYSLINUX_EFI_ARGS) -C $(@D) $(SYSLINUX_TARGET)
|
2011-07-05 21:54:04 +02:00
|
|
|
endef
|
2005-06-23 07:09:05 +02:00
|
|
|
|
2014-05-02 19:10:31 +02:00
|
|
|
# While the actual bootloader is compiled for the target, several
|
|
|
|
|
# utilities for installing the bootloader are meant for the host.
|
boot/syslinux: bump version
This new version has a very, very weird build system. There are different
images that syslinux can now build:
- the plain legacy-bios images we already supported previously
- two new EFI32 and EFI64 applications
To build one or the other, the Makefile accepts one or more of:
make (bios|efi32|efi64)
Specify all of them, and it builds all. Specify 'install', and it installs
all of them, as one may expect.
Still a regular behaviour, is to build only a subset (down to one):
make bios <-- builds just the legacy-bios images
make efi32 bios <-- builds just the legacy-bios and efi32 images
Where it gets weird is the install procedure. Can you guess how it's done?
Hint: the syslinux guys have invented the multiple-argument parsing in
pure Makefiles. To build then install only the bios images, one would do:
make bios
make bios install
Yep, that's it. make bios install. Two arguments, one action.
That makes for some funky workarounds in our install procedure...
'bios' is the only image we support so far, with efi to come in a future
patch.
Using MAKE1, as there are issues with highly-parallel builds.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-02 19:10:34 +02:00
|
|
|
# Repeat the target, otherwise syslinux will try to build everything
|
2017-04-07 11:05:13 +02:00
|
|
|
# Repeat LD (and CC) as it happens that some binaries are linked at
|
|
|
|
|
# install-time.
|
2014-03-16 20:04:30 +01:00
|
|
|
define SYSLINUX_INSTALL_TARGET_CMDS
|
2017-04-07 11:05:13 +02:00
|
|
|
$(TARGET_MAKE_ENV) $(MAKE1) $(SYSLINUX_EFI_ARGS) INSTALLROOT=$(HOST_DIR) \
|
|
|
|
|
CC="$(TARGET_CC)" \
|
|
|
|
|
LD="$(TARGET_LD)" \
|
2015-03-03 22:33:07 +01:00
|
|
|
-C $(@D) $(SYSLINUX_TARGET) install
|
2014-03-16 20:04:30 +01:00
|
|
|
endef
|
|
|
|
|
|
2017-04-07 11:05:13 +02:00
|
|
|
# That 'syslinux' binary is an installer actually built for the target.
|
|
|
|
|
# However, buildroot makes no usage of it, so better delete it than have it
|
|
|
|
|
# installed at the wrong place
|
|
|
|
|
define SYSLINUX_POST_INSTALL_CLEANUP
|
2017-07-05 13:14:19 +02:00
|
|
|
rm -rf $(HOST_DIR)/bin/syslinux
|
2017-04-07 11:05:13 +02:00
|
|
|
endef
|
|
|
|
|
SYSLINUX_POST_INSTALL_TARGET_HOOKS += SYSLINUX_POST_INSTALL_CLEANUP
|
|
|
|
|
|
boot/syslinux: bump version
This new version has a very, very weird build system. There are different
images that syslinux can now build:
- the plain legacy-bios images we already supported previously
- two new EFI32 and EFI64 applications
To build one or the other, the Makefile accepts one or more of:
make (bios|efi32|efi64)
Specify all of them, and it builds all. Specify 'install', and it installs
all of them, as one may expect.
Still a regular behaviour, is to build only a subset (down to one):
make bios <-- builds just the legacy-bios images
make efi32 bios <-- builds just the legacy-bios and efi32 images
Where it gets weird is the install procedure. Can you guess how it's done?
Hint: the syslinux guys have invented the multiple-argument parsing in
pure Makefiles. To build then install only the bios images, one would do:
make bios
make bios install
Yep, that's it. make bios install. Two arguments, one action.
That makes for some funky workarounds in our install procedure...
'bios' is the only image we support so far, with efi to come in a future
patch.
Using MAKE1, as there are issues with highly-parallel builds.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Frank Hunleth <fhunleth@troodon-software.com>
Tested-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-05-02 19:10:34 +02:00
|
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_ISOLINUX) += bios/core/isolinux.bin
|
|
|
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_PXELINUX) += bios/core/pxelinux.bin
|
2014-05-02 19:10:36 +02:00
|
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_MBR) += bios/mbr/mbr.bin
|
2014-05-02 19:10:35 +02:00
|
|
|
SYSLINUX_IMAGES-$(BR2_TARGET_SYSLINUX_EFI) += $(SYSLINUX_EFI_BITS)/efi/syslinux.efi
|
2005-06-23 07:09:05 +02:00
|
|
|
|
2014-05-02 19:10:37 +02:00
|
|
|
SYSLINUX_C32 = $(call qstrip,$(BR2_TARGET_SYSLINUX_C32))
|
|
|
|
|
|
|
|
|
|
# We install the c32 modules from the host-installed tree, where they
|
|
|
|
|
# are all neatly installed in a single location, while they are
|
|
|
|
|
# scattered around everywhere in the build tree.
|
2011-07-05 21:54:04 +02:00
|
|
|
define SYSLINUX_INSTALL_IMAGES_CMDS
|
|
|
|
|
for i in $(SYSLINUX_IMAGES-y); do \
|
2014-05-02 19:10:38 +02:00
|
|
|
$(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/syslinux/$${i##*/}; \
|
2011-07-05 21:54:04 +02:00
|
|
|
done
|
2014-05-02 19:10:37 +02:00
|
|
|
for i in $(SYSLINUX_C32); do \
|
2017-07-05 13:14:23 +02:00
|
|
|
$(INSTALL) -D -m 0755 $(HOST_DIR)/share/syslinux/$${i} \
|
2015-03-03 22:33:07 +01:00
|
|
|
$(BINARIES_DIR)/syslinux/$${i}; \
|
2014-05-02 19:10:37 +02:00
|
|
|
done
|
2011-07-05 21:54:04 +02:00
|
|
|
endef
|
2010-03-16 21:50:16 +01:00
|
|
|
|
2012-07-03 00:07:32 +02:00
|
|
|
$(eval $(generic-package))
|
