diff options
author | Jacob Kroon <jacob.kroon@gmail.com> | 2020-06-22 13:43:43 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 12:31:03 +0100 |
commit | 2d740a8c710a001d7de48881fb3ec227f4e25c92 (patch) | |
tree | 679a88412e83b83aea6d174f0e25b500db111b7c /meta/conf | |
parent | b58192aba2d8f6b388a073629f8d3e765a074643 (diff) | |
download | poky-2d740a8c710a001d7de48881fb3ec227f4e25c92.tar.gz |
grub: Remove native version of grub-efi
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>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/include/security_flags.inc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc index a9e5b311af..4e64eb99f9 100644 --- a/meta/conf/distro/include/security_flags.inc +++ b/meta/conf/distro/include/security_flags.inc | |||
@@ -40,10 +40,6 @@ SECURITY_CFLAGS_pn-glibc-testsuite = "" | |||
40 | SECURITY_CFLAGS_pn-gcc-runtime = "" | 40 | SECURITY_CFLAGS_pn-gcc-runtime = "" |
41 | SECURITY_CFLAGS_pn-grub = "" | 41 | SECURITY_CFLAGS_pn-grub = "" |
42 | SECURITY_CFLAGS_pn-grub-efi = "" | 42 | SECURITY_CFLAGS_pn-grub-efi = "" |
43 | SECURITY_CFLAGS_pn-grub-efi-native = "" | ||
44 | SECURITY_CFLAGS_pn-grub-efi-x86-native = "" | ||
45 | SECURITY_CFLAGS_pn-grub-efi-i586-native = "" | ||
46 | SECURITY_CFLAGS_pn-grub-efi-x86-64-native = "" | ||
47 | SECURITY_CFLAGS_pn-mkelfimage_x86 = "" | 43 | SECURITY_CFLAGS_pn-mkelfimage_x86 = "" |
48 | 44 | ||
49 | SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NOPIE_CFLAGS}" | 45 | SECURITY_CFLAGS_pn-valgrind = "${SECURITY_NOPIE_CFLAGS}" |