aboutsummaryrefslogtreecommitdiff
path: root/boot/grub
Commit message (Collapse)AuthorAgeFilesLines
* boot/grub: removeGravatar Yann E. MORIN2017-09-239-48848/+0
| | | | | | | | | | | | | | | | | | | | | | grub is no longer maintained: it is stuck at version 0.97 with huge patches that have no opportunity to be applied upstream, as upstream has even renamed it grub-legacy. Besides, it no longer builds correctly with recent binutils versions, and even the huge patches we could grab from Debian do not help the slightest. Since upstream really considers it dead, and there are at least two alternatives (grub2 and syslinux), just remove grub. Add a legacy entry. Remove the test cases as well. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Ricardo Martincoski <ricardo.martincoski@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
* boot, linux, package: use SPDX short identifier for GPLv2/GPLv2+Gravatar Rahul Bedarkar2017-04-011-1/+1
| | | | | | | | | | | We want to use SPDX identifier for license strings as much as possible. SPDX short identifier for GPLv2/GPLv2+ is GPL-2.0/GPL-2.0+. This change is done by using following command. find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv2\>/GPL-2.0/g' Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot/grub: add rootwait to default configGravatar Gustavo Zacarias2016-03-101-1/+1
| | | | | | | | It doesn't hurt, and is useful for removable boot media like a pendrive that may depend on usb enumeration and isn't available immediately. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: add hashGravatar Gustavo Zacarias2015-03-031-0/+3
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* boot/grub: use install instead of cpGravatar Guido Martínez2014-11-221-7/+7
| | | | | | | | | | | This way we don't depend on the permissions of files under boot/grub/, which aren't tracked. While we're at it, change all 'cp' usages into 'install' with the correct mode for each file. Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* boot/grub: update patchlevel, update snapshot.debian.org dateGravatar Karoly Kasza2014-10-251-2/+2
| | | | | Signed-off-by: Karoly Kasza <kaszak@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* .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>
* packages: rename FOO_CONF_OPT into FOO_CONF_OPTSGravatar Thomas De Schampheleire2014-10-041-1/+1
| | | | | | | | | | | | To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.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>
* grub: bump to 0.97-67Gravatar Thomas Petazzoni2014-01-074-2887/+475
| | | | | | | | | | Bump to a more recent version of the Debian patches for grub legacy, that fix an incorrect build with gcc 4.6. Fixes #6092 and #2629. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: add web reference that documents how to generate a splashimageGravatar Thomas Petazzoni2013-12-311-2/+4
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* grub: align splashscreen handling with iso9660 codeGravatar Thomas Petazzoni2013-12-312-5/+17
| | | | | | | | This commit aligns the Grub handling of the splash screen with what is done in the ISO9660 code. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* grub: really disable splash screen supportGravatar Thomas Petazzoni2013-12-291-1/+2
| | | | | | | | | | | | | When BR2_TARGET_GRUB_SPLASH is enabled, we were passing --enable-graphics, but when it was disabled, we were not doing anything. However, in Grub, graphics support is enabled by default, and you have to pass --disable-graphics to disable it. Fix this by passing --enable-graphics or --disable-graphics as appropriate. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* grub: replace string option for filesystem selection by booleansGravatar Thomas Petazzoni2013-12-292-19/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 1cece2813bf635ae29e9a8287322439b9c5992f7 (grub: add option to configure the list of supported filesystems), we introduced the BR2_TARGET_GRUB_FS_SUPPORT option which allows to provide a space-separated list of filesystems that Grub should support. However, it turns out that this not very practical, because the iso9660 filesystem logic in Buildroot should force the ISO9660 support to be enabled in Grub, which is not easy to do with a string option. Therefore, this patch changes this option from a string option to a list of boolean option, one per filesystem supported. A few useful details: - Since Grub legacy is dead, the list of filesystem, and therefore the number of options, will not grow. - We have only added options for filesystems that are likely to be used in an embedded Linux context. Filesystems such as VSTAfs, Minix, UFS2 or FFS2 are not supported. - There is no need to add some Config.in.legacy support for the previous option, since it was added after Buildroot 2013.11, and was therefore never part of an official Buildroot release. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* grub: enclose network driver options in a sub-menuGravatar Thomas Petazzoni2013-12-291-0/+4
| | | | | | | | | In preparation to a change to the configuration options of the supported filesystem in Grub, enclose the network driver options in a sub-menu. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
* grub: force -m32 so we build grub 32 bits on 64 bits architectureGravatar Thomas Petazzoni2013-12-041-1/+1
| | | | | | | | | | | | | | As reported by Matthew Weber, Grub doesn't build on 64 bits build machines, because the host compiler produces 64 bits binaries by default, while Grub should be built 32 bits. Therefore, this commit passes -m32 to the Grub CFLAGS, so that 32 bits binaries are always produced. Reported-by: Matthew Weber <mlweber1@rockwellcollins.com> Cc: Matthew Weber <mlweber1@rockwellcollins.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Tested-by: Matthew Weber <mlweber1@rockwellcollins.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: improve help text with detailed instructions to install grubGravatar Thomas Petazzoni2013-12-011-0/+30
| | | | | | | | | These instructions should probaby go in the Buildroot manual, but at this point, it's not clear in which section they should go. So in order to not loose those notes, add them to the Grub help text. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: add option to configure the list of supported filesystemsGravatar Thomas Petazzoni2013-12-012-1/+24
| | | | | | | | | | | | | | | | | | | | | | Grub can be configured to enable or disable the filesystems supported in the stage 2. In addition, there are filesystem specific stage 1.5. In order to save space and build time, we provide a new option that allows to give a space-separated list of filesystems that Grub should support. We default to support FAT and ext2, since most of the other filesystems are fairly unlikely to be used. We use this option to: 1) Pass --enable-<fs> or --disable-<fs>, which enables/disables the support of <fs> in Grub stage 2. 2) Install only the stage 1.5 that correspond to the selected filesystems. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: adjust splashimage in menu.lst depending on configurationGravatar Thomas Petazzoni2013-12-012-1/+2
| | | | | | | | Make the splashimage line in menu.lst only active when splashimage support has really been enabled in the Grub configuration. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: install the sample menu.lst into $(TARGET_DIR)/boot/grubGravatar Thomas Petazzoni2013-12-011-0/+1
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: sample menu.lst file improvementsGravatar Thomas Petazzoni2013-12-011-1/+1
| | | | | | | | | | | | | | Two improvements to the menu.lst file: * Do not enforce any video mode, let the kernel use whatever it wants as the default, or let the user customize it when needed. * Use /dev/sda1 instead of /dev/hda1. Nowadays, most hard disk controllers are handled using libata, and therefore the disks are visible as /dev/sd<X>. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: replace splash screen with a nicer Buildroot splash screenGravatar Thomas Petazzoni2013-12-011-0/+0
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: support build on x86-64, and misc other improvementsGravatar Thomas Petazzoni2013-12-012-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit brings a number of improvements to the grub packaging: * It builds grub with the host compiler, which is needed so that we can build a 32 bits grub even if the target architecture is x86-64. To make sure we have a host compiler capable of generating 32 bits code, grub now selects the BR2_HOSTARCH_NEEDS_IA32_COMPILER option. Building with the host compiler is done by cheating and passing $(HOST_CONFIGURE_OPTS) in GRUB_CONF_ENV. * Some additional CFLAGS are added to make sure grub builds properly with modern compilers (-O0, --build-id=none, -fno-stack-protector). * Removal of the GRUB_INSTALL_STAGING_CMDS which were not used, since GRUB_INSTALL_STAGING was not set to YES. * Installation of the "grub" binary in $(HOST_DIR) instead of $(TARGET_DIR) since it's actually used only on the host to install grub into an image or device. * Removal of the grub uninstall commands, since they are generally considered useless. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* grub: factorize BR2_TARGET_GRUB dependency in Config.inGravatar Thomas Petazzoni2013-12-011-23/+4
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* 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>
* grub: 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>
* Prevent patch commands from accessing source controlGravatar Danomi Mocelopolis2011-11-261-1/+1
| | | | | | | | Closes #4357 Add -g0 option to patch to ensure it doesn't try to access source control. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* package: remove useless arguments from AUTOTARGETSGravatar Thomas Petazzoni2011-09-291-1/+1
| | | | | | | | | | Thanks to the pkgparentdir and pkgname functions, we can rewrite the AUTOTARGETS 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>
* boot: get rid of toplevel submenusGravatar Peter Korsgaard2011-09-181-1/+1
| | | | | | | Sub options are indented anyway, so no need for empty menus / force people to enter sub menus to see configuration options. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* grub: fix patch handling after AUTOTARGETS conversionGravatar Peter Korsgaard2011-08-263-14/+49480
| | | | | | | | | | | | Closes #4093 AUTOTARGETS doesn't handle compressed patches, so the '400' patch did not get applied. Fix it by extracting the patch. With this, the '500' patch is no longer needed. 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>
* grub: convert to AUTOTARGETSGravatar Thomas Petazzoni2011-07-102-63/+53
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* grub: fix download URLGravatar Peter Korsgaard2011-03-131-1/+1
| | | | | | | | The Debian package snapshot service moved to an official debian.org address last year (http://www.debian.org/News/2010/20100412) with a slightly different URL structure, so adjust the download URL to match. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Update all packages to quote $(TARGET_CC)Gravatar Thomas Petazzoni2010-07-071-4/+4
| | | | | | | Now that TARGET_CC contains several space-separated words, it must be used quoted everywhere. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* grub/grub2: update splash image locationGravatar Thomas Petazzoni2010-06-121-1/+1
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* grub/grub2: drop unnecessary dependency on uclibcGravatar Thomas Petazzoni2010-06-121-1/+1
| | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* grub: remove GRUB_SUPPORTED_ARCHGravatar Thomas Petazzoni2010-06-121-19/+0
| | | | | | | grub can already only be selected for x86 and x86_64. No need to check again for this in grub.mk. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* bootloaders: move bootloader build code to boot/Gravatar Thomas Petazzoni2010-06-108-0/+1742
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>