aboutsummaryrefslogtreecommitdiff
path: root/boot/syslinux
Commit message (Collapse)AuthorAgeFilesLines
* .mk files: bulk aligment and whitespace cleanup of assignmentsGravatar Thomas De Schampheleire2014-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* package: remove the trailing slash sign from <PKG>_SITE variableGravatar Jerzy Grzegorek2014-07-311-1/+1
| | | | | | | | | | | | Since the trailing slash is stripped from $($(PKG)_SITE) by pkg-generic.mk: $(call DOWNLOAD,$($(PKG)_SITE:/=)/$($(PKG)_SOURCE)) so it is redundant. This patch removes it from $(PKG)_SITE variable for BR consistency. Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot/syslinux: install in a sub-dir of $(BINARIES_DIR)Gravatar Yann E. MORIN2014-05-031-2/+2
| | | | | | | | | | | | Since syslinux can now install quite a number of files, install them in a sub-directory of $(BINARIES_DIR) for clarity. It also aligns it to rpi-firmware, grub2, gummiboot, that install all of their files in a sub-dir of $(BINARIES_DIR), too. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* boot/syslinux: add option to install c32 modulesGravatar Yann E. MORIN2014-05-032-0/+19
| | | | | | | [Peter: reworded comment slightly] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* boot/syslinux: add an option to install a MBR blobGravatar Yann E. MORIN2014-05-032-0/+9
| | | | | | | | | | | | | This MBR blob will look for an active partition, and boot the bootcode present in that partition. This can be used to boot an extlinux-prepared partition. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Lundquist <lists@zelow.no> 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>
* boot/syslinux: add option to install the EFI imageGravatar Yann E. MORIN2014-05-033-3/+66
| | | | | | | | | | | | | syslinux can now also build an EFI application. If the target is 64-bit, we build the 64-bit EFI app, otherwise we build the 32-bit EFI app. 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>
* boot/syslinux: bump versionGravatar Yann E. MORIN2014-05-031-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* boot/syslinux: move comments out of define-blockGravatar Yann E. MORIN2014-05-031-2/+2
| | | | | | | | | | The comments are not really part of the command we want to execute, so move them out of the define-block. This also cleans up the output, as they will no longer appear. Reported-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* boot/syslinux: rewrite options promptsGravatar Yann E. MORIN2014-05-031-3/+9
| | | | | | | | | | | | | Rewrite the options prompt in preparation to adding a new type of image to install. Add help entries to each option, too. 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>
* boot/syslinux: make the sub-options a choiceGravatar Yann E. MORIN2014-05-031-2/+5
| | | | | | | | | | | | | | | | | | | Currently it is possible to choose either, both or none of the pxelinux or isolinux images. But it does not make sense to build none or both, as we need at least one to boot the target, and the target can not use more than one. So, we need one and only one image to be selected at once. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Lundquist <thomasez@redpill-linpro.com> Cc: Frank Hunleth <fhunleth@troodon-software.com> Cc: Arnout Vandecappelle <arnout@mind.be> Tested-by: Frank Hunleth <fhunleth@troodon-software.com> Tested-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* boot/syslinux: prepare to install non-core imagesGravatar Yann E. MORIN2014-05-031-3/+3
| | | | | | | | | | | | | | | | | | Currently, we hard-code the path to the images we install, and expect them to be from the core/ sub-dir. Not all images we can install are located in core/. For example, the efi boot images (to come later) are not located in core/. Prepare the upcoming installation of extlinux by not expecting images be in core/. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Lundquist <lists@zelow.no> 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>
* boot/syslinux: needs an ia32-capable compilerGravatar Yann E. MORIN2014-05-031-0/+1
| | | | | | | | | | | | The pxelinux and isolionux images are 32-bit binaries, so we need a compiler that can generate them (ie. a compiler that understands -m32). Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Frank Hunleth <fhunleth@troodon-software.com> Cc: Arnout Vandecappelle <arnout@mind.be> Tested-by: Frank Hunleth <fhunleth@troodon-software.com> Tested-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* syslinux: remove host variantGravatar Thomas Petazzoni2014-04-201-10/+0
| | | | | | | | | | | The host variant of syslinux wasn't exposed anywhere, so the only way to use it was to know that a "host-syslinux" target existed. Moreover, thanks to commit 8e0d4118982ae5a29e462f0a476d82772459cf5c ('syslinux: install helper programs to the host'), the host utilities of syslinux are automatically installed to $(HOST_DIR) when building the target syslinux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* syslinux: install helper programs to the hostGravatar Frank Hunleth2014-04-201-1/+6
| | | | | | | | | | Even though syslinux is built for the target, it does create helper programs intended to be run on the host such as syslinux and extlinux. This change installs these helper programs to the host so that they may be called by post image creation scripts. Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* Config.in files: use if/endif instead of 'depends on' for main symbolGravatar Thomas De Schampheleire2013-12-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | In the Config.in file of package foo, it often happens that there are other symbols besides BR2_PACKAGE_FOO. Typically, these symbols only make sense when foo itself is enabled. There are two ways to express this: with depends on BR2_PACKAGE_FOO in each extra symbol, or with if BR2_PACKAGE_FOO ... endif around the entire set of extra symbols. The if/endif approach avoids the repetition of 'depends on' statements on multiple symbols, so this is clearly preferred. But even when there is only one extra symbol, if/endif is a more logical choice: - it is future-proof for when extra symbols are added - it allows to have just one strategy instead of two (less confusion) This patch modifies the Config.in files accordingly. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* packages: remove package clean commandsGravatar Thomas De Schampheleire2013-12-081-4/+0
| | | | | Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* syslinux: bump to version 4.07Gravatar Romain Naour2013-09-111-1/+1
| | | | | Signed-off-by: Romain Naour <romain.naour@openwide.fr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Normalize separator size to 80Gravatar Jerzy Grzegorek2013-06-071-2/+2
| | | | | Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: bump to version 4.06Gravatar Daniel Price2013-03-242-16/+1
| | | | | | | Signed-off-by: Daniel Price <daniel.price@gmail.com> Tested-by: Will Moore <will.moore@beraninstruments.com> Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: add license informationGravatar Simon Dawson2012-08-211-0/+3
| | | | | Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* all packages: rename XXXTARGETS to xxx-packageGravatar Arnout Vandecappelle (Essensium/Mind)2012-07-171-1/+1
| | | | | | | | | | | | | Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* all packages: use new host-xxx-package macrosGravatar Arnout Vandecappelle (Essensium/Mind)2012-07-171-1/+1
| | | | | | | | | | | This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* syslinux: bump to 4.05Gravatar Aras Vaichas2012-07-172-3/+21
| | | | | | | | | | | * bump syslinux from 4.04 to 4.05 * add patch to fix build problem with 4.05, see http://old.nabble.com/syslinux-fails-to-build-td34112447.html * add util-linux dependency and make sure the build finds it Signed-off-by: Aras Vaichas <aras.vaichas@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* syslinux: add upstream URLGravatar Peter Korsgaard2012-03-291-0/+2
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: add support for host-installGravatar Arnout Vandecappelle (Essensium/Mind)2012-01-241-0/+14
| | | | | | | | | This makes it possible to build the syslinux/extlinux installer, so a bootable USB drive, CompactFlash or SD card can be created by a user script. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: bump to version 4.04Gravatar Arnout Vandecappelle (Essensium/Mind)2012-01-222-19/+2
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* package: remove useless arguments from GENTARGETSGravatar Thomas Petazzoni2011-09-291-1/+1
| | | | | | | | | | Thanks to the pkgparentdir and pkgname functions, we can rewrite the GENTARGETS macro in a way that avoids the need for each package to repeat its name and the directory in which it is present. [Peter: pkgdir->pkgparentdir] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Improve TARGETS handling for bootloaders and kernelGravatar Thomas Petazzoni2011-07-111-9/+0
| | | | | | | | | | | | | | | | | | As the kernel and bootloaders do not use the normal BR2_PACKAGE_* Kconfig options, their target name was not automatically added to the global TARGETS variable. Each bootloader .mk and the linux.mk had to add their own target manually to TARGETS, and the package infrastructure was making tests on non-existing Kconfig variables. This commit improves the package infrastructure so that it looks at BR2_PACKAGE_<pkg> for packages, BR2_TARGET_<pkg> for bootloaders and at the special BR2_LINUX_KERNEL for the linux package. This allows to simplify a little bit the bootloaders and linux .mk files. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: convert to GENTARGETSGravatar Thomas Petazzoni2011-07-102-38/+26
| | | | | | | | | | | Moreover, the installation of pxelinux and/or isolinux is now handled as suboptions, like we traditionally do for other packages. This allows to have a single option (BR2_TARGET_SYSLINUX) that enables the syslinux package. [Peter: drop basename in install step] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* boot/syslinux: allow build on x86_64Gravatar Heiko Zuerker2010-11-291-1/+1
| | | | | | Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* syslinux: depends on host-nasmGravatar Thomas Petazzoni2010-06-121-2/+2
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* syslinux: remove the unnecessary SYSLINUX_SUPPORTED_ARCH checkGravatar Thomas Petazzoni2010-06-121-20/+0
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* syslinux: bump version and fix buildGravatar Thomas Petazzoni2010-06-123-24/+34
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* bootloaders: move bootloader build code to boot/Gravatar Thomas Petazzoni2010-06-103-0/+93
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>