From 9904b7cf2f29d452e4423d0224ee8a7a95f865c8 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 9 Feb 2017 07:09:12 +0000 Subject: [PATCH] - updated to 2.02-rc1 --- add-vlan-tag-support.patch | 44 ++++++++-------- blscfg.patch | 14 ++--- efi-net-fix.patch | 10 ++-- grub-garbage.patch | 8 +-- grub-lvmdevice.patch | 8 +-- grub-mkconfig-diagnostics.patch | 91 +++++++++++++++++---------------- grub2-cfg.patch | 7 +-- grub2-fonts_path.patch | 10 ++-- grub2.spec | 6 +-- ignore-kernel-symlinks.patch | 8 +-- initrd-search.patch | 16 +++--- just-say-linux.patch | 16 +++--- posix.patch | 5 +- tld-mkconfigdir.patch | 16 +++--- tld-sysconfdir.patch | 20 ++++---- 15 files changed, 141 insertions(+), 138 deletions(-) diff --git a/add-vlan-tag-support.patch b/add-vlan-tag-support.patch index 543fc3d..42fde72 100644 --- a/add-vlan-tag-support.patch +++ b/add-vlan-tag-support.patch @@ -1,7 +1,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 @@ +diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c grub-2.02-rc1/grub-core/kern/ieee1275/init.c +--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/init.c 2017-02-08 15:06:05.420317447 +0000 ++++ grub-2.02-rc1/grub-core/kern/ieee1275/init.c 2017-02-08 15:06:17.784317308 +0000 +@@ -125,6 +125,7 @@ grub_machine_get_bootlocation (char **de char *dev, *canon; char *ptr; dev = grub_ieee1275_get_aliasdevname (bootpath); @@ -9,9 +9,9 @@ diff -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/init.c grub-2.02-beta3/gru canon = grub_ieee1275_canonicalise_devname (dev); ptr = canon + grub_strlen (canon) - 1; while (ptr > canon && (*ptr == ',' || *ptr == ':')) -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 +diff -urNp grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c +--- grub-2.02-rc1.orig/grub-core/kern/ieee1275/openfw.c 2017-02-08 15:06:05.420317447 +0000 ++++ grub-2.02-rc1/grub-core/kern/ieee1275/openfw.c 2017-02-08 15:06:17.785317308 +0000 @@ -23,6 +23,7 @@ #include #include @@ -20,7 +20,7 @@ diff -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-beta3/g enum grub_ieee1275_parse_type { -@@ -451,6 +452,35 @@ +@@ -451,6 +452,35 @@ fail: return ret; } @@ -56,9 +56,9 @@ diff -ur grub-2.02-beta3.orig/grub-core/kern/ieee1275/openfw.c grub-2.02-beta3/g char * grub_ieee1275_get_device_type (const char *path) { -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 +diff -urNp grub-2.02-rc1.orig/grub-core/net/ethernet.c grub-2.02-rc1/grub-core/net/ethernet.c +--- grub-2.02-rc1.orig/grub-core/net/ethernet.c 2017-02-08 15:06:05.433317447 +0000 ++++ grub-2.02-rc1/grub-core/net/ethernet.c 2017-02-08 15:06:17.785317308 +0000 @@ -23,6 +23,7 @@ #include #include @@ -67,7 +67,7 @@ diff -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core #include #include -@@ -56,10 +57,19 @@ +@@ -56,10 +57,19 @@ send_ethernet_packet (struct grub_net_ne { struct etherhdr *eth; grub_err_t err; @@ -89,7 +89,7 @@ diff -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core if (err) return err; eth = (struct etherhdr *) nb->data; -@@ -76,6 +86,19 @@ +@@ -76,6 +86,19 @@ send_ethernet_packet (struct grub_net_ne return err; inf->card->opened = 1; } @@ -109,7 +109,7 @@ diff -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core return inf->card->driver->send (inf->card, nb); } -@@ -90,10 +113,23 @@ +@@ -90,10 +113,23 @@ grub_net_recv_ethernet_packet (struct gr grub_net_link_level_address_t hwaddress; grub_net_link_level_address_t src_hwaddress; grub_err_t err; @@ -134,10 +134,10 @@ diff -ur grub-2.02-beta3.orig/grub-core/net/ethernet.c grub-2.02-beta3/grub-core if (err) return err; -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 @@ +diff -urNp grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h grub-2.02-rc1/include/grub/ieee1275/ieee1275.h +--- grub-2.02-rc1.orig/include/grub/ieee1275/ieee1275.h 2017-02-08 15:06:05.445317447 +0000 ++++ grub-2.02-rc1/include/grub/ieee1275/ieee1275.h 2017-02-08 15:06:17.787317308 +0000 +@@ -227,6 +227,7 @@ char *EXPORT_FUNC(grub_ieee1275_get_alia 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); @@ -145,10 +145,10 @@ diff -ur grub-2.02-beta3.orig/include/grub/ieee1275/ieee1275.h grub-2.02-beta3/i 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 -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 @@ +diff -urNp grub-2.02-rc1.orig/include/grub/net.h grub-2.02-rc1/include/grub/net.h +--- grub-2.02-rc1.orig/include/grub/net.h 2017-02-08 15:06:05.446317447 +0000 ++++ grub-2.02-rc1/include/grub/net.h 2017-02-08 15:06:17.788317308 +0000 +@@ -561,4 +561,6 @@ extern char *grub_net_default_server; #define GRUB_NET_INTERVAL 400 #define GRUB_NET_INTERVAL_ADDITION 20 diff --git a/blscfg.patch b/blscfg.patch index 66a3058..356661a 100644 --- a/blscfg.patch +++ b/blscfg.patch @@ -1,6 +1,6 @@ -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 +diff -urNp grub-2.02-rc1.orig/grub-core/commands/blscfg.c grub-2.02-rc1/grub-core/commands/blscfg.c +--- grub-2.02-rc1.orig/grub-core/commands/blscfg.c 1970-01-01 00:00:00.000000000 +0000 ++++ grub-2.02-rc1/grub-core/commands/blscfg.c 2017-02-08 15:09:21.548315239 +0000 @@ -0,0 +1,201 @@ +/*-*- Mode: C; c-basic-offset: 2; indent-tabs-mode: t -*-*/ + @@ -203,10 +203,10 @@ diff -urN grub-2.02-beta3.orig/grub-core/commands/blscfg.c grub-2.02-beta3/grub- +{ + grub_unregister_extcmd (cmd); +} -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 @@ +diff -urNp grub-2.02-rc1.orig/grub-core/Makefile.core.def grub-2.02-rc1/grub-core/Makefile.core.def +--- grub-2.02-rc1.orig/grub-core/Makefile.core.def 2017-02-08 15:09:05.594315418 +0000 ++++ grub-2.02-rc1/grub-core/Makefile.core.def 2017-02-08 15:09:21.549315239 +0000 +@@ -742,6 +742,14 @@ module = { }; module = { diff --git a/efi-net-fix.patch b/efi-net-fix.patch index b366404..4cc5e13 100644 --- a/efi-net-fix.patch +++ b/efi-net-fix.patch @@ -1,7 +1,7 @@ -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 @@ +diff -urNp grub-2.02-rc1.orig/grub-core/net/drivers/efi/efinet.c grub-2.02-rc1/grub-core/net/drivers/efi/efinet.c +--- grub-2.02-rc1.orig/grub-core/net/drivers/efi/efinet.c 2017-02-08 15:08:35.748315754 +0000 ++++ grub-2.02-rc1/grub-core/net/drivers/efi/efinet.c 2017-02-08 15:08:53.837315551 +0000 +@@ -330,6 +330,7 @@ grub_efi_net_config_real (grub_efi_handl { struct grub_net_card *card; grub_efi_device_path_t *dp; @@ -9,7 +9,7 @@ diff -ur grub-2.02-beta3.orig/grub-core/net/drivers/efi/efinet.c grub-2.02-beta3 dp = grub_efi_get_device_path (hnd); if (! dp) -@@ -383,6 +384,21 @@ +@@ -383,6 +384,21 @@ grub_efi_net_config_real (grub_efi_handl &pxe_mode->dhcp_ack, sizeof (pxe_mode->dhcp_ack), 1, device, path); diff --git a/grub-garbage.patch b/grub-garbage.patch index 0697a94..57eb6d4 100644 --- a/grub-garbage.patch +++ b/grub-garbage.patch @@ -1,7 +1,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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig_lib.in grub-2.02-rc1/util/grub-mkconfig_lib.in +--- grub-2.02-rc1.orig/util/grub-mkconfig_lib.in 2017-02-08 15:01:40.196320433 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig_lib.in 2017-02-08 15:01:59.899320211 +0000 +@@ -187,6 +187,7 @@ grub_file_is_not_garbage () case "$1" in *.dpkg-*) return 1 ;; # debian dpkg *.rpmsave|*.rpmnew) return 1 ;; diff --git a/grub-lvmdevice.patch b/grub-lvmdevice.patch index 0a15cdc..e28add5 100644 --- a/grub-lvmdevice.patch +++ b/grub-lvmdevice.patch @@ -1,7 +1,7 @@ -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in +--- grub-2.02-rc1.orig/util/grub-mkconfig.in 2017-02-08 15:00:50.000000000 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig.in 2017-02-08 15:02:35.564319810 +0000 +@@ -133,6 +133,21 @@ fi # 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 7766a14..58c3cad 100644 --- a/grub-mkconfig-diagnostics.patch +++ b/grub-mkconfig-diagnostics.patch @@ -1,7 +1,7 @@ -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/00_header.in grub-2.02-rc1/util/grub.d/00_header.in +--- grub-2.02-rc1.orig/util/grub.d/00_header.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/00_header.in 2017-02-08 15:03:25.069319252 +0000 +@@ -229,7 +229,7 @@ esac if [ "x$gfxterm" = x1 ]; then if [ "x$GRUB_THEME" != x ] && [ -f "$GRUB_THEME" ] \ && is_path_readable_by_grub "$GRUB_THEME"; then @@ -10,7 +10,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/00_header.in grub-2.02-beta3/util/grub prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"` cat << EOF -@@ -265,12 +265,12 @@ +@@ -265,12 +265,12 @@ export theme EOF elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \ && is_path_readable_by_grub "$GRUB_BACKGROUND"; then @@ -25,10 +25,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/00_header.in grub-2.02-beta3/util/grub esac prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"` cat << EOF -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_hurd.in grub-2.02-rc1/util/grub.d/10_hurd.in +--- grub-2.02-rc1.orig/util/grub.d/10_hurd.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/10_hurd.in 2017-02-08 15:03:25.069319252 +0000 +@@ -45,8 +45,8 @@ for i in /boot/gnumach* ; do basename=`basename $i` dirname=`dirname $i` rel_dirname=`make_system_path_relative_to_its_root $dirname` @@ -39,7 +39,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d kernels="${kernels} ${rel_dirname}/${basename}" at_least_one=true fi -@@ -60,8 +60,8 @@ +@@ -60,8 +60,8 @@ esac for i in /hurd/${hurd_fs}.static /hurd/exec ; do if test -e "$i" ; then @@ -50,7 +50,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d at_least_one=true else all_of_them=false -@@ -74,8 +74,8 @@ +@@ -74,8 +74,8 @@ if ${at_least_one} ; then : ; else fi if ${all_of_them} && test -e /lib/ld.so.1 ; then : ; else @@ -61,10 +61,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_hurd.in grub-2.02-beta3/util/grub.d exit 1 fi -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_kfreebsd.in grub-2.02-rc1/util/grub.d/10_kfreebsd.in +--- grub-2.02-rc1.orig/util/grub.d/10_kfreebsd.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/10_kfreebsd.in 2017-02-08 15:03:25.069319252 +0000 +@@ -161,7 +161,7 @@ is_top_level=true while [ "x$list" != "x" ] ; do kfreebsd=`version_find_latest $list` @@ -73,7 +73,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in grub-2.02-beta3/util/gr basename=`basename $kfreebsd` dirname=`dirname $kfreebsd` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -210,7 +210,7 @@ +@@ -210,7 +210,7 @@ while [ "x$list" != "x" ] ; do fi done if test -n "${module_dir}" ; then @@ -82,10 +82,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_kfreebsd.in grub-2.02-beta3/util/gr module_dir_rel=$(make_system_path_relative_to_its_root $module_dir) fi -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_linux.in grub-2.02-rc1/util/grub.d/10_linux.in +--- grub-2.02-rc1.orig/util/grub.d/10_linux.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/10_linux.in 2017-02-08 15:03:25.070319252 +0000 +@@ -180,7 +180,7 @@ submenu_indentation="" is_top_level=true while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` @@ -94,7 +94,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub. basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -217,7 +217,7 @@ +@@ -217,7 +217,7 @@ while [ "x$list" != "x" ] ; do fi if test -n "${initrd}" ; then @@ -103,10 +103,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/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 -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_netbsd.in grub-2.02-rc1/util/grub.d/10_netbsd.in +--- grub-2.02-rc1.orig/util/grub.d/10_netbsd.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/10_netbsd.in 2017-02-08 15:03:25.070319252 +0000 +@@ -155,7 +155,7 @@ for k in /netbsd $(ls -t /netbsd?* 2>/de continue fi @@ -115,10 +115,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_netbsd.in grub-2.02-beta3/util/grub if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then netbsd_entry "knetbsd" "$k" simple "${GRUB_CMDLINE_NETBSD_DEFAULT}" -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_windows.in grub-2.02-rc1/util/grub.d/10_windows.in +--- grub-2.02-rc1.orig/util/grub.d/10_windows.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/10_windows.in 2017-02-08 15:03:25.070319252 +0000 +@@ -82,7 +82,7 @@ for drv in $drives ; do # Get boot device. dev=`${grub_probe} -t device "$dir" 2>/dev/null` || continue @@ -127,10 +127,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_windows.in grub-2.02-beta3/util/gru cat << EOF menuentry '$(echo "$OS" | grub_quote)' \$menuentry_id_option '$osid-$(grub_get_device_id "${dev}")' { EOF -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in grub-2.02-rc1/util/grub.d/20_linux_xen.in +--- grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/20_linux_xen.in 2017-02-08 15:03:25.070319252 +0000 +@@ -208,7 +208,7 @@ while [ "x${xen_list}" != "x" ] ; do fi while [ "x$list" != "x" ] ; do linux=`version_find_latest $list` @@ -139,7 +139,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/g basename=`basename $linux` dirname=`dirname $linux` rel_dirname=`make_system_path_relative_to_its_root $dirname` -@@ -231,7 +231,7 @@ +@@ -231,7 +231,7 @@ while [ "x${xen_list}" != "x" ] ; do fi done if test -n "${initrd}" ; then @@ -148,10 +148,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/20_linux_xen.in grub-2.02-beta3/util/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 -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/30_os-prober.in grub-2.02-rc1/util/grub.d/30_os-prober.in +--- grub-2.02-rc1.orig/util/grub.d/30_os-prober.in 2017-02-08 15:03:12.814319390 +0000 ++++ grub-2.02-rc1/util/grub.d/30_os-prober.in 2017-02-08 15:03:25.070319252 +0000 +@@ -141,7 +141,7 @@ for OS in ${OSPROBED} ; do # 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')" @@ -160,7 +160,7 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/30_os-prober.in grub-2.02-beta3/util/g case ${BOOT} in chain) -@@ -329,7 +329,7 @@ +@@ -329,7 +329,7 @@ EOF ;; *) # TRANSLATORS: %s is replaced by OS name. @@ -169,10 +169,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/30_os-prober.in grub-2.02-beta3/util/g ;; 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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in +--- grub-2.02-rc1.orig/util/grub-mkconfig.in 2017-02-08 15:03:12.813319390 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig.in 2017-02-08 15:04:41.230318395 +0000 +@@ -247,11 +247,16 @@ export GRUB_DEFAULT \ if test "x${grub_cfg}" != "x"; then rm -f "${grub_cfg}.new" oldumask=$(umask); umask 077 @@ -191,7 +191,7 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk cat << EOF # -@@ -286,13 +291,16 @@ +@@ -286,8 +291,8 @@ if test "x${grub_cfg}" != "x" ; then 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 @@ -199,9 +199,10 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk - echo >&2 +%s file attached." "${grub_cfg}.new" >&3 + echo >&3 + exit 1 else # none of the children aborted with error, install the new grub.cfg - mv -f ${grub_cfg}.new ${grub_cfg} +@@ -295,5 +300,8 @@ and /etc/grub.d/* files or please file a fi fi diff --git a/grub2-cfg.patch b/grub2-cfg.patch index 23ce97b..4547116 100644 --- a/grub2-cfg.patch +++ b/grub2-cfg.patch @@ -1,6 +1,7 @@ ---- docs/grub.cfg.orig 2013-11-10 19:25:04.959888566 +0000 -+++ docs/grub.cfg 2013-11-10 19:25:10.260104712 +0000 -@@ -14,8 +14,8 @@ +diff -urNp grub-2.02-rc1.orig/docs/grub.cfg grub-2.02-rc1/docs/grub.cfg +--- grub-2.02-rc1.orig/docs/grub.cfg 2017-02-08 15:07:55.114316212 +0000 ++++ grub-2.02-rc1/docs/grub.cfg 2017-02-08 15:08:12.255316019 +0000 +@@ -14,8 +14,8 @@ set fallback=gnuhurd # For booting GNU/Linux menuentry "GNU/Linux" --id gnulinux { set root=(hd0,msdos1) diff --git a/grub2-fonts_path.patch b/grub2-fonts_path.patch index 7690d81..0acce4f 100644 --- a/grub2-fonts_path.patch +++ b/grub2-fonts_path.patch @@ -1,7 +1,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 @@ +diff -urNp grub-2.02-rc1.orig/configure.ac grub-2.02-rc1/configure.ac +--- grub-2.02-rc1.orig/configure.ac 2017-02-08 15:05:29.599317850 +0000 ++++ grub-2.02-rc1/configure.ac 2017-02-08 15:05:43.268317696 +0000 +@@ -1622,7 +1622,7 @@ fi if test x"$starfield_excuse" = x; then for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do @@ -10,7 +10,7 @@ diff -ur grub-2.02-beta3.orig/configure.ac grub-2.02-beta3/configure.ac if test -f "$dir/DejaVuSans.$ext"; then DJVU_FONT_SOURCE="$dir/DejaVuSans.$ext" break 2 -@@ -1611,7 +1611,7 @@ +@@ -1644,7 +1644,7 @@ AC_SUBST([DJVU_FONT_SOURCE]) FONT_SOURCE= for ext in pcf pcf.gz bdf bdf.gz ttf ttf.gz; do diff --git a/grub2.spec b/grub2.spec index 56ab6f1..e51136d 100644 --- a/grub2.spec +++ b/grub2.spec @@ -36,7 +36,7 @@ Summary(de.UTF-8): GRUB2 - ein Bootloader für x86 Summary(hu.UTF-8): GRUB2 - rendszerbetöltő x86 gépekhez Summary(pl.UTF-8): GRUB2 - bootloader dla x86 Summary(pt_BR.UTF-8): Gerenciador de inicialização GRUB2 -%define beta beta3 +%define beta rc1 Name: grub2 Version: 2.02 Release: 0.%{beta}.%{rel} @@ -46,7 +46,7 @@ Group: Base # 2. Run ./autogen.sh and ./linguas.sh # 3. Recompress and upload to DF Source0: grub-%{version}-%{beta}.tar.xz -# Source0-md5: 56012eda1ee234dbd0f14be9f7acb089 +# Source0-md5: 32d45aa5ea17b7fc895d2b493f7dc0ee Source1: update-grub Source2: update-grub.8 Source3: grub.sysconfig @@ -283,7 +283,7 @@ Motyw starfield dla GRUB-a. %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p0 +%patch12 -p1 %patch13 -p1 %patch14 -p1 diff --git a/ignore-kernel-symlinks.patch b/ignore-kernel-symlinks.patch index a9f58ee..2c3776d 100644 --- a/ignore-kernel-symlinks.patch +++ b/ignore-kernel-symlinks.patch @@ -1,7 +1,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-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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig_lib.in grub-2.02-rc1/util/grub-mkconfig_lib.in +--- grub-2.02-rc1.orig/util/grub-mkconfig_lib.in 2017-02-08 15:06:56.145316876 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig_lib.in 2017-02-08 15:07:12.391316693 +0000 +@@ -183,6 +183,9 @@ grub_get_device_id () grub_file_is_not_garbage () { diff --git a/initrd-search.patch b/initrd-search.patch index 542f3f9..2f56cbf 100644 --- a/initrd-search.patch +++ b/initrd-search.patch @@ -1,7 +1,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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_linux.in grub-2.02-rc1/util/grub.d/10_linux.in +--- grub-2.02-rc1.orig/util/grub.d/10_linux.in 2017-02-08 15:07:23.361316569 +0000 ++++ grub-2.02-rc1/util/grub.d/10_linux.in 2017-02-08 15:07:45.006316326 +0000 +@@ -189,10 +189,7 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" initrd= @@ -13,10 +13,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub. "initramfs-genkernel-${version}" \ "initramfs-genkernel-${alt_version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in grub-2.02-rc1/util/grub.d/20_linux_xen.in +--- grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in 2017-02-08 15:07:23.361316569 +0000 ++++ grub-2.02-rc1/util/grub.d/20_linux_xen.in 2017-02-08 15:07:45.007316326 +0000 +@@ -217,10 +217,7 @@ while [ "x${xen_list}" != "x" ] ; do linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" initrd= diff --git a/just-say-linux.patch b/just-say-linux.patch index d9a6237..15321c8 100644 --- a/just-say-linux.patch +++ b/just-say-linux.patch @@ -1,7 +1,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: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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/10_linux.in grub-2.02-rc1/util/grub.d/10_linux.in +--- grub-2.02-rc1.orig/util/grub.d/10_linux.in 2017-02-08 15:06:29.571317175 +0000 ++++ grub-2.02-rc1/util/grub.d/10_linux.in 2017-02-08 15:06:42.287317032 +0000 +@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then @@ -13,10 +13,10 @@ diff -ur grub-2.02-beta3.orig/util/grub.d/10_linux.in grub-2.02-beta3/util/grub. CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in grub-2.02-rc1/util/grub.d/20_linux_xen.in +--- grub-2.02-rc1.orig/util/grub.d/20_linux_xen.in 2017-02-08 15:06:29.571317175 +0000 ++++ grub-2.02-rc1/util/grub.d/20_linux_xen.in 2017-02-08 15:06:42.288317032 +0000 +@@ -29,9 +29,9 @@ export TEXTDOMAINDIR="@localedir@" CLASS="--class gnu-linux --class gnu --class os --class xen" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then diff --git a/posix.patch b/posix.patch index 18ab55a..4ef9c50 100644 --- a/posix.patch +++ b/posix.patch @@ -1,5 +1,6 @@ ---- grub-1.99/util/grub-mkconfig.in.wiget 2011-10-13 17:43:32.333505299 +0200 -+++ grub-1.99/util/grub-mkconfig.in 2011-10-13 17:43:45.513070998 +0200 +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in +--- grub-2.02-rc1.orig/util/grub-mkconfig.in 2017-02-08 15:05:01.428318167 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig.in 2017-02-08 15:05:13.547318031 +0000 @@ -1,5 +1,6 @@ #! /bin/sh set -e diff --git a/tld-mkconfigdir.patch b/tld-mkconfigdir.patch index f769b94..9363459 100644 --- a/tld-mkconfigdir.patch +++ b/tld-mkconfigdir.patch @@ -1,7 +1,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 @@ +diff -urNp grub-2.02-rc1.orig/conf/Makefile.common grub-2.02-rc1/conf/Makefile.common +--- grub-2.02-rc1.orig/conf/Makefile.common 2017-02-08 15:02:48.901319660 +0000 ++++ grub-2.02-rc1/conf/Makefile.common 2017-02-08 15:03:00.772319526 +0000 +@@ -61,7 +61,7 @@ CCASFLAGS_LIBRARY = # Other variables @@ -10,10 +10,10 @@ diff -ur grub-2.02-beta3.orig/conf/Makefile.common grub-2.02-beta3/conf/Makefile platformdir = $(pkglibdir)/$(target_cpu)-$(platform) starfielddir = $(pkgdatadir)/themes/starfield -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in +--- grub-2.02-rc1.orig/util/grub-mkconfig.in 2017-02-08 15:02:48.949319659 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig.in 2017-02-08 15:03:00.772319526 +0000 +@@ -37,7 +37,7 @@ fi export pkgdatadir grub_cfg="" diff --git a/tld-sysconfdir.patch b/tld-sysconfdir.patch index 36a0855..f5f0809 100644 --- a/tld-sysconfdir.patch +++ b/tld-sysconfdir.patch @@ -1,16 +1,16 @@ -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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub.d/README grub-2.02-rc1/util/grub.d/README +--- grub-2.02-rc1.orig/util/grub.d/README 2017-02-03 19:17:48.000000000 +0000 ++++ grub-2.02-rc1/util/grub.d/README 2017-02-08 15:00:50.481320993 +0000 +@@ -8,4 +8,4 @@ All executable files in this directory a 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 @@ +diff -urNp grub-2.02-rc1.orig/util/grub-mkconfig.in grub-2.02-rc1/util/grub-mkconfig.in +--- grub-2.02-rc1.orig/util/grub-mkconfig.in 2017-02-03 19:17:48.000000000 +0000 ++++ grub-2.02-rc1/util/grub-mkconfig.in 2017-02-08 15:00:50.481320993 +0000 +@@ -147,8 +147,8 @@ if [ x"$GRUB_FS" = xunknown ]; then GRUB_FS="$(stat -f --printf=%T / || echo unknown)" fi @@ -21,7 +21,7 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk fi # XXX: should this be deprecated at some point? -@@ -243,7 +243,7 @@ +@@ -243,7 +243,7 @@ cat << EOF # DO NOT EDIT THIS FILE # # It is automatically generated by $self using templates @@ -30,7 +30,7 @@ diff -ur grub-2.02-beta3.orig/util/grub-mkconfig.in grub-2.02-beta3/util/grub-mk # EOF -@@ -269,7 +269,7 @@ +@@ -269,7 +269,7 @@ if test "x${grub_cfg}" != "x" ; then 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. -- 2.44.0