summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
Commit message (Collapse)AuthorAgeFilesLines
* grub: disable build on armv7ve/a with hardfpMingli Yu2022-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | The commit(75dbdea940 grub: Allow build on armv7ve/a with softfp) enable build on armv7ve/a with softfp, but it acutally enable build on armv7ve/a with hardfp altogether and result in below build failure: | checking for compile options to get strict alignment... -mno-unaligned-access | checking if compiler generates unaligned accesses... no | checking if C symbols get an underscore after compilation... no | checking whether target compiler is working... no | configure: error: cannot compile for the target So update the check to disable build on armv7ve/a with hardfp. (From OE-Core rev: f67b2880fc2cfb21f51216c63b5f24d0524b4278) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Allow build on armv7ve/a with softfpAndrei Gherzan2022-09-211-3/+7
| | | | | | | | | | | | | | | | | | | | Grub tries to force the compilation in softfp mode for some known target CPU. That is because it doesn't use floats or doubles and there are known limitations of using a configuration with hardfp. There are though target CPUs that grub won't know how to configure failing with something similar to: | checking for options to get soft-float... no | configure: error: could not force soft-float This change relaxes a bit the COMPATIBLE_HOST restriction to only apply for hardfp configuration even for arm7ve/a. (From OE-Core rev: 75dbdea94057b6977a20fb738c00c226ca694243) Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Apply backports to fix build with clang on x86Khem Raj2022-09-203-0/+109
| | | | | | | (From OE-Core rev: 2213b6ce1ec944228d7bb3c95f2e02ac0995b5be) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix several CVEsYongxin Liu2022-08-2111-0/+1621
| | | | | | | | | | | | | | | | | | | | Backport CVE patches from upstream to fix: CVE-2021-3695 CVE-2021-3696 CVE-2021-3697 CVE-2022-28733 CVE-2022-28734 CVE-2022-28735 Backport the following 5 patches to make CVE patches be applied smoothly. video-Remove-trailing-whitespaces.patch video-readers-jpeg-Abort-sooner-if-a-read-operation-.patch video-readers-jpeg-Refuse-to-handle-multiple-start-o.patch (From OE-Core rev: db43401a3a4c201f02f4128fa4bac8ce993bfec0) Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: ignore CVE-2021-46705Ross Burton2022-03-291-0/+2
| | | | | | | | | | This is specific to SUSE Linux. (From OE-Core rev: 594baef3b08d40fbbf1899f4cadeb9931c035c1a) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Add option to include all available modulesDiego Sueiro2022-03-121-2/+13
| | | | | | | | | | | | | Include all available modules If 'all' is present in GRUB_BUILDIN variable. To achieve this we need to search for all .mod files in ${B}/grub-core/ and pass them to grub-mkimage command. Also, add the verbose option to grub-mkimage. (From OE-Core rev: ed1bf9aa0af8c12905cf8332bbbb212ab158fe3c) Signed-off-by: Diego Sueiro <diego.sueiro@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/scripts: Automated conversion of OE renamed variablesRichard Purdie2022-02-211-1/+1
| | | | | | (From OE-Core rev: aa52af4518604b5bf13f3c5e885113bf868d6c81) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix build with bintutils 2.38 on riscvKhem Raj2022-02-202-0/+48
| | | | | | | (From OE-Core rev: d42596457628f41baa5729545e2932c6692f73ee) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/meta-selftest/meta-skeleton: Update LICENSE variable to use SPDX ↵Richard Purdie2022-02-201-1/+1
| | | | | | | | | | | | | license identifiers An automated conversion using scripts/contrib/convert-spdx-licenses.py to convert to use the standard SPDX license identifiers. Two recipes in meta-selftest were not converted as they're that way specifically for testing. A change in linux-firmware was also skipped and may need a more manual tweak. (From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Add xen_boot support when 'xen' is in DISTRO_FEATURES for aarch64Kamil Dziezyk2022-01-141-0/+3
| | | | | | | | | 'xen-boot' module is available only for aarch64. (From OE-Core rev: bfabc6d4f8742cc1fdeb49c180b0f78faf5739a2) Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix CVE-2021-3981Yongxin Liu2022-01-042-0/+50
| | | | | | | (From OE-Core rev: bb554d14142f93c39fd1516a31757006531c348f) Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: stop using "virtual/" in RPROVIDES and RDEPENDSMichael Opdenacker2021-09-012-2/+2
| | | | | | | | | | | | | | | | | Fixes [YOCTO #14538] Recipes shouldn't use the "virtual/" string in RPROVIDES and RDEPENDS. That's confusing because "virtual/" has no special meaning in RPROVIDES and RDEPENDS (unlike in PROVIDES and DEPENDS). Instead, using "virtual-" instead of "virtual/" as already done in the glibc recipe. (From OE-Core rev: 93ac180d8c389f16964bce8bd5538d9389e970e6) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to new override syntaxRichard Purdie2021-08-024-28/+28
| | | | | | | | | | | | This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: upgrade 2.04+2.06~rc1 -> 2.06Alexander Kanavin2021-06-173-17/+4
| | | | | | | (From OE-Core rev: 0f528608eb48809955b2610ecc4bd689f1cf8899) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Exclude CVE-2019-14865 from cve-checkRichard Purdie2021-05-211-0/+3
| | | | | | | | The CVE only applies to RHEL. (From OE-Core rev: 8cfc3ebe50facb7e34e778f3e264b26cfae20a04) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Add CVE whitelist entries for issues fixed in 2.06Richard Purdie2021-05-111-0/+7
| | | | | | | | | | | | We're using a pre-release version of 2.06 so these issues are fixed but continue to show up in the checks since it is pre-2.06 and the CPE entries are "before but excluding 2.06". Adding these will clean up CVE reports until the 2.06 release comes out. (From OE-Core rev: 2467ab1554bee3a431636046735e8e369e865bc6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: remove '-O2' from CFLAGSKai Kang2021-05-091-0/+2
| | | | | | | | | | | | | | | | | | It fails to boot grub after upgrade grub to 2.06. According to description in https://bugzilla.yoctoproject.org/show_bug.cgi?id=14367 it is introduced by a commit to fix CVE. So remove option '-O2' from CFLAGS rather than revert the commit to avoid the failure. [YOCTO #14367] CC: Tony Battersby <tonyb@cybernetics.com> (From OE-Core rev: 69805629b8f47fd46a37b7c5cc435982e2ac3d1d) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Enable on riscv32Khem Raj2021-03-312-7/+17
| | | | | | | | | Update the patch as submitted upstream to grub2 (From OE-Core rev: a1ce702bb5317712083ae32332051c36923c4a50) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Re-introduce lost cast to longKhem Raj2021-03-282-0/+30
| | | | | | | | | | | This cast was accidentally dropped in https://git.savannah.gnu.org/cgit/grub.git/commit/?id=2bf40e9e5be9808b17852e688eead87acff14420 (From OE-Core rev: c032297695e9e4bb4d0fb12dc883044bdfa870f2) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Disable for RISCV32Khem Raj2021-03-281-1/+1
| | | | | | | | | | A full working port is not available yet, until such time disable it (From OE-Core rev: a8a8b7f3db955bbdb1abfce1e0be004521348669) Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: upgrade 2.04 -> 2.06~rc1Naveen Saini2021-03-2015-4316/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | 2.06 RC1 release have a number of CVEs fixed: CVE-2020-15705 CVE-2021-3418 CVE-2020-27749 CVE-2021-20233 CVE-2021-20225 CVE-2020-25647 CVE-2020-25632 CVE-2020-27779 CVE-2020-14372 CVE-2020-15707 CVE-2020-15706 CVE-2020-14309 CVE-2020-14310 CVE-2020-14311 CVE-2020-14308 CVE-2020-10713 CVE-2014-4607 Dropped backported patches. (From OE-Core rev: 36a59d63619c2225fe48aa1d8fb1cdabedfffc03) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: shuffle packaging for aarch64 buildsRoss Burton2021-02-232-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in grub-efi platforms we need to build grub for the the common tools. On x86 this isn't a problem because grub builds legacy boot and grub-efi builds EFI, but on aarch64 there is no legacy boot supported by grub. To ensure that the common tools are built the grub recipe also builds EFI binaries, but this now means that grub and grub-efi ship the same binaries. oe-core 933286 fixed this conflict by deleting the binaries from grub-efi and putting the aarch64 modules into grub-common (relying on dependencies to pull grub-common in). This seems backwards: grub-efi no longer contains the binaries and they're in different packages on arm or x86. Also, SDK generation is broken as the grub package itself is now empty as the binaries are in grub-common. Resolve all of these issues by reversing the logic: grub-efi is the package which holds the EFI binaries on all platforms. grub only builds for EFI on aarch64 as a way to build the common binaries, so delete them in that recipe to avoid conflicts. And finally as the grub recipe is empty on aarch64 but needed by dependencies, set ALLOW_EMPTY. (From OE-Core rev: 801c10b33eb2074677d46b361e46f47b693b573a) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Backport fix to work with new binutilsRichard Purdie2021-02-032-0/+48
| | | | | | | | | | New versions of binutils caused object files to be 128MB in size, backporting this fix reduced them back to a sensible size, e.g. 1024 bytes. This avoids initramfix size issues! (From OE-Core rev: b72b9e81268719436e4bad5062cb0e1781da0395) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Further reproducibility fixRichard Purdie2021-01-011-0/+16
| | | | | | | | | | Fix the ordering in the generated unidata.c file to aid reproducibility. [YOCTO #14167] (From OE-Core rev: 6d9c9f7604fd32ef926726a46ae053bbab6ccb4f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix "CVE:" line in one of the patchesScott Murray2021-01-011-1/+1
| | | | | | | | | | | | The "CVE:" line in the patch for CVEs 2020-14309, CVE-2020-14310, and CVE-2020-14311 had commas between the CVE numbers, which resulted in CVE-2020-14310 not being picked up as patched by cve-check.bbclass's parsing. Remove the commas to match cve-check.bbclass's expectations. (From OE-Core rev: 396d5c0f9cffa4b54ae94738b1ef2b6fb545f082) Signed-off-by: Scott Murray <scott.murray@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Add second fix for determinism issueRichard Purdie2020-12-211-0/+16
| | | | | | | | | There is a second list sorting problem in a generator script within grub, add a sort() of a list to resolve this. (From OE-Core rev: cb5e96e05930eaff4d679166416d6c84d6e3236b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix build reproducibility issueRichard Purdie2020-12-202-0/+25
| | | | | | | | | We're seeing reproducibility issue on the autobuilder due to changing module dependency ordering. Add some sorting to an awk script to fix this. (From OE-Core rev: 925ddd5edccbfec52ff45c1b54ab2ae1bfe0d57c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Add support for RISC-VNorbert Kaminski2020-11-292-1/+7
| | | | | | | | | | | | | This patch adds RISC-V to the COMPATIBLE_HOST. Since GRUB 2.04, the source code supports the RISC-V, thanks to Alexander Graf. Adding the GRUBPLATFORM for RISC-V prevents autoconf problems. Also, the patch appends the __anonymous method with RISC-V architecture. (From OE-Core rev: 42ea75d441ae38cdffed3b1cd671af886c19fbb6) Signed-off-by: Norbert Kaminski <norbert.kaminski@3mdeb.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: clean up CVE patchesYongxin Liu2020-11-089-20/+36
| | | | | | | | | | | | | | Clean up several patches introduced in commit 6732918498 ("grub:fix several CVEs in grub 2.04"). 1) Add CVE tags to individual patches. 2) Rename upstream patches and prefix them with CVE tags. 3) Add description of reference to upstream patch. (From OE-Core rev: bcb8b6719beaf6625e6b703e91958fe8afba5819) Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: add grub-nativesdkKhasim Mohammed2020-10-301-1/+1
| | | | | | | | | | | | | Add nativesdk support to make grub-mkimage tool part of Host tools in the generated SDK. The conf file should have "TOOLCHAIN_HOST_TASK_append = " nativesdk-grub" for the grub-mkimage to show up. (From OE-Core rev: cc88a1b04c062373e0db15f7f7e6a26013c050fb) Signed-off-by: Khasim Syed Mohammed <khasim.mohammed@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix several CVEs in grub 2.04Yongxin Liu2020-10-309-0/+4143
| | | | | | | | | | | | | | | | | | | | | | | | | | Backport patches from https://git.savannah.gnu.org/git/grub.git to fix some CVEs. Here is the list. CVE-2020-14308: 0001-calloc-Make-sure-we-always-have-an-overflow-checking.patch 0002-lvm-Add-LVM-cache-logical-volume-handling.patch 0003-calloc-Use-calloc-at-most-places.patch CVE-2020-14309, CVE-2020-14310, CVE-2020-14311: 0004-safemath-Add-some-arithmetic-primitives-that-check-f.patch 0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch CVE-2020-15706: 0006-script-Remove-unused-fields-from-grub_script_functio.patch 0007-script-Avoid-a-use-after-free-when-redefining-a-func.patch CVE-2020-15707: 0008-linux-Fix-integer-overflows-in-initrd-size-handling.patch (From OE-Core rev: 67329184985a03534f11f95e9df5f9fb2305a261) Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix CVE-2020-10713Lee Chee Yang2020-10-202-0/+74
| | | | | | | (From OE-Core rev: ec6a2258ca27d5709df4fe18d94841332395bcb2) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: set CVE_PRODUCT to grub2Chen Qi2020-08-081-0/+2
| | | | | | | | | grub and grub-efi recipes' CVE_PRODUCT should be grub2. (From OE-Core rev: 8682f6bc7e3e8d5fcf682647526f1a8430d08768) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Remove native version of grub-efiJacob Kroon2020-06-233-26/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native version of grub-efi only installs the tools /usr/bin/grub-editenv /usr/bin/grub-mkimage to sysroots-components/, but equivalent tools are already provided by grub-native, the difference on x86_64 being 4 hardwired paths in grub-mkimage (values taken from grub-native): LOCALEDIR = $TMPDIR/work/x86_64-linux/grub-native/2.04-r0/recipe-sysroot-native/usr/share/locale GRUB_DATADIR = $TMPDIR/work/x86_64-linux/grub-native/2.04-r0/recipe-sysroot-native/usr/share GRUB_LIBDIR = $TMPDIR/work/x86_64-linux/grub-native/2.04-r0/recipe-sysroot-native/usr/lib GRUB_SYSCONFDIR = $TMPDIR/work/x86_64-linux/grub-native/2.04-r0/recipe-sysroot-native/etc If grub-native and grub-efi-native are built with the following patch --- grub-2.04.orig/configure.ac +++ grub-2.04/configure.ac @@ -1980,10 +1980,10 @@ grub_libdir="$(eval echo "$libdir")" grub_localedir="$(eval echo "$localedir")" grub_datadir="$(eval echo "$datadir")" grub_sysconfdir="$(eval echo "$sysconfdir")" -AC_DEFINE_UNQUOTED(LOCALEDIR, "$grub_localedir", [Locale dir]) -AC_DEFINE_UNQUOTED(GRUB_LIBDIR, "$grub_libdir", [Library dir]) -AC_DEFINE_UNQUOTED(GRUB_DATADIR, "$grub_datadir", [Data dir]) -AC_DEFINE_UNQUOTED(GRUB_SYSCONFDIR, "$grub_sysconfdir", [Configuration dir]) +AC_DEFINE_UNQUOTED(LOCALEDIR, "/non-existent", [Locale dir]) +AC_DEFINE_UNQUOTED(GRUB_LIBDIR, "/non-existent", [Library dir]) +AC_DEFINE_UNQUOTED(GRUB_DATADIR, "/non-existent", [Data dir]) +AC_DEFINE_UNQUOTED(GRUB_SYSCONFDIR, "/non-existent", [Configuration dir]) the produced grub-editenv/grub-mkimage binaries become binary equivalent, assuming reproducible builds is active. Since the unpatched values of LOCALEDIR/GRUB_DATADIR/GRUB_LIBDIR/GRUB_SYSCONFDIR point to directories that are not expected to exist at runtime, they can be ignored. Therefore: * remove grub-efi-native and instead rely on the same tools from grub-native * replace references to grub-efi-native with grub-native * remove unused grub-efi-native security flags overrides (From OE-Core rev: 7044181df7487f047d175242f7ebbc3c35bf5402) Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: don't autoreconf twiceRoss Burton2019-11-251-2/+3
| | | | | | | | | | | | do_configure() essentially calls autogen.sh to generate some sources and then autoreconf, but autogen.sh also calls autoreconf. Pass a magic variable so that autogen.sh doesn't autoreconf for us. (From OE-Core rev: 19e18446c09fef14c3dd54b0de12a8d21b280c93) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: inherit pkgconfigRoss Burton2019-11-251-1/+1
| | | | | | | | | | Grub uses pkg-config but is only in the sysroot via dependencies. Be explicit and inherit pkgconfig directly. (From OE-Core rev: 6cdf9a0712b136a1002e8a814274e23ee7a5f06d) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: switch to image-uefi.confDmitry Eremin-Solenikov2019-09-191-10/+7
| | | | | | | | | | Use variables from image-uefi.conf instead of hardcoding them in the recipe. (From OE-Core rev: e6bb6d31c4285a62b3e9e324c36b2baf439e7bae) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-bootconf: switch to image-uefi.confDmitry Eremin-Solenikov2019-09-191-5/+5
| | | | | | | | | | Use variables from image-uefi.conf instead of hardcoding them in the recipe. (From OE-Core rev: b5a97272ba201537a766598d9c9a97c8cbc9ea1d) Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin-solenikov@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: remove diffutils and freetype runtime dependenciesYi Zhao2019-09-162-2/+2
| | | | | | | | | | | | | | | The diffutils runtime dependency was introduced from legacy grub since the script grub-install invokes cmp command which is from diffutils package. But in Grub2 the grub-install has been rewritten with C language. So this package isn't needed anymore. The freetype runtime dependency is for grub-mkfont but we have explicitly disabled grub-mkfont build. It is safe to remove it. (From OE-Core rev: 56e4e05417f8ddba60a8b76fa4c8834aa8ea4692) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: add missing descriptions and homepage in bspMaxime Roussin-Bélanger2019-09-161-0/+3
| | | | | | | | (From OE-Core rev: ec4fdfcc7bcbc9bb92e2f33b37cc8c99bf1b6822) Signed-off-by: Maxime Roussin-Bélanger <maxime.roussinbelanger@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub/grub-efi: fix conflict for aach64Changqing Li2019-08-122-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MACHINE = qemuarm64 IMAGE_INSTALL_append = ' grub grub-efi' do_rootfs failed with error: file /usr/lib64/grub/arm64-efi/acpi.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64 file /usr/lib64/grub/arm64-efi/adler32.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64 ... file /usr/lib64/grub/arm64-efi/zfsinfo.module conflicts between attempted installs of grub-2.02-r0.aarch64 and grub-efi-2.02-r0.aarch64 For arm64, grub and grub-efi both compiled GRUBD2 with platform arm64-efi, arm64 only support platform efi. So both packages have almost same folder and content /usr/lib64/grub/arm64-efi/* if Machine set to qemux86_64, do_rootfs will not have this problem, since for grub, it compiled with platform i386-pc, for grub-efi, compiled with platform x86-64-efi. >From commit: commit 4e9bb03238af48c70075037a77094a8c1bddf284 Author: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed Jan 17 03:25:58 2018 -0500 grub/grub-efi: fix conflict 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. common tools for grub and grub-efi are installed into grub-common, for aarch64, also shipped libdir into this common packages. in this way, for qemuarm64, package grub is empty, and package grub-efi use lib in package grub-common (From OE-Core rev: 933286bdcb9008b75007abedf30cc1b4b6e2f0d0) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: add grub-nativeHongxu Jia2019-08-082-2/+2
| | | | | | | | | | Not only grub-efi-native, but also add grub-native to provide grub utilities on host (From OE-Core rev: 67dfa11f2d2fb5242814e133346e72515bfc0aca) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub/libmpc/gdb: Use GNU_MIRROR in more recipesAdrian Bunk2019-08-031-1/+1
| | | | | | | (From OE-Core rev: 2f13b063f64c500f144a70d23a343223b5c70907) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: upgrade 2.02 -> 2.04Anuj Mittal2019-07-3111-257/+35
| | | | | | | | | | | | | | | | * For changes in this version, see: http://git.savannah.gnu.org/cgit/grub.git/tree/NEWS?h=grub-2.04 * Remove backported patches and refresh others. * Remove the musl patch as it's no longer needed. * Use configure option --disable-werror instead of passing through CFLAGS. (From OE-Core rev: 07222d213d1da0ccade1c61ed19a7ecdc4966edd) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: build with python 3Ross Burton2019-07-151-0/+2
| | | | | | | | | | As part of the mission to remove the use of Python 2, explicitly use Python 3 when building grub. (From OE-Core rev: f2286cc31bd92d75c7f8662abe816867ab041d50) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Drop unneeded codeRichard Purdie2019-07-031-4/+0
| | | | | | | | | We no longer export these variables into the environment so we no longer need this code. (From OE-Core rev: fd85639bf3092491123e8747e44e7b30648c85cf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub/grub-efi: fix unrecognized command line option '-pipe-Wno-error' in CFLAGSHongxu Jia2019-06-041-1/+1
| | | | | | | | | | | Since commit [330fc83 grub: Use -Wno-error instead of doing this on a per-warning basis] applied in oe-core, it missed a space in append. (From OE-Core rev: 62c3c8277fcea61940a4433d3796a4cec1b5f577) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Use -Wno-error instead of doing this on a per-warning basisAdrian Bunk2019-05-085-332/+2
| | | | | | | | | | In practice the warnings were disabled individually instead of fixes added, so just make all warnings non-fatal to achieve the same. (From OE-Core rev: 330fc83d4519da3c13eb55e8c060ba3e191c9906) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi-native: Install grub-editenvJacob Kroon2019-04-161-0/+1
| | | | | | | | | | Having a native version of grub-editenv around can be useful for setting the targets grub environment. (From OE-Core rev: 25ead29f96eee47f565225bd2f0b4d0198405ccc) Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix build with squashfs support enabledMartin Jansa2019-03-112-0/+25
| | | | | | | (From OE-Core rev: 342f7cc6b07559238274ff2fe281afa4ea742052) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>