From ccc85a859731b664685ffc8639c32cf586f5f3c6 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 21 Mar 2016 10:17:25 +0000 Subject: [PATCH] - updated for 2.02-beta3 --- add-vlan-tag-support.patch | 41 ++++---- blscfg.patch | 70 +++++--------- efi-net-fix.patch | 36 +------ grub-garbage.patch | 8 +- grub-lvmdevice.patch | 7 +- grub-mkconfig-diagnostics.patch | 160 ++++++++++++++++---------------- grub2-fonts_path.patch | 21 +++-- ignore-kernel-symlinks.patch | 7 +- initrd-search.patch | 16 ++-- just-say-linux.patch | 16 ++-- tld-mkconfigdir.patch | 20 ++-- tld-sysconfdir.patch | 36 +++---- 12 files changed, 196 insertions(+), 242 deletions(-) diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch index c45473e..543fc3d 100644 --- a/add-vlan-tag-support.patch +++ b/add-vlan-tag-support.patch @@ -1,7 +1,7 @@ -diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c grub-2.00.git20131218/grub-core/kern/ieee1275/init.c ---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c 2013-12-18 13:11:29.000000000 +0100 -+++ grub-2.00.git20131218/grub-core/kern/ieee1275/init.c 2013-12-18 14:39:17.000000000 +0100 -@@ -118,6 +118,7 @@ +diff -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/init.c grub-2.02-beta3/grub-core/kern/ieee1275/init.c +--- grub-2.02-beta3.orig/grub-core/kern/ieee1275/init.c 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/grub-core/kern/ieee1275/init.c 2016-03-21 07:51:44.364768000 +0000 +@@ -125,6 +125,7 @@ char *dev, *canon; char *ptr; dev = grub_ieee1275_get_aliasdevname (bootpath); @@ -9,10 +9,9 @@ diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/init.c grub-2.00.gi canon = grub_ieee1275_canonicalise_devname (dev); ptr = canon + grub_strlen (canon) - 1; while (ptr > canon && (*ptr == ',' || *ptr == ':')) -Only in grub-2.00.git20131218/grub-core/kern/ieee1275: init.c.orig -diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c ---- grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c 2013-12-18 13:11:29.000000000 +0100 -+++ grub-2.00.git20131218/grub-core/kern/ieee1275/openfw.c 2013-12-18 14:39:17.000000000 +0100 +diff -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-beta3/grub-core/kern/ieee1275/openfw.c +--- grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/grub-core/kern/ieee1275/openfw.c 2016-03-21 07:51:44.365768000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -57,10 +56,9 @@ diff -dur grub-2.00.git20131218.orig/grub-core/kern/ieee1275/openfw.c grub-2.00. char * grub_ieee1275_get_device_type (const char *path) { -Only in grub-2.00.git20131218/grub-core/kern/ieee1275: openfw.c.orig -diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131218/grub-core/net/ethernet.c ---- grub-2.00.git20131218.orig/grub-core/net/ethernet.c 2013-12-18 13:11:29.000000000 +0100 -+++ grub-2.00.git20131218/grub-core/net/ethernet.c 2013-12-18 14:39:17.000000000 +0100 +diff -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core/net/ethernet.c +--- grub-2.02-beta3.orig/grub-core/net/ethernet.c 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/grub-core/net/ethernet.c 2016-03-21 07:51:44.366768000 +0000 @@ -23,6 +23,7 @@ #include #include @@ -136,10 +134,10 @@ diff -dur grub-2.00.git20131218.orig/grub-core/net/ethernet.c grub-2.00.git20131 if (err) return err; -diff -dur grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h ---- grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h 2013-12-18 13:11:29.000000000 +0100 -+++ grub-2.00.git20131218/include/grub/ieee1275/ieee1275.h 2013-12-18 14:40:11.000000000 +0100 -@@ -226,6 +226,7 @@ +diff -ur grub-2.02-beta3.orig/include/grub/ieee1275/ieee1275.h grub-2.02-beta3/include/grub/ieee1275/ieee1275.h +--- grub-2.02-beta3.orig/include/grub/ieee1275/ieee1275.h 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/include/grub/ieee1275/ieee1275.h 2016-03-21 07:51:44.366768000 +0000 +@@ -227,6 +227,7 @@ char *EXPORT_FUNC(grub_ieee1275_canonicalise_devname) (const char *path); char *EXPORT_FUNC(grub_ieee1275_get_device_type) (const char *path); char *EXPORT_FUNC(grub_ieee1275_get_devname) (const char *path); @@ -147,14 +145,13 @@ diff -dur grub-2.00.git20131218.orig/include/grub/ieee1275/ieee1275.h grub-2.00. void EXPORT_FUNC(grub_ieee1275_devalias_init_iterator) (struct grub_ieee1275_devalias *alias); void EXPORT_FUNC(grub_ieee1275_devalias_free) (struct grub_ieee1275_devalias *alias); -diff -dur grub-2.00.git20131218.orig/include/grub/net.h grub-2.00.git20131218/include/grub/net.h ---- grub-2.00.git20131218.orig/include/grub/net.h 2013-12-18 13:11:29.000000000 +0100 -+++ grub-2.00.git20131218/include/grub/net.h 2013-12-18 14:39:18.000000000 +0100 -@@ -533,4 +533,6 @@ - #define GRUB_NET_TRIES 40 +diff -ur grub-2.02-beta3.orig/include/grub/net.h grub-2.02-beta3/include/grub/net.h +--- grub-2.02-beta3.orig/include/grub/net.h 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/include/grub/net.h 2016-03-21 07:51:44.367768000 +0000 +@@ -561,4 +561,6 @@ #define GRUB_NET_INTERVAL 400 + #define GRUB_NET_INTERVAL_ADDITION 20 +#define VLANTAG_IDENTIFIER 0x8100 + #endif /* ! GRUB_NET_HEADER */ -Only in grub-2.00.git20131218/include/grub: net.h.orig diff --git a/blscfg.patch b/blscfg.patch index 407e832..66a3058 100644 --- a/blscfg.patch +++ b/blscfg.patch @@ -1,49 +1,6 @@ -From ddfb160353df14e9f88affe7498512a553146872 Mon Sep 17 00:00:00 2001 -From: Fedora Ninjas -Date: Tue, 22 Jan 2013 06:31:38 +0100 -Subject: [PATCH 101/152] blscfg: add blscfg module to parse Boot Loader - Specification snippets - -http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec - -Works like this: - - insmod blscfg - bls_import - -Done! You should now have menu items for your snippets in place. - -Signed-off-by: Peter Jones ---- - grub-core/Makefile.core.def | 8 ++ - grub-core/commands/blscfg.c | 201 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 209 insertions(+) - create mode 100644 grub-core/commands/blscfg.c - -diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def -index ec46506..7bf1c8a 100644 ---- a/grub-core/Makefile.core.def -+++ b/grub-core/Makefile.core.def -@@ -747,6 +747,14 @@ module = { - }; - - module = { -+ name = blscfg; -+ common = commands/blscfg.c; -+ enable = i386_efi; -+ enable = x86_64_efi; -+ enable = i386_pc; -+}; -+ -+module = { - name = boot; - common = commands/boot.c; - i386_pc = lib/i386/pc/biosnum.c; -diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c -new file mode 100644 -index 0000000..4274aca ---- /dev/null -+++ b/grub-core/commands/blscfg.c +diff -urN grub-2.02-beta3.orig/grub-core/commands/blscfg.c grub-2.02-beta3/grub-core/commands/blscfg.c +--- grub-2.02-beta3.orig/grub-core/commands/blscfg.c 1970-01-01 00:00:00.000000000 +0000 ++++ grub-2.02-beta3/grub-core/commands/blscfg.c 2016-03-21 08:22:41.774768000 +0000 @@ -0,0 +1,201 @@ +/*-*- Mode: C; c-basic-offset: 2; indent-tabs-mode: t -*-*/ + @@ -246,6 +203,21 @@ index 0000000..4274aca +{ + grub_unregister_extcmd (cmd); +} --- -1.9.3 - +diff -urN grub-2.02-beta3.orig/grub-core/Makefile.core.def grub-2.02-beta3/grub-core/Makefile.core.def +--- grub-2.02-beta3.orig/grub-core/Makefile.core.def 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/grub-core/Makefile.core.def 2016-03-21 08:22:41.774768000 +0000 +@@ -740,6 +740,14 @@ + }; + + module = { ++ name = blscfg; ++ common = commands/blscfg.c; ++ enable = i386_efi; ++ enable = x86_64_efi; ++ enable = i386_pc; ++}; ++ ++module = { + name = boot; + common = commands/boot.c; + i386_pc = lib/i386/pc/biosnum.c; diff --git a/efi-net-fix.patch b/efi-net-fix.patch index 41872c0..b366404 100644 --- a/efi-net-fix.patch +++ b/efi-net-fix.patch @@ -1,30 +1,7 @@ -From 886d93184b894a29b0bef1f2467230a20c7a33ce Mon Sep 17 00:00:00 2001 -From: Mark Salter -Date: Tue, 8 Apr 2014 10:58:11 -0400 -Subject: [PATCH] reopen SNP protocol for exclusive use by grub - -While working with pxeboot of grub on an ARM platform, I noticed -very poor network performance while grub was loading a kernel -and initramfs. The performance during the loading of grub itself -seemed reasonable. Digging into the issue, I found that the UEFI -firmware was periodically polling for network packets while grub -was downloading files. This was causing timeouts and retries in -the grub network stack. - -The solution I found was to reopen the SNP protocol for exclusive -use. This forces UEFI to shutdown its use of SNP so that grub is -not competing for incoming packets. - -Signed-off-by: Mark Salter ---- - grub-core/net/drivers/efi/efinet.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c -index 2b344d6..a6e4c79 100644 ---- a/grub-core/net/drivers/efi/efinet.c -+++ b/grub-core/net/drivers/efi/efinet.c -@@ -223,6 +223,7 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, +diff -ur grub-2.02-beta3.orig/grub-core/net/drivers/efi/efinet.c grub-2.02-beta3/grub-core/net/drivers/efi/efinet.c +--- grub-2.02-beta3.orig/grub-core/net/drivers/efi/efinet.c 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/grub-core/net/drivers/efi/efinet.c 2016-03-21 07:56:01.589768000 +0000 +@@ -330,6 +330,7 @@ { struct grub_net_card *card; grub_efi_device_path_t *dp; @@ -32,7 +9,7 @@ index 2b344d6..a6e4c79 100644 dp = grub_efi_get_device_path (hnd); if (! dp) -@@ -250,6 +251,21 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device, +@@ -383,6 +384,21 @@ &pxe_mode->dhcp_ack, sizeof (pxe_mode->dhcp_ack), 1, device, path); @@ -54,6 +31,3 @@ index 2b344d6..a6e4c79 100644 return; } } --- -1.8.5.3 - diff --git a/grub-garbage.patch b/grub-garbage.patch index 2b6636f..0697a94 100644 --- a/grub-garbage.patch +++ b/grub-garbage.patch @@ -1,7 +1,7 @@ -diff -dur grub-2.00.orig/util/grub-mkconfig_lib.in grub-2.00/util/grub-mkconfig_lib.in ---- grub-2.00.orig/util/grub-mkconfig_lib.in 2012-06-27 17:27:53.000000000 +0200 -+++ grub-2.00/util/grub-mkconfig_lib.in 2012-10-27 14:55:58.226216374 +0200 -@@ -178,6 +178,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig_lib.in grub-2.02-beta3/util/grub-mkconfig_lib.in +--- grub-2.02-beta3.orig/util/grub-mkconfig_lib.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig_lib.in 2016-03-21 07:43:35.226768000 +0000 +@@ -187,6 +187,7 @@ case "$1" in *.dpkg-*) return 1 ;; # debian dpkg *.rpmsave|*.rpmnew) return 1 ;; diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch index 0f9d87f..0a15cdc 100644 --- a/grub-lvmdevice.patch +++ b/grub-lvmdevice.patch @@ -1,6 +1,7 @@ ---- grub-2.02~beta2/util/grub-mkconfig.in~ 2014-01-13 16:12:41.020705075 +0200 -+++ grub-2.02~beta2/util/grub-mkconfig.in 2014-01-13 16:10:42.000000000 +0200 -@@ -131,6 +131,21 @@ +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in +--- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-03-21 07:42:22.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig.in 2016-03-21 07:44:37.320768000 +0000 +@@ -133,6 +133,21 @@ # Device containing our userland. Typically used for root= parameter. GRUB_DEVICE="`${grub_probe} --target=device /`" diff --git a/grub-mkconfig-diagnostics.patch b/grub-mkconfig-diagnostics.patch index 94a716f..7766a14 100644 --- a/grub-mkconfig-diagnostics.patch +++ b/grub-mkconfig-diagnostics.patch @@ -1,49 +1,6 @@ -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub-mkconfig.in grub-2.02~beta2/util/grub-mkconfig.in ---- grub-2.02~beta2.orig/util/grub-mkconfig.in 2014-01-04 11:34:32.715240491 +0100 -+++ grub-2.02~beta2/util/grub-mkconfig.in 2014-01-04 11:34:50.135240649 +0100 -@@ -250,11 +250,16 @@ - if test "x${grub_cfg}" != "x"; then - rm -f "${grub_cfg}.new" - oldumask=$(umask); umask 077 -+ # open fd &3 for diagnostic messages -+ exec 3>&1 - exec > "${grub_cfg}.new" - umask $oldumask -+else -+ # open fd &3 for diagnostic messages -+ exec 3>&2 - fi --gettext "Generating grub configuration file ..." >&2 --echo >&2 -+gettext "Generating grub configuration file ..." >&3 -+echo >&3 - - cat << EOF - # -@@ -289,13 +294,16 @@ - gettext_printf "Syntax errors are detected in generated GRUB config file. - Ensure that there are no errors in /etc/sysconfig/grub - and /etc/grub.d/* files or please file a bug report with --%s file attached." "${grub_cfg}.new" >&2 -- echo >&2 -+%s file attached." "${grub_cfg}.new" >&3 -+ echo >&3 - else - # none of the children aborted with error, install the new grub.cfg - mv -f ${grub_cfg}.new ${grub_cfg} - fi - fi - --gettext "done" >&2 --echo >&2 -+gettext "done" >&3 -+echo >&3 -+ -+# close diagnostic stream -+exec 3>&- -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub-2.02~beta2/util/grub.d/00_header.in ---- grub-2.02~beta2.orig/util/grub.d/00_header.in 2014-01-04 10:50:51.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/00_header.in 2014-01-04 11:34:50.135240649 +0100 +diff -ur grub-2.02-beta3.orig/util/grub.d/00_header.in grub-2.02-beta3/util/grub.d/00_header.in +--- grub-2.02-beta3.orig/util/grub.d/00_header.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/00_header.in 2016-03-21 07:46:19.222768000 +0000 @@ -229,7 +229,7 @@ if [ "x$gfxterm" = x1 ]; then if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \ @@ -68,9 +25,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/00_header.in grub esac prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` cat << EOF -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2.02~beta2/util/grub.d/10_hurd.in ---- grub-2.02~beta2.orig/util/grub.d/10_hurd.in 2013-12-17 18:25:57.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/10_hurd.in 2014-01-04 11:35:59.171907965 +0100 +diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d/10_hurd.in +--- grub-2.02-beta3.orig/util/grub.d/10_hurd.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_hurd.in 2016-03-21 07:46:19.223768000 +0000 @@ -45,8 +45,8 @@ basename=`basename $i` dirname=`dirname $i` @@ -104,10 +61,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_hurd.in grub-2 exit 1 fi -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in grub-2.02~beta2/util/grub.d/10_kfreebsd.in ---- grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in 2013-12-17 18:25:57.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/10_kfreebsd.in 2014-01-04 11:34:50.135240649 +0100 -@@ -158,7 +158,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in grub-2.02-beta3/util/grub.d/10_kfreebsd.in +--- grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_kfreebsd.in 2016-03-21 07:46:19.223768000 +0000 +@@ -161,7 +161,7 @@ while [ "x$list" != "x" ] ; do kfreebsd=`version_find_latest $list` @@ -116,7 +73,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr basename=`basename $kfreebsd` dirname=`dirname $kfreebsd` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -207,7 +207,7 @@ +@@ -210,7 +210,7 @@ fi done if test -n "${module_dir}" ; then @@ -125,10 +82,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_kfreebsd.in gr module_dir_rel=$(make_system_path_relative_to_its_root $module_dir) fi -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub-2.02~beta2/util/grub.d/10_linux.in ---- grub-2.02~beta2.orig/util/grub.d/10_linux.in 2014-01-04 10:50:51.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/10_linux.in 2014-01-04 11:34:50.135240649 +0100 -@@ -176,7 +176,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.d/10_linux.in +--- grub-2.02-beta3.orig/util/grub.d/10_linux.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_linux.in 2016-03-21 07:46:19.224768000 +0000 +@@ -180,7 +180,7 @@ is_top_level=true while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` @@ -137,7 +94,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub- basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -213,7 +213,7 @@ +@@ -217,7 +217,7 @@ fi if test -n "${initrd}" ; then @@ -146,9 +103,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_linux.in grub- elif test -z "${initramfs}" ; then # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs. Since there's # no initrd or builtin initramfs, it can't work here. -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub-2.02~beta2/util/grub.d/10_netbsd.in ---- grub-2.02~beta2.orig/util/grub.d/10_netbsd.in 2013-12-17 18:25:57.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/10_netbsd.in 2014-01-04 11:34:50.135240649 +0100 +diff -ur grub-2.02-beta3.orig/util/grub.d/10_netbsd.in grub-2.02-beta3/util/grub.d/10_netbsd.in +--- grub-2.02-beta3.orig/util/grub.d/10_netbsd.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_netbsd.in 2016-03-21 07:46:19.224768000 +0000 @@ -155,7 +155,7 @@ continue fi @@ -158,9 +115,9 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_netbsd.in grub if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}" -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in grub-2.02~beta2/util/grub.d/10_windows.in ---- grub-2.02~beta2.orig/util/grub.d/10_windows.in 2013-12-17 18:25:57.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/10_windows.in 2014-01-04 11:34:50.135240649 +0100 +diff -ur grub-2.02-beta3.orig/util/grub.d/10_windows.in grub-2.02-beta3/util/grub.d/10_windows.in +--- grub-2.02-beta3.orig/util/grub.d/10_windows.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_windows.in 2016-03-21 07:46:19.224768000 +0000 @@ -82,7 +82,7 @@ # Get boot device. dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue @@ -170,10 +127,10 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/10_windows.in gru cat << EOF menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' { EOF -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in grub-2.02~beta2/util/grub.d/20_linux_xen.in ---- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in 2014-01-04 10:50:51.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in 2014-01-04 11:34:50.135240649 +0100 -@@ -204,7 +204,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/grub.d/20_linux_xen.in +--- grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/20_linux_xen.in 2016-03-21 07:46:19.225768000 +0000 +@@ -208,7 +208,7 @@ fi while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` @@ -182,7 +139,7 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in g basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -227,7 +227,7 @@ +@@ -231,7 +231,7 @@ fi done if test -n "${initrd}" ; then @@ -191,24 +148,67 @@ diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in g else # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. linux_root_device_thisversion=${GRUB_DEVICE} -diff -dur -x '*~' -x '*.orig' grub-2.02~beta2.orig/util/grub.d/30_os-prober.in grub-2.02~beta2/util/grub.d/30_os-prober.in ---- grub-2.02~beta2.orig/util/grub.d/30_os-prober.in 2014-01-04 10:50:51.000000000 +0100 -+++ grub-2.02~beta2/util/grub.d/30_os-prober.in 2014-01-04 11:34:50.135240649 +0100 -@@ -134,7 +134,7 @@ - LONGNAME="${LABEL}" - fi +diff -ur grub-2.02-beta3.orig/util/grub.d/30_os-prober.in grub-2.02-beta3/util/grub.d/30_os-prober.in +--- grub-2.02-beta3.orig/util/grub.d/30_os-prober.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/30_os-prober.in 2016-03-21 07:46:56.468768000 +0000 +@@ -141,7 +141,7 @@ + # os-prober returns text string followed by optional counter + CLASS="--class $(echo "${LABEL}" | LC_ALL=C sed 's,[[:digit:]]*$,,' | cut -d' ' -f1 | tr 'A-Z' 'a-z' | LC_ALL=C sed 's,[^[:alnum:]_],_,g')" - gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&2 + gettext_printf "Found %s on %s\n" "${LONGNAME}" "${DEVICE}" >&3 case ${BOOT} in chain) -@@ -321,7 +321,7 @@ +@@ -329,7 +329,7 @@ + ;; *) - echo -n " " # TRANSLATORS: %s is replaced by OS name. -- gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&2 -+ gettext_printf "%s is not yet supported by grub-mkconfig.\n" "${LONGNAME}" >&3 +- gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&2 ++ gettext_printf "%s is not yet supported by grub-mkconfig.\n" " ${LONGNAME}" >&3 ;; esac done +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in +--- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-03-21 07:45:29.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig.in 2016-03-21 07:46:19.222768000 +0000 +@@ -247,11 +247,16 @@ + if test "x${grub_cfg}" != "x"; then + rm -f "${grub_cfg}.new" + oldumask=$(umask); umask 077 ++ # open fd &3 for diagnostic messages ++ exec 3>&1 + exec > "${grub_cfg}.new" + umask $oldumask ++else ++ # open fd &3 for diagnostic messages ++ exec 3>&2 + fi +-gettext "Generating grub configuration file ..." >&2 +-echo >&2 ++gettext "Generating grub configuration file ..." >&3 ++echo >&3 + + cat << EOF + # +@@ -286,13 +291,16 @@ + gettext_printf "Syntax errors are detected in generated GRUB config file. + Ensure that there are no errors in /etc/sysconfig/grub + and /etc/grub.d/* files or please file a bug report with +-%s file attached." "${grub_cfg}.new" >&2 +- echo >&2 ++%s file attached." "${grub_cfg}.new" >&3 ++ echo >&3 + else + # none of the children aborted with error, install the new grub.cfg + mv -f ${grub_cfg}.new ${grub_cfg} + fi + fi + +-gettext "done" >&2 +-echo >&2 ++gettext "done" >&3 ++echo >&3 ++ ++# close diagnostic stream ++exec 3>&- diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch index bb91b08..7690d81 100644 --- a/grub2-fonts_path.patch +++ b/grub2-fonts_path.patch @@ -1,12 +1,21 @@ -diff -dur -x '*~' grub-2.00.orig/configure.ac grub-2.00/configure.ac ---- grub-2.00.orig/configure.ac 2012-10-28 09:47:24.000000000 +0100 -+++ grub-2.00/configure.ac 2012-10-28 09:48:06.438240771 +0100 -@@ -940,7 +940,7 @@ +diff -ur grub-2.02-beta3.orig/configure.ac grub-2.02-beta3/configure.ac +--- grub-2.02-beta3.orig/configure.ac 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/configure.ac 2016-03-21 07:50:50.796768000 +0000 +@@ -1589,7 +1589,7 @@ if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do -- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do -+ for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu; do +- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do ++ for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/truetype/ttf-dejavu /usr/share/fonts/dejavu /usr/share/fonts/truetype; do if test -f "$dir/DejaVuSans.$ext"; then DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" break 2 +@@ -1611,7 +1611,7 @@ + FONT_SOURCE= + + for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do +- for dir in . /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do ++ for dir in . /usr/share/fonts/TTF /usr/src /usr/share/fonts/X11/misc /usr/share/fonts/unifont /usr/share/fonts/uni /usr/share/fonts/truetype/unifont /usr/share/fonts/misc; do + if test -f "$dir/unifont.$ext"; then + md5="$(md5sum "$dir/unifont.$ext"|awk '{ print $1; }')" + # PCF and BDF from version 6.3 isn't hanled properly by libfreetype. diff --git a/ignore-kernel-symlinks.patch b/ignore-kernel-symlinks.patch index f854139..a9f58ee 100644 --- a/ignore-kernel-symlinks.patch +++ b/ignore-kernel-symlinks.patch @@ -1,6 +1,7 @@ ---- grub-2.00/util/grub-mkconfig_lib.in~ 2013-04-15 00:03:09.102253190 +0200 -+++ grub-2.00/util/grub-mkconfig_lib.in 2013-04-15 00:54:39.189605003 +0200 -@@ -174,6 +174,9 @@ +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig_lib.in grub-2.02-beta3/util/grub-mkconfig_lib.in +--- grub-2.02-beta3.orig/util/grub-mkconfig_lib.in 2016-03-21 07:43:35.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig_lib.in 2016-03-21 07:53:53.176768000 +0000 +@@ -183,6 +183,9 @@ grub_file_is_not_garbage () { diff --git a/initrd-search.patch b/initrd-search.patch index d9ec4c6..542f3f9 100644 --- a/initrd-search.patch +++ b/initrd-search.patch @@ -1,7 +1,7 @@ -diff -ur grub-2.02-beta2.orig/util/grub.d/10_linux.in grub-2.02-beta2/util/grub.d/10_linux.in ---- grub-2.02-beta2.orig/util/grub.d/10_linux.in 2013-12-24 20:53:23.000000000 +0000 -+++ grub-2.02-beta2/util/grub.d/10_linux.in 2015-08-04 11:09:27.932635208 +0000 -@@ -185,10 +185,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.d/10_linux.in +--- grub-2.02-beta3.orig/util/grub.d/10_linux.in 2016-03-21 07:53:03.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_linux.in 2016-03-21 07:54:33.648768000 +0000 +@@ -189,10 +189,7 @@ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" initrd= @@ -13,10 +13,10 @@ diff -ur grub-2.02-beta2.orig/util/grub.d/10_linux.in grub-2.02-beta2/util/grub. "initramfs-genkernel-${version}" \ "initramfs-genkernel-${alt_version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -diff -ur grub-2.02-beta2.orig/util/grub.d/20_linux_xen.in grub-2.02-beta2/util/grub.d/20_linux_xen.in ---- grub-2.02-beta2.orig/util/grub.d/20_linux_xen.in 2013-12-24 20:53:23.000000000 +0000 -+++ grub-2.02-beta2/util/grub.d/20_linux_xen.in 2015-08-04 11:10:18.928635208 +0000 -@@ -213,10 +213,7 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/grub.d/20_linux_xen.in +--- grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in 2016-03-21 07:53:03.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/20_linux_xen.in 2016-03-21 07:54:33.648768000 +0000 +@@ -217,10 +217,7 @@ linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" initrd= diff --git a/just-say-linux.patch b/just-say-linux.patch index 97cecbc..d9a6237 100644 --- a/just-say-linux.patch +++ b/just-say-linux.patch @@ -1,7 +1,7 @@ -diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2.00.git20131218/util/grub.d/10_linux.in ---- grub-2.00.git20131218.orig/util/grub.d/10_linux.in 2013-12-18 14:41:17.000000000 +0100 -+++ grub-2.00.git20131218/util/grub.d/10_linux.in 2013-12-18 14:42:46.000000000 +0100 -@@ -54,9 +54,9 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub.d/10_linux.in +--- grub-2.02-beta3.orig/util/grub.d/10_linux.in 2016-03-21 07:46:19.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/10_linux.in 2016-03-21 07:53:03.762768000 +0000 +@@ -29,9 +29,9 @@ CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then @@ -13,10 +13,10 @@ diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/10_linux.in grub-2. CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi -diff -dur -x '*.orig' grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in grub-2.00.git20131218/util/grub.d/20_linux_xen.in ---- grub-2.00.git20131218.orig/util/grub.d/20_linux_xen.in 2013-12-18 14:41:17.000000000 +0100 -+++ grub-2.00.git20131218/util/grub.d/20_linux_xen.in 2013-12-18 14:43:11.000000000 +0100 -@@ -33,9 +33,9 @@ +diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/grub.d/20_linux_xen.in +--- grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in 2016-03-21 07:46:19.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/20_linux_xen.in 2016-03-21 07:53:03.762768000 +0000 +@@ -29,9 +29,9 @@ CLASS="--class gnu-linux --class gnu --class os --class xen" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then diff --git a/tld-mkconfigdir.patch b/tld-mkconfigdir.patch index 5d6943e..f769b94 100644 --- a/tld-mkconfigdir.patch +++ b/tld-mkconfigdir.patch @@ -1,7 +1,7 @@ -diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common ---- grub-2.00.orig/conf/Makefile.common 2012-10-27 15:05:15.000000000 +0200 -+++ grub-2.00/conf/Makefile.common 2012-10-27 15:06:09.135719113 +0200 -@@ -98,7 +98,7 @@ +diff -ur grub-2.02-beta3.orig/conf/Makefile.common grub-2.02-beta3/conf/Makefile.common +--- grub-2.02-beta3.orig/conf/Makefile.common 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/conf/Makefile.common 2016-03-21 07:45:29.207768000 +0000 +@@ -61,7 +61,7 @@ # Other variables @@ -10,12 +10,12 @@ diff -dur grub-2.00.orig/conf/Makefile.common grub-2.00/conf/Makefile.common platformdir = $(pkglibdir)/$(target_cpu)-$(platform) starfielddir = $(pkgdatadir)/themes/starfield -diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in ---- grub-2.00.orig/util/grub-mkconfig.in 2012-10-27 15:05:15.000000000 +0200 -+++ grub-2.00/util/grub-mkconfig.in 2012-10-27 15:06:40.696227008 +0200 -@@ -35,7 +35,7 @@ - pkgdatadir="${datadir}/@PACKAGE@" - fi +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in +--- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-03-21 07:44:37.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig.in 2016-03-21 07:45:29.208768000 +0000 +@@ -37,7 +37,7 @@ + export pkgdatadir + grub_cfg="" -grub_mkconfig_dir="${sysconfdir}"/grub.d +grub_mkconfig_dir=/lib/grub.d diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch index f53f128..36a0855 100644 --- a/tld-sysconfdir.patch +++ b/tld-sysconfdir.patch @@ -1,9 +1,18 @@ -diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in ---- grub-2.00.orig/util/grub-mkconfig.in 2012-04-05 19:41:07.000000000 +0200 -+++ grub-2.00/util/grub-mkconfig.in 2012-10-27 14:53:33.483981202 +0200 -@@ -140,8 +140,8 @@ - # choosing Hurd filesystem module. - GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`" +diff -ur grub-2.02-beta3.orig/util/grub.d/README grub-2.02-beta3/util/grub.d/README +--- grub-2.02-beta3.orig/util/grub.d/README 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub.d/README 2016-03-21 07:42:22.370768000 +0000 +@@ -8,4 +8,4 @@ + The number namespace in-between is configurable by system installer and/or + administrator. For example, you can add an entry to boot another OS as + 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in +-the menu; and then adjust the default setting via /etc/default/grub. ++the menu; and then adjust the default setting via /etc/sysconfig/grub. +diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mkconfig.in +--- grub-2.02-beta3.orig/util/grub-mkconfig.in 2016-02-28 02:07:41.000000000 +0000 ++++ grub-2.02-beta3/util/grub-mkconfig.in 2016-03-21 07:42:22.369768000 +0000 +@@ -147,8 +147,8 @@ + GRUB_FS="$(stat -f --printf=%T / || echo unknown)" + fi -if test -f ${sysconfdir}/default/grub ; then - . ${sysconfdir}/default/grub @@ -12,7 +21,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in fi # XXX: should this be deprecated at some point? -@@ -232,7 +232,7 @@ +@@ -243,7 +243,7 @@ # DO NOT EDIT THIS FILE # # It is automatically generated by $self using templates @@ -21,7 +30,7 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in # EOF -@@ -257,7 +257,7 @@ +@@ -269,7 +269,7 @@ if ! ${grub_script_check} ${grub_cfg}.new; then # TRANSLATORS: %s is replaced by filename gettext_printf "Syntax errors are detected in generated GRUB config file. @@ -29,13 +38,4 @@ diff -dur grub-2.00.orig/util/grub-mkconfig.in grub-2.00/util/grub-mkconfig.in +Ensure that there are no errors in /etc/sysconfig/grub and /etc/grub.d/* files or please file a bug report with %s file attached." "${grub_cfg}.new" >&2 - else -diff -dur grub-2.00.orig/util/grub.d/README grub-2.00/util/grub.d/README ---- grub-2.00.orig/util/grub.d/README 2010-12-01 15:45:43.000000000 +0100 -+++ grub-2.00/util/grub.d/README 2012-10-27 14:52:54.046709588 +0200 -@@ -8,4 +8,4 @@ - The number namespace in-between is configurable by system installer and/or - administrator. For example, you can add an entry to boot another OS as - 01_otheros, 11_otheros, etc, depending on the position you want it to occupy in --the menu; and then adjust the default setting via /etc/default/grub. -+the menu; and then adjust the default setting via /etc/sysconfig/grub. + echo >&2 -- 2.44.0