summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/grub2.inc
Commit message (Collapse)AuthorAgeFilesLines
* grub2: Fix passing null to printf formatsKhem Raj2018-12-271-0/+1
| | | | | | | | | | Backport a patch that helps with this error which is found by gcc9 (From OE-Core rev: 93419fb569b827056a422614d3dc29cd41b2b6bb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: set GRUBPLATFORM_arm to efiMingli Yu2018-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | * grub-efi support on arm is enabled as below commit: commit 65f9fb788371a9a08e3b0e6febecb9cc2aaeefe7 Author: Kristian Amlie <kristian.amlie@northern.tech> Date: Tue Jul 10 16:07:12 2018 +0200 grub-efi: Provide target architecture for 32-bit ARM. * But it fails on arm as below: | grub-mkimage: error: cannot open `./grub-core//serial.mod': No such file or directory. Set GRUBPLATFORM_arm = "efi" to fix the above error (From OE-Core rev: 6ad431974d96aec29d12079be8b94c479b91c446) Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix build with new binutilsRoss Burton2018-07-261-1/+2
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix build with gcc8Martin Jansa2018-05-111-0/+1
| | | | | | | (From OE-Core rev: 3eca7aa8196ef8ed682659ff47f3f1e3b2c6867d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix device mapper dependencyRobert Joslyn2018-01-221-1/+1
| | | | | | | | | | | The lvm2 recipe in meta-oe was split, so the libdevmapper library is provided by the libdevmapper recipe rather than lvm2. (From OE-Core rev: 68a3ae195998f96e2d8678a6a3733117d490787d) Signed-off-by: Robert Joslyn <robert_joslyn@selinc.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub/grub-efi: fix conflictHongxu Jia2018-01-191-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While installing grub and grub-efi, there are conflict files in ${sysconfdir} ${datadir} ${bindir} ${sbindir}. - Since all of the conflicted files are tools which is common for grub and grub-efi, we split them (except grub-editenv) to grub-common in grub. - The package grub-common runtime depends grub-editenv - The package grub-editenv runtime provides grub-efi-editenv - Remove SYSROOT_DIRS_BLACKLIST - The recipe grub-efi does not generate the duplicated files and use runtime depends grub-common to instead Debian and Fedora do the similar thing. Debian use a common package grub-common for both of pc bios and efi, and use package grub-pc-bin for pc bios, grub-efi-amd64-bin for efi. Both of grub-pc-bin and grub-efi-amd64-bin requires grub-common. https://packages.debian.org/sid/grub-common https://packages.debian.org/jessie/grub-pc-bin https://packages.debian.org/jessie/grub-efi-amd64-bin Fedora use a common package grub2-tools for both of pc bios and efi, and use package grub2 for pc bios, grub2-efi-modules for efi. Both of grub2 and grub2-efi-modules requires grub2-tools. https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-tools-2.02-0.34.fc24.x86_64.html https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-2.02-0.34.fc24.x86_64.html https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-efi-modules-2.02-0.34.fc24.x86_64.html [YOCTO #11639] (From OE-Core rev: 6fd0bc313c6035b7de5b7a62cbbcd1d6f546c7f9) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Move grub-editenv packaging to grub2.incOtavio Salvador2017-12-101-0/+6
| | | | | | | | | | | | The editenv utility must be available on grub and grub-efi so we better have it inside the grub2.inc file to avoid the duplication of metadata. (From OE-Core rev: ebdd054ad85b19d47dd20eab0ba3f31ef5141140) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix build on gcc where _FORTIFY_SOURCE is definedMartin Jansa2017-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | * e.g. with gentoo gcc-7.1 they define _FORTIFY_SOURCE by default with: https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo/src/patchsets/gcc/7.1.0/gentoo/10_all_default-fortify-source.patch?view=markup which results in following error while building grub-efi-native: ./config-util.h:1504:48: error: this use of "defined" may not be portable [-Werror=expansion-to-defined] || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ ^~~~~~~~~~~~~~~ this part comes from gnulib and it's used only for Apple and BSD, so we can ignore it, but we cannot add -Wno-error=expansion-to-defined because this warning was introduced only in gcc-7 and older gcc will fail with: cc1: error: -Werror=expansion-to-defined: no option -Wexpansion-to-defined use #pragma to work around this (From OE-Core rev: f5302b0ad2942f7705d46c33949ebc1c5ddf3f58) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix 0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch missingHongxu Jia2017-06-281-0/+1
| | | | | | | | | | | | | | | | | | | | Since grub upgraded to 2.02, it forgot to aplly 0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch. ... commit 4f27e4042dfb39caa71c7c6eb0a327de6af4d563 Author: Khem Raj <raj.khem@gmail.com> Date: Fri Apr 21 20:36:06 2017 +0000 grub: Update to 2.02 ... The missing caused grub-mkconfig could not detect kernel bzImage. (From OE-Core rev: 683807bc4abecadd471a3371a8d592f63bc36d68) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: remove autogen dependencyAlexander Kanavin2017-06-281-1/+1
| | | | | | | | | Hasn't been required by grub for quite a while. (From OE-Core rev: 7e459c1d13d857b8452b7bedb2ffe2157b27164a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: switch from ftp to httpsMaxin B. John2017-06-141-1/+1
| | | | | | | | | | For the same reasons as Debian: https://www.debian.org/News/2017/20170425 (From OE-Core rev: 3a603a805ff3495ac9b8431acbf698757a28d32d) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Update to 2.02Khem Raj2017-05-231-27/+23
| | | | | | | | | | Drop git recipe, add arm bits to 2.02 itself (From OE-Core rev: 4f27e4042dfb39caa71c7c6eb0a327de6af4d563) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix build with glibc 2.25Khem Raj2016-12-201-0/+1
| | | | | | | | | Backport relevant patch from grub git (From OE-Core rev: 5e501f8e3ecf14f31da3cca5ab762af5ddc81964) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix some quirks and div by zeroAwais Belal2016-12-131-0/+2
| | | | | | | | | | | | | | | Rather than erroring out on a single attempt while terminating EFI services, make a few retries because such quirks are found in a few implementations. Also fix a div by zero issue in the same framework which causes an infinite reboot on the target. Both patches included here are backports. (From OE-Core rev: 5e6ac806bd9b8bf885ef1e88484e91e4cdaaa69a) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: enforce -no-pie if supported by compilerAlexander Kanavin2016-12-081-0/+1
| | | | | | | | | | | Recent distros are enabling -pie by default; in case of grub we need to turn it off. (From OE-Core rev: aaff6c99dde3f1058bb3c4b320f27753c6c992ad) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix load module all_video failedHongxu Jia2016-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While using oe-core toolchain to strip grub module 'all_video.mod', it stripped symbol table: -------------- root@localhost:~# objdump -t all_video.mod all_video.mod: file format elf64-x86-64 SYMBOL TABLE: no symbols -------------- It caused grub to load module all_video failed. (This module will be loaded by defalut which configed in grub.cfg) -------------- grub> insmod all_video error: no symbol table. -------------- Tweak strip option to keep symbol .module_license could workaround the issue. -------------- root@localhost:~# objdump -t all_video.mod all_video.mod: file format elf64-x86-64 SYMBOL TABLE: 0000000000000000 l d .text 0000000000000000 .text 0000000000000000 l d .data 0000000000000000 .data 0000000000000000 l d .module_license 0000000000000000 .module_license 0000000000000000 l d .bss 0000000000000000 .bss 0000000000000000 l d .moddeps 0000000000000000 .moddeps 0000000000000000 l d .modname 0000000000000000 .modname -------------- (From OE-Core rev: 17e7eb96e5446821ad81977ac9ccac26b05e67a7) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: run autogen.sh before configuremingli.yu@windriver.com2016-08-041-1/+3
| | | | | | | | | | | | | | | | | * When adding new source files from upstream the autogen.sh script needs to be run * Rework grub2-remove-sparc64-setup-from-x86-builds.patch to remove the grub-setup helper program grub-sparc64-setup in Makefile.util.def instead of the previous Makefile.util.am to avoid the update for Makefile.util.am in do_patch phase is overwritten by the autogen.sh in do_configure phase (From OE-Core rev: 949df030cf39e7f551302e1e6f86b0a270cd2181) Signed-off-by: Catalin Enache <catalin.enache@windriver.com> Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix build with gcc-6Khem Raj2016-05-131-0/+1
| | | | | | | | | | | | | | | Backport patch which silences following '../../grub-2.00/grub-core/'`gfxmenu/model.c ../../grub-2.00/grub-core/gettext/gettext.c:37:36: error: storage size of 'main_context' isn't known static struct grub_gettext_context main_context, secondary_context; ^~~~~~~~~~~~ make[3]: *** [gettext/gettext_module-gettext.o] Error 1 (From OE-Core rev: 4efac9861ab59d696bdc81ea59497febfa2d0dc8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: Use SYSROOT_DIRS_BLACKLIST to exclude dirs from the sysrootPeter Kjellerstedt2016-05-131-4/+1
| | | | | | (From OE-Core rev: 9a871ccbdd5224e7d0e2354c0842be742c96eda4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix documentation rebuildsRoss Burton2016-03-201-0/+1
| | | | | | | | | | | | If the documentation needs to rebuild then it will fail as the syntax isn't valid with modern texinfo. Backport a patch from git to fix the syntax. [ YOCTO #9306 ] (From OE-Core rev: f59263a2d1a4918e8dd12fcf968a826b3e8fa018) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: drop bogus dependency on xzAndre McCurdy2016-03-021-1/+1
| | | | | | | | | | | | | | grub contains it's own internal lzma library. Attempting to build grub against the system liblzma shared library or header files is not likely to end well. This change does not cause a floating dependency since all grub2.inc based recipes pass "--enable-liblzma=no" to configure. (From OE-Core rev: a421d474e19f98f5ffcfe9d1eb204f0dfacbbe2a) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: avoid passing -isystem to native buildsAndre McCurdy2016-03-021-0/+9
| | | | | | | | | | | | grub2 creates its own set of -nostdinc / -isystem / -ffreestanding CFLAGS and OE's default BUILD_CFLAGS (assigned to CFLAGS for native builds) etc, conflict with that. (From OE-Core rev: b15b52dc8ab7dd273605c7dfd524c0a330bfd60b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: dont export TARGET_CFLAGS etc to grub2 configureAndre McCurdy2016-03-021-1/+7
| | | | | | | | | | | | The grub2 configure script uses variables such as TARGET_CFLAGS etc for its own purposes. Remove the OE versions from the configure environment to avoid conflicts. (From OE-Core rev: 58a79e6bf7d8c6ec03581f14fb83da0eeb526cc6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Backport fix for largefile detection/useKhem Raj2016-01-301-0/+1
| | | | | | | | | | | | | | | | | This is inspired by musl porting, where grub's configure is enabling largefile support based on glibc versions, instead an upstream patch turns it into autoconf check Update git version recipe arm platforms use this recipe to provide grub and it needed fixes from upstream so upgrade to latest tip of git and forward port patches as well as drop the ones already applied upstream (From OE-Core rev: a290429c8415042cb8c2f4258e76a3cc6815a172) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Fix CVE-2015-8370Awais Belal2016-01-071-0/+1
| | | | | | | | | | http://git.savannah.gnu.org/cgit/grub.git/commit/?id=451d80e52d851432e109771bb8febafca7a5f1f2 (From OE-Core rev: 7d0779b0133f253d06740653d8d1b8276dbcab7f) Signed-off-by: Awais Belal <awais_belal@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix initrd size restriction bugShan Hai2015-04-301-0/+1
| | | | | | | | | | | The current grub2 fails on loading large initrd file (> 500M) since the initrd size is added to the addr_min and causes the failure. Fix it by picking a patch from grub2 upstream. (From OE-Core rev: 156d8fecf31a7a9dc257e55e25645c561d5ba0b8) Signed-off-by: Shan Hai <shan.hai@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Backport const qualifier fix for gcc-5Khem Raj2015-04-271-0/+1
| | | | | | | | | | | gcc-5 is stricter and complains about const to non-const conversions, we backport the patch from upstream into 2.00 Change-Id: I17db365fdd253daaa1ab726e2a70ecad0ac7b2ae (From OE-Core rev: 7d79a7bfffbc39090b22bb7696cc5dbc832e49b6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipes: Fix charset.alias for muslKhem Raj2015-04-211-0/+1
| | | | | | | | | | This is same gnulib fix replicated across needed recipes Change-Id: I756713407111a726eae98e26c9c1ff64981371c0 (From OE-Core rev: fbe6d2c12aa9f7956bc87efeb68cb64b26b60c7a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: add PACKAGECONFIG for grub-mount and device-mapperRobert Yang2015-04-131-0/+4
| | | | | | | | | | | We had PACKAGECONFIGs for grub_2.00 and grub_git, we also need them for grub-efi, otherwise there might be failures as: grub-2.00/util/grub-mount.c:37:23: fatal error: fuse/fuse.h: No such file or directory (From OE-Core rev: a7fca64d04949e76805e7acc3f617a1cd4a107a7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: remove autogen-native dependency for tarball recipesRoss Burton2015-01-231-1/+1
| | | | | | | | | | The tarballs of grub ship the files that are generated by autogen, so tarball recipes don't need to depend on autogen-native (and thus guile-native). (From OE-Core rev: 0ef983cd682134443020821fed6dd6e2bbbf3188) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub 2.0: several fixesRobert Yang2015-01-161-0/+44
* Make grub, grub-efi grub_git use a grub2.inc to reduce the duplicated code. * Make grub and grub-efi use the same patches since they use the same source. (grub_git is different). * grub-efi: - Use autotools to replace autotools-brokensep - Remove the DEPENDS of freetype, it should be a RDEPENDS. - Remove grub-2.00-ignore-gnulib-gets-stupidity.patch since it is a duplication of remove-gets.patch. - Make grub-efi.rpm contain files rather than make an empty package. * grub_git: - Fix a SSE build failure. [YOCTO #6310] (From OE-Core rev: cf4aaed28a34cc652352f0817316187b72babc76) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 20:42:17 +0000