summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* grub: Enhance Waddress-of-packed-member patch to cover x86_64 testcaseKhem Raj2019-03-041-0/+13
| | | | | | | | | | This was not compiled for x86_64 when previously testing aarch64 so some tests were missed. (From OE-Core rev: c2cb8827dc5bdeadd78f462398630c05e5a9ebb7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Fix build with gcc9Khem Raj2019-02-152-0/+250
| | | | | | | | | Disable -Waddress-of-packed-member being treated as error (From OE-Core rev: cd2b008acb9b46e00a34c0fc23188c3f73d3c74e) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Fix passing null to printf formatsKhem Raj2018-12-272-0/+35
| | | | | | | | | | 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-262-1/+78
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Provide target architecture for 32-bit ARM.Kristian Amlie2018-07-151-0/+3
| | | | | | | | (From OE-Core rev: 65f9fb788371a9a08e3b0e6febecb9cc2aaeefe7) Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix build with gcc8Martin Jansa2018-05-112-0/+75
| | | | | | | (From OE-Core rev: 3eca7aa8196ef8ed682659ff47f3f1e3b2c6867d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: add grub target and image for aarch64Ricardo Salveti2018-05-041-0/+3
| | | | | | | | | | | Add missing target and image for aarch64, as the current revision is already fully compatible with ARMv8. (From OE-Core rev: 43dc32aa00c87f62dcf9a857d4e32469ce27c9e9) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: refresh patchesRoss Burton2018-03-091-10/+7
| | | | | | | | | | | | | | | | | | | | | The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 856a70cf6ca9137d5c07c2aa9ef447032589504d) Signed-off-by: Ross Burton <ross.burton@intel.com> 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-efi: if installed and EFI_PROVIDER, install as bootx64 or bootia32California Sullivan2018-03-061-5/+8
| | | | | | | | | | This way we could theoretically support multiple bootloaders, and we keep the convention of boot(x64|ia32). (From OE-Core rev: 8d158bb4382fd4ef31d37ea5558e07d5eb33145e) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: install to /boot/California Sullivan2018-03-062-8/+28
| | | | | | | | | Since /boot/ will be recipe/package controlled now we can't just deploy. (From OE-Core rev: f9c3405a99f3c0fd922d21bea7bb0bd0dd3a2ab2) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: create recipe for configurationCalifornia Sullivan2018-03-061-0/+29
| | | | | | | | | | This makes use of the grub-efi-cfg bbclass that was split out to create a grub.cfg file just like the old one. (From OE-Core rev: eff14ba3e49d77bfc8167a19a0f58563270f2a51) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: add configfile as default built-inRicardo Salveti2018-02-061-1/+1
| | | | | | | | | | | | The module configfile allows loading a custom grub configuration file from block devices, which can be used to customize the default grub menu when creating images with wic (via configfile argument). (From OE-Core rev: 6b297ccf04683380d0a894253a78424f4398782d) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/recipes: Convert SkipPackage -> SkipRecipeRichard Purdie2018-01-261-1/+1
| | | | | | | | | | The new name is much more consistent with what this actually means. We put the pieces in place to rename everything a while back but looks like we forgot to actually do it! Fix that now. (From OE-Core rev: af9612f5d6b848fceea22d10ee964437299be776) 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-193-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-efi: Fix DEPENDSRichard Purdie2018-01-131-1/+1
| | | | | | | | | We need to append to DEPENDS else the dependencies on bison/flex-native are lost, potentially resulting in build failures. (From OE-Core rev: bead76b50dc60e1b6b39fa5b659a7af44ff91adc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Move grub-editenv packaging to grub2.incOtavio Salvador2017-12-102-5/+7
| | | | | | | | | | | | 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>
* grub-efi: Add loadenv and test as default built-inOtavio Salvador2017-12-101-1/+1
| | | | | | | | | | | To allow scripting and environment changes, the loadenv and test must be enabled. This adds those to the default set. (From OE-Core rev: b7c9a298801c828c06b6e7da47c35f592864ce74) 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>
* grub-efi: Rework GRUB_BUILTIN variable as it is too longOtavio Salvador2017-12-101-1/+2
| | | | | | | | | | | As we will add new values here, it is better to split it in multiple lines. (From OE-Core rev: 1a491515d58d0d9f03f7a3a84738f53377b0f819) 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>
* grub-efi_2.02.bb: improve reproducibilityJuro Bystricky2017-11-301-0/+10
| | | | | | | | | | Remove several build host references from modinfo.sh files. (From OE-Core rev: 6e4182b7c540e22f25ea8bfd16b0e2b2c8eb9f82) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub_2.02.bb: improve reproducibilityJuro Bystricky2017-11-081-0/+7
| | | | | | | | | | Remove several build host references from modinfo.sh files. (From OE-Core rev: 391ceb68ba0be36009893bc9ab8a937a985052a9) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>