commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-11-05 21:53:08

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.11331 (New)


Package is "grub2"

Thu Nov  5 21:53:08 2020 rev:231 rq:845585 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-10-26 
16:12:16.394714020 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.11331/grub2.changes   2020-11-05 
21:53:10.404419783 +0100
@@ -1,0 +2,6 @@
+Mon Nov  2 06:42:04 UTC 2020 - Michael Chang 
+
+- Fix boot failure in blocklist installation (bsc#1178278)
+  * Modified 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
+
+---



Other differences:
--
++ 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch ++
--- /var/tmp/diff_new_pack.xZuldl/_old  2020-11-05 21:53:12.716414585 +0100
+++ /var/tmp/diff_new_pack.xZuldl/_new  2020-11-05 21:53:12.716414585 +0100
@@ -18,6 +18,11 @@
 This fixed "failed to get canonical path of `/boot/grub2/i386-pc`"
 error during grub-install.
 
+V2: Do not clean up core.img and boot.img in i386-pc platform directory.
+The core.img is required by blocklist install that will load it from
+platform directory. Both files can be used by grub2-bios-setup to
+reinstall images to disk made by previous grub2-install.
+
 Signed-off-by: Michael Chang 
 ---
  util/grub-install.c | 7 +--
@@ -56,3 +61,37 @@
break;
}
  case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275:
+Index: grub-2.04/util/grub-install-common.c
+===
+--- grub-2.04.orig/util/grub-install-common.c
 grub-2.04/util/grub-install-common.c
+@@ -190,18 +190,28 @@ clean_grub_dir (const char *di)
+ {
+   grub_util_fd_dir_t d;
+   grub_util_fd_dirent_t de;
++  int skip_img = 0;
+ 
+   d = grub_util_fd_opendir (di);
+   if (!d)
+ grub_util_error (_("cannot open directory `%s': %s"),
+di, grub_util_fd_strerror ());
+ 
++  {
++char *plat_i386_pc = grub_install_get_platform_name 
(GRUB_INSTALL_PLATFORM_I386_PC);
++const char *plat = strrchr (di, '/');
++
++if (plat && strcmp (plat + 1, plat_i386_pc) == 0)
++  skip_img = 1;
++free (plat_i386_pc);
++  }
++
+   while ((de = grub_util_fd_readdir (d)))
+ {
+   const char *ext = strrchr (de->d_name, '.');
+   if ((ext && (strcmp (ext, ".mod") == 0
+  || strcmp (ext, ".lst") == 0
+- || strcmp (ext, ".img") == 0
++ || (!skip_img && strcmp (ext, ".img") == 0)
+  || strcmp (ext, ".mo") == 0)
+  && strcmp (de->d_name, "menu.lst") != 0)
+ || strcmp (de->d_name, "efiemu32.o") == 0

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-10-26 16:11:47

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3463 (New)


Package is "grub2"

Mon Oct 26 16:11:47 2020 rev:230 rq:843382 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-10-21 
12:34:47.405982559 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3463/grub2.changes2020-10-26 
16:12:16.394714020 +0100
@@ -1,0 +2,28 @@
+Thu Oct 22 06:19:13 UTC 2020 - Michael Chang 
+
+- Fix grub2-install error with "failed to get canonical path of
+  `/boot/grub2/i386-pc'." (bsc#1177957)
+  * Modified 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
+
+---
+Wed Oct 14 08:46:46 UTC 2020 - Michael Chang 
+
+- Fix https boot interrupted by unrecognised network address error message
+  (bsc#1172952)
+  * 0001-add-support-for-UEFI-network-protocols.patch
+
+---
+Tue Oct 13 08:54:10 UTC 2020 - Michael Chang 
+
+- grub2.spec: Fix bare words used as string in expression which is no longer
+  allowed in rpm 4.16
+
+---
+Fri Sep 25 07:13:27 UTC 2020 - Michael Chang 
+
+- Improve the error handling when grub2-install fails with short mbr gap
+  (bsc#1176062)
+  * 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
+  * 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
+
+---

New:

  0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
  0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.r7ofiC/_old  2020-10-26 16:12:19.066716478 +0100
+++ /var/tmp/diff_new_pack.r7ofiC/_new  2020-10-26 16:12:19.066716478 +0100
@@ -138,7 +138,7 @@
 %define grubxenarch x86_64-xen
 %endif
 
-%if %{platform} == emu
+%if "%{platform}" == "emu"
 # force %%{emu} to 1, e.g. for s390
 %define emu 1
 %endif
@@ -332,6 +332,10 @@
 Patch719:   0001-Unify-the-check-to-enable-btrfs-relative-path.patch
 Patch720:   0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
 Patch721:   0001-efi-linux-provide-linux-command.patch
+# Improve the error handling when grub2-install fails with short mbr gap
+# (bsc#1176062)
+Patch722:   0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
+Patch723:   0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -399,7 +403,7 @@
 
 Summary:Bootloader with support for Linux, Multiboot and more
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name} = %{version}
@@ -420,7 +424,7 @@
 %package %{grubarch}-debug
 Summary:Debug symbols for %{grubarch}
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubarch} = %{version}
@@ -464,7 +468,7 @@
 %package %{grubefiarch}-debug
 Summary:Debug symbols for %{grubefiarch}
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubefiarch} = %{version}
@@ -655,6 +659,8 @@
 %patch719 -p1
 %patch720 -p1
 %patch721 -p1
+%patch722 -p1
+%patch723 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15
@@ -811,7 +817,7 @@
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
 
-%if %{platform} != "emu"
+%if "%{platform}" != "emu"
 %define arch_specific --enable-device-mapper
 TLFLAGS="-static"
 

++ 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch ++
>From 53e9a353dbc5110039bc229e271ea60f7bc5bd69 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko 
Date: Mon, 27 Apr 2020 17:51:34 +0200
Subject: [PATCH 1/2] Warn if MBR gap is small and user uses advanced modules

We don't want to support small MBR gap in pair with anything but
the simplest config of biosdisk+part_msdos+simple filesystem. In this
path "simple filesystems" are all current filesystems except zfs and
btrfs.
---
 grub-core/partmap/gpt.c |  9 -
 grub-core/partmap/msdos.c   |  7 ++-
 include/grub/partition.h|  4 +++-
 include/grub/util/install.h |  7 +--
 util/grub-install-common.c  | 25 +
 util/grub-install.c | 13 +
 util/grub-setup.c   |  2 +-
 util/setup.c|  5 +++--
 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-10-21 12:34:45

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3486 (New)


Package is "grub2"

Wed Oct 21 12:34:45 2020 rev:229 rq: version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-10-20 
16:00:06.365717026 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3486/grub2.changes2020-10-21 
12:34:47.405982559 +0200
@@ -2,21 +1,0 @@
-Wed Oct 14 08:46:46 UTC 2020 - Michael Chang 
-
-- Fix https boot interrupted by unrecognised network address error message
-  (bsc#1172952)
-  * 0001-add-support-for-UEFI-network-protocols.patch
-

-Tue Oct 13 08:54:10 UTC 2020 - Michael Chang 
-
-- grub2.spec: Fix bare words used as string in expression which is no longer
-  allowed in rpm 4.16
-

-Fri Sep 25 07:13:27 UTC 2020 - Michael Chang 
-
-- Improve the error handling when grub2-install fails with short mbr gap
-  (bsc#1176062)
-  * 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
-  * 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
-


Old:

  0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
  0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Fk3511/_old  2020-10-21 12:34:49.745982643 +0200
+++ /var/tmp/diff_new_pack.Fk3511/_new  2020-10-21 12:34:49.749982642 +0200
@@ -138,7 +138,7 @@
 %define grubxenarch x86_64-xen
 %endif
 
-%if "%{platform}" == "emu"
+%if %{platform} == emu
 # force %%{emu} to 1, e.g. for s390
 %define emu 1
 %endif
@@ -332,10 +332,6 @@
 Patch719:   0001-Unify-the-check-to-enable-btrfs-relative-path.patch
 Patch720:   0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
 Patch721:   0001-efi-linux-provide-linux-command.patch
-# Improve the error handling when grub2-install fails with short mbr gap
-# (bsc#1176062)
-Patch722:   0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
-Patch723:   0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -403,7 +399,7 @@
 
 Summary:Bootloader with support for Linux, Multiboot and more
 Group:  System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
 BuildArch:  noarch
 %endif
 Requires:   %{name} = %{version}
@@ -424,7 +420,7 @@
 %package %{grubarch}-debug
 Summary:Debug symbols for %{grubarch}
 Group:  System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubarch} = %{version}
@@ -468,7 +464,7 @@
 %package %{grubefiarch}-debug
 Summary:Debug symbols for %{grubefiarch}
 Group:  System/Boot
-%if "%{platform}" != "emu"
+%if %{platform} != emu
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubefiarch} = %{version}
@@ -659,8 +655,6 @@
 %patch719 -p1
 %patch720 -p1
 %patch721 -p1
-%patch722 -p1
-%patch723 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15
@@ -817,7 +811,7 @@
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
 
-%if "%{platform}" != "emu"
+%if %{platform} != "emu"
 %define arch_specific --enable-device-mapper
 TLFLAGS="-static"
 

++ 0001-add-support-for-UEFI-network-protocols.patch ++
--- /var/tmp/diff_new_pack.Fk3511/_old  2020-10-21 12:34:49.785982644 +0200
+++ /var/tmp/diff_new_pack.Fk3511/_new  2020-10-21 12:34:49.785982644 +0200
@@ -33,11 +33,6 @@
   * Use grub_calloc for overflow check and return NULL when it would
 occur.
 
-V6:
-  * Don't force grub_print_error if no best route found as boot process
-could be interrupted by logged error. The default interface will be
-used as fallback in this case
-
 ---
  grub-core/Makefile.core.def|   18 +
  grub-core/io/bufio.c   |2 +-
@@ -1995,7 +1990,7 @@
 ===
 --- /dev/null
 +++ grub-2.04/grub-core/net/efi/net.c
-@@ -0,0 +1,1440 @@
+@@ -0,0 +1,1437 @@
 +#include 
 +#include 
 +#include 
@@ -2797,16 +2792,13 @@
 +  grub_efi_net_interface_t *inf;
 +  int is_ip6 = 0;
 +
-+  grub_error_push ();
 +  err = grub_efi_net_parse_address (server, , , _ip6, 0);
 +
 +  if (err)
 +{
-+  grub_dprintf ("efinetfs", "error in matching route : %s\n", 
grub_errmsg);
-+  grub_error_pop ();
++  grub_print_error ();
 +  return NULL;
 + 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-10-20 15:59:46

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3486 (New)


Package is "grub2"

Tue Oct 20 15:59:46 2020 rev:228 rq:842014 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-09-18 
14:25:45.539130752 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3486/grub2.changes2020-10-20 
16:00:06.365717026 +0200
@@ -1,0 +2,21 @@
+Wed Oct 14 08:46:46 UTC 2020 - Michael Chang 
+
+- Fix https boot interrupted by unrecognised network address error message
+  (bsc#1172952)
+  * 0001-add-support-for-UEFI-network-protocols.patch
+
+---
+Tue Oct 13 08:54:10 UTC 2020 - Michael Chang 
+
+- grub2.spec: Fix bare words used as string in expression which is no longer
+  allowed in rpm 4.16
+
+---
+Fri Sep 25 07:13:27 UTC 2020 - Michael Chang 
+
+- Improve the error handling when grub2-install fails with short mbr gap
+  (bsc#1176062)
+  * 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
+  * 0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
+
+---

New:

  0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
  0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.ANgkwz/_old  2020-10-20 16:00:10.533718999 +0200
+++ /var/tmp/diff_new_pack.ANgkwz/_new  2020-10-20 16:00:10.537719001 +0200
@@ -138,7 +138,7 @@
 %define grubxenarch x86_64-xen
 %endif
 
-%if %{platform} == emu
+%if "%{platform}" == "emu"
 # force %%{emu} to 1, e.g. for s390
 %define emu 1
 %endif
@@ -332,6 +332,10 @@
 Patch719:   0001-Unify-the-check-to-enable-btrfs-relative-path.patch
 Patch720:   0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
 Patch721:   0001-efi-linux-provide-linux-command.patch
+# Improve the error handling when grub2-install fails with short mbr gap
+# (bsc#1176062)
+Patch722:   0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch
+Patch723:   0002-grub-install-Avoid-incompleted-install-on-i386-pc.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -399,7 +403,7 @@
 
 Summary:Bootloader with support for Linux, Multiboot and more
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name} = %{version}
@@ -420,7 +424,7 @@
 %package %{grubarch}-debug
 Summary:Debug symbols for %{grubarch}
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubarch} = %{version}
@@ -464,7 +468,7 @@
 %package %{grubefiarch}-debug
 Summary:Debug symbols for %{grubefiarch}
 Group:  System/Boot
-%if %{platform} != emu
+%if "%{platform}" != "emu"
 BuildArch:  noarch
 %endif
 Requires:   %{name}-%{grubefiarch} = %{version}
@@ -655,6 +659,8 @@
 %patch719 -p1
 %patch720 -p1
 %patch721 -p1
+%patch722 -p1
+%patch723 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15
@@ -811,7 +817,7 @@
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
 
-%if %{platform} != "emu"
+%if "%{platform}" != "emu"
 %define arch_specific --enable-device-mapper
 TLFLAGS="-static"
 

++ 0001-Warn-if-MBR-gap-is-small-and-user-uses-advanced-modu.patch ++
>From 53e9a353dbc5110039bc229e271ea60f7bc5bd69 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko 
Date: Mon, 27 Apr 2020 17:51:34 +0200
Subject: [PATCH 1/2] Warn if MBR gap is small and user uses advanced modules

We don't want to support small MBR gap in pair with anything but
the simplest config of biosdisk+part_msdos+simple filesystem. In this
path "simple filesystems" are all current filesystems except zfs and
btrfs.
---
 grub-core/partmap/gpt.c |  9 -
 grub-core/partmap/msdos.c   |  7 ++-
 include/grub/partition.h|  4 +++-
 include/grub/util/install.h |  7 +--
 util/grub-install-common.c  | 25 +
 util/grub-install.c | 13 +
 util/grub-setup.c   |  2 +-
 util/setup.c|  5 +++--
 8 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
index 72a2e37cd..20cbcc7ff 100644
--- a/grub-core/partmap/gpt.c
+++ b/grub-core/partmap/gpt.c
@@ -25,6 +25,9 @@
 #include 
 #include 
 #include 
+#ifdef GRUB_UTIL
+#include 
+#endif
 
 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-09-18 14:24:07

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.4249 (New)


Package is "grub2"

Fri Sep 18 14:24:07 2020 rev:227 rq:833402 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-08-28 
21:21:07.508317327 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.4249/grub2.changes2020-09-18 
14:25:45.539130752 +0200
@@ -1,0 +2,6 @@
+Wed Sep  9 08:10:45 UTC 2020 - Michael Chang 
+
+- Make efi hand off the default entry point of the linux command (bsc#1176134)
+  * 0001-efi-linux-provide-linux-command.patch
+
+---

New:

  0001-efi-linux-provide-linux-command.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Sorkpj/_old  2020-09-18 14:25:56.971142266 +0200
+++ /var/tmp/diff_new_pack.Sorkpj/_new  2020-09-18 14:25:56.975142269 +0200
@@ -331,6 +331,7 @@
 Patch718:   0002-ieee1275-powerpc-enables-device-mapper-discovery.patch
 Patch719:   0001-Unify-the-check-to-enable-btrfs-relative-path.patch
 Patch720:   0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
+Patch721:   0001-efi-linux-provide-linux-command.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -653,6 +654,7 @@
 %patch718 -p1
 %patch719 -p1
 %patch720 -p1
+%patch721 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 0001-efi-linux-provide-linux-command.patch ++
>From 987ab0dfbe7ef42bb6386fb7b428d3b965ba6d2b Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Mon, 7 Sep 2020 17:02:57 +0800
Subject: [PATCH] efi/linux: provide linux command

The linux kernel's efi handover entry point is used to boot efistub of
the linux kernel. Since then the efistub has been improved with many new
features and fixes that ordinary 32-bit entry point cannot provide.

Besides, nearly every x86 efi kernel is built with efistub enabled so it
is of little value to keep 32-bit entry as default to boot kernel
without needed kconfig options enabled.

For all good reasons, making efi handover the default entry point for
booting kernel in x86 efi platform so that linux command works in the
same way to linuxefi. This can also reduce the complexity of providing
general grub configuation for x86 system due to the linux command may
not be available in signed image for UEFI Secure Boot and linuxefi is
not available for leagcy bios booting.

Signed-off-by: Michael Chang 
---
 grub-core/Makefile.core.def   |  6 --
 grub-core/gensyminfo.sh.in|  3 +++
 grub-core/loader/i386/efi/linux.c | 17 +
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
index 6045da47b..3ea9dace0 100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@ -1773,7 +1773,9 @@ module = {
 
 module = {
   name = linux;
-  x86 = loader/i386/linux.c;
+  i386_pc = loader/i386/linux.c;
+  i386_efi = loader/i386/efi/linux.c;
+  x86_64_efi = loader/i386/efi/linux.c;
   i386_xen_pvh = loader/i386/linux.c;
   xen = loader/i386/xen.c;
   i386_pc = lib/i386/pc/vesa_modes_table.c;
@@ -1852,7 +1854,7 @@ module = {
 
 module = {
   name = linuxefi;
-  efi = loader/i386/efi/linux.c;
+  efi = lib/fake_module.c;
   enable = i386_efi;
   enable = x86_64_efi;
 };
diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in
index 9bc767532..098de9258 100644
--- a/grub-core/gensyminfo.sh.in
+++ b/grub-core/gensyminfo.sh.in
@@ -35,3 +35,6 @@ fi
 
 # Print all undefined symbols used by module
 @TARGET_NM@ -u @TARGET_NMFLAGS_MINUS_P@ -p $module | sed "s@^\([^ 
]*\).*@undefined $modname \1@g"
+
+# Specify linuxefi module should load default linux
+test "$modname" = "linuxefi" && echo "undefined $modname grub_initrd_init" || 
true
diff --git a/grub-core/loader/i386/efi/linux.c 
b/grub-core/loader/i386/efi/linux.c
index 8017e8c05..3f6d51519 100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
@@ -347,20 +347,29 @@ grub_cmd_linux (grub_command_t cmd __attribute__ 
((unused)),
 }
 
 static grub_command_t cmd_linux, cmd_initrd;
+static grub_command_t cmd_linuxefi, cmd_initrdefi;
 
-GRUB_MOD_INIT(linuxefi)
+GRUB_MOD_INIT(linux)
 {
-  cmd_linux =
+  cmd_linuxefi =
 grub_register_command ("linuxefi", grub_cmd_linux,
0, N_("Load Linux."));
-  cmd_initrd =
+  cmd_initrdefi =
 grub_register_command ("initrdefi", grub_cmd_initrd,
0, N_("Load initrd."));
+  cmd_linux =
+grub_register_command ("linux", 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-08-28 21:18:51

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3399 (New)


Package is "grub2"

Fri Aug 28 21:18:51 2020 rev:226 rq:830141 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-08-23 
09:21:21.278690946 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3399/grub2.changes2020-08-28 
21:21:07.508317327 +0200
@@ -1,0 +2,13 @@
+Thu Aug 27 06:58:37 UTC 2020 - Michael Chang 
+
+- Fix verification requested but nobody cares error when loading external
+  module in secure boot off (bsc#1175766)
+  * 0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
+
+---
+Sat Aug 22 02:41:49 UTC 2020 - Michael Chang 
+
+- Make consistent check to enable relative path on btrfs (bsc#1174567)
+  * 0001-Unify-the-check-to-enable-btrfs-relative-path.patch
+
+---

New:

  0001-Unify-the-check-to-enable-btrfs-relative-path.patch
  0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.7pPVQU/_old  2020-08-28 21:21:09.680318381 +0200
+++ /var/tmp/diff_new_pack.7pPVQU/_new  2020-08-28 21:21:09.684318383 +0200
@@ -329,6 +329,8 @@
 # takes 45 minutes after grub to start loading kernel
 Patch717:   0001-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
 Patch718:   0002-ieee1275-powerpc-enables-device-mapper-discovery.patch
+Patch719:   0001-Unify-the-check-to-enable-btrfs-relative-path.patch
+Patch720:   0001-shim_lock-Disable-GRUB_VERIFY_FLAGS_DEFER_AUTH-if-se.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -649,6 +651,8 @@
 %patch716 -p1
 %patch717 -p1
 %patch718 -p1
+%patch719 -p1
+%patch720 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 0001-Unify-the-check-to-enable-btrfs-relative-path.patch ++
>From 80bb1b17b3f596dbd7331cf9cb20a46c8ef9800b Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Sat, 22 Aug 2020 02:32:43 +0800
Subject: [PATCH] Unify the check to enable btrfs relative path

This unified the test in grub-install and grub-mkconfig that the path to
default or selected btrfs subvolume/snapshot is used if the root file
system is btrfs and the config has enabled btrfs snapshot booting.

Signed-off-by: Michael Chang 
---
 util/grub-install.c   | 67 +++
 util/grub-mkconfig_lib.in |  3 +-
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/util/grub-install.c b/util/grub-install.c
index 746a42a04..8d18f2530 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -870,6 +870,7 @@ main (int argc, char *argv[])
   const char *efi_file = NULL;
   char **grub_devices;
   grub_fs_t grub_fs;
+  grub_fs_t root_fs;
   grub_device_t grub_dev = NULL;
   enum grub_install_plat platform;
   char *grubdir, *device_map;
@@ -882,6 +883,8 @@ main (int argc, char *argv[])
   int efidir_is_mac = 0;
   int is_prep = 0;
   const char *pkgdatadir;
+  char *rootdir_path;
+  char **rootdir_devices;
 
   grub_util_host_init (, );
   product_version = xstrdup (PACKAGE_VERSION);
@@ -895,9 +898,6 @@ main (int argc, char *argv[])
 
   grub_util_load_config ();
 
-  if (config.is_suse_btrfs_snapshot_enabled)
-use_relative_path_on_btrfs = 1;
-
   if (!bootloader_id && config.grub_distributor)
 {
   char *ptr;
@@ -1046,6 +1046,45 @@ main (int argc, char *argv[])
   grub_hostfs_init ();
   grub_host_init ();
 
+  {
+char *rootdir_grub_devname;
+grub_device_t rootdir_grub_dev;
+char *t = grub_util_path_concat (2, "/", rootdir);
+
+rootdir_path = grub_canonicalize_file_name (t);
+if (!rootdir_path)
+  grub_util_error (_("failed to get canonical path of `%s'"), t);
+
+rootdir_devices = grub_guess_root_devices (rootdir_path);
+if (!rootdir_devices || !rootdir_devices[0])
+  grub_util_error (_("cannot find a device for %s (is /dev mounted?)"),
+ rootdir_path);
+
+for (curdev = rootdir_devices; *curdev; curdev++)
+   grub_util_pull_device (*curdev);
+
+rootdir_grub_devname = grub_util_get_grub_dev (rootdir_devices[0]);
+if (!rootdir_grub_devname)
+  grub_util_error (_("cannot find a GRUB drive for %s.  Check your 
device.map"),
+  rootdir_devices[0]);
+
+rootdir_grub_dev = grub_device_open (rootdir_grub_devname);
+if (! rootdir_grub_dev)
+  grub_util_error ("%s", grub_errmsg);
+
+root_fs = grub_fs_probe (rootdir_grub_dev);
+if 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-08-23 09:21:14

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3399 (New)


Package is "grub2"

Sun Aug 23 09:21:14 2020 rev:225 rq:828453 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-08-15 
21:18:45.947568047 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3399/grub2.changes2020-08-23 
09:21:21.278690946 +0200
@@ -1,0 +2,15 @@
+Fri Aug 21 04:40:48 UTC 2020 - Michael Chang 
+
+- Add fibre channel device's ofpath support to grub-ofpathname and search hint
+  to speed up root device discovery (bsc#1172745)
+  * 0001-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+  * 0002-ieee1275-powerpc-enables-device-mapper-discovery.patch
+
+---
+Tue Aug 18 06:02:21 UTC 2020 - Michael Chang 
+
+- Fix for CVE-2020-15705 (bsc#1174421) 
+  * 0001-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+  * 0002-cmdline-Provide-cmdline-functions-as-module.patch
+
+---

New:

  0001-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
  0001-linuxefi-fail-kernel-validation-without-shim-protoco.patch
  0002-cmdline-Provide-cmdline-functions-as-module.patch
  0002-ieee1275-powerpc-enables-device-mapper-discovery.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.uDApST/_old  2020-08-23 09:21:25.218693130 +0200
+++ /var/tmp/diff_new_pack.uDApST/_new  2020-08-23 09:21:25.222693132 +0200
@@ -321,6 +321,14 @@
 # overflows in initrd size handling
 Patch713:   0010-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 Patch714:   0001-kern-mm.c-Make-grub_calloc-inline.patch
+# bsc#1174421 VUL-0: CVE-2020-15705: grub2: linuxefi: fail kernel validation
+# without shim protocol
+Patch715:   0001-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch716:   0002-cmdline-Provide-cmdline-functions-as-module.patch
+# bsc#1172745 L3: SLES 12 SP4 - Slow boot of system after updated kernel -
+# takes 45 minutes after grub to start loading kernel
+Patch717:   0001-ieee1275-powerpc-implements-fibre-channel-discovery-.patch
+Patch718:   0002-ieee1275-powerpc-enables-device-mapper-discovery.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -637,6 +645,10 @@
 %patch712 -p1
 %patch713 -p1
 %patch714 -p1
+%patch715 -p1
+%patch716 -p1
+%patch717 -p1
+%patch718 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 0001-ieee1275-powerpc-implements-fibre-channel-discovery-.patch ++
>From ca30b3c6fd8c848f510445316d0c4a8fca6061ba Mon Sep 17 00:00:00 2001
From: Diego Domingos 
Date: Wed, 24 Jun 2020 08:17:18 -0400
Subject: [PATCH 1/2] ieee1275/powerpc: implements fibre channel discovery for
 ofpathname

grub-ofpathname doesn't work with fibre channel because there is no
function currently implemented for it.
This patch enables it by prividing a function that looks for the port
name, building the entire path for OF devices.
---
 grub-core/osdep/linux/ofpath.c | 48 ++
 1 file changed, 48 insertions(+)

diff --git a/grub-core/osdep/linux/ofpath.c b/grub-core/osdep/linux/ofpath.c
index a6153d359..f2bc9fc5c 100644
--- a/grub-core/osdep/linux/ofpath.c
+++ b/grub-core/osdep/linux/ofpath.c
@@ -399,6 +399,37 @@ of_path_of_nvme(const char *sys_devname 
__attribute__((unused)),
 }
 #endif
 
+static void
+of_fc_port_name(const char *path, const char *subpath, char *port_name)
+{
+  char *bname, *basepath, *p;
+  int fd;
+
+  bname = xmalloc(sizeof(char)*150);
+  basepath = xmalloc(strlen(path));
+
+  /* Generate the path to get port name information from the drive */
+  strncpy(basepath,path,subpath-path);
+  basepath[subpath-path-1] = '\0';
+  p = get_basename(basepath);
+  snprintf(bname,sizeof(char)*150,"%s/fc_transport/%s/port_name",basepath,p);
+
+  /* Read the information from the port name */
+  fd = open (bname, O_RDONLY);
+  if (fd < 0)
+grub_util_error (_("cannot open `%s': %s"), bname, strerror (errno));
+
+  if (read(fd,port_name,sizeof(char)*19) < 0)
+grub_util_error (_("cannot read `%s': %s"), bname, strerror (errno));
+
+  sscanf(port_name,"0x%s",port_name);
+
+  close(fd);
+
+  free(bname);
+  free(basepath);
+}
+
 static int
 vendor_is_ATA(const char *path)
 {
@@ -577,6 +608,16 @@ of_path_of_scsi(const char *sys_devname 
__attribute__((unused)), const char *dev
   digit_string = trailing_digits (device);
   if (strncmp (of_path, "/vdevice/", sizeof ("/vdevice/") - 1) == 0)
 {
+  

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-08-15 21:18:32

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3399 (New)


Package is "grub2"

Sat Aug 15 21:18:32 2020 rev:224 rq:826245 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-07-31 
15:56:22.228376572 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3399/grub2.changes2020-08-15 
21:18:45.947568047 +0200
@@ -1,0 +2,7 @@
+Thu Aug 13 06:41:16 UTC 2020 - Michael Chang 
+
+- Make grub-calloc inline to avoid symbol not found error as the system may not
+  use updated grub to boot the system (bsc#1174782) (bsc#1175060) 
(bsc#1175036) 
+  * 0001-kern-mm.c-Make-grub_calloc-inline.patch
+
+---

New:

  0001-kern-mm.c-Make-grub_calloc-inline.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.kySGF8/_old  2020-08-15 21:18:47.583568981 +0200
+++ /var/tmp/diff_new_pack.kySGF8/_new  2020-08-15 21:18:47.583568981 +0200
@@ -320,6 +320,7 @@
 # bsc#1174570 VUL-0: EMBARGOED: CVE-2020-15707: grub2: linux: Fix integer
 # overflows in initrd size handling
 Patch713:   0010-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+Patch714:   0001-kern-mm.c-Make-grub_calloc-inline.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -635,6 +636,7 @@
 %patch711 -p1
 %patch712 -p1
 %patch713 -p1
+%patch714 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 0001-kern-mm.c-Make-grub_calloc-inline.patch ++
>From c2475f1337dff2e2a3e45514119d5186e55753c1 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Thu, 13 Aug 2020 09:36:45 +0800
Subject: [PATCH] kern/mm.c : Make grub_calloc inline

To circumvent the situation that symbol 'grub_calloc' not found would
happen if system is using stray grub (ie not managed by system update)
as stage1 that can be too old to load updated modules.
---
 grub-core/kern/mm.c | 28 
 include/grub/mm.h   | 32 +++-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
index f2822a836..dacdaa239 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -60,14 +60,10 @@
 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 
 #ifdef MM_DEBUG
 # undef grub_calloc
@@ -377,30 +373,6 @@ grub_memalign (grub_size_t align, grub_size_t size)
   return 0;
 }
 
-/*
- * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on
- * integer overflow.
- */
-void *
-grub_calloc (grub_size_t nmemb, grub_size_t size)
-{
-  void *ret;
-  grub_size_t sz = 0;
-
-  if (grub_mul (nmemb, size, ))
-{
-  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
-  return NULL;
-}
-
-  ret = grub_memalign (0, sz);
-  if (!ret)
-return NULL;
-
-  grub_memset (ret, 0, sz);
-  return ret;
-}
-
 /* Allocate SIZE bytes and return the pointer.  */
 void *
 grub_malloc (grub_size_t size)
diff --git a/include/grub/mm.h b/include/grub/mm.h
index 9c38dd3ca..1754635e7 100644
--- a/include/grub/mm.h
+++ b/include/grub/mm.h
@@ -29,7 +29,6 @@
 #endif
 
 void grub_mm_init_region (void *addr, grub_size_t size);
-void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);
 void *EXPORT_FUNC(grub_malloc) (grub_size_t size);
 void *EXPORT_FUNC(grub_zalloc) (grub_size_t size);
 void EXPORT_FUNC(grub_free) (void *ptr);
@@ -37,6 +36,37 @@ void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t 
size);
 #ifndef GRUB_MACHINE_EMU
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 #endif
+#if !defined(GRUB_UTIL) && !defined (GRUB_MACHINE_EMU)
+#include 
+#include 
+#include 
+#include 
+/*
+ * Allocate NMEMB instances of SIZE bytes and return the pointer, or error on
+ * integer overflow.
+ */
+static inline void *
+grub_calloc (grub_size_t nmemb, grub_size_t size)
+{
+  void *ret;
+  grub_size_t sz = 0;
+
+  if (grub_mul (nmemb, size, ))
+{
+  grub_error (GRUB_ERR_OUT_OF_RANGE, N_("overflow is detected"));
+  return NULL;
+}
+
+  ret = grub_memalign (0, sz);
+  if (!ret)
+return NULL;
+
+  grub_memset (ret, 0, sz);
+  return ret;
+}
+#else
+void *EXPORT_FUNC(grub_calloc) (grub_size_t nmemb, grub_size_t size);
+#endif
 
 void grub_mm_check_real (const char *file, int line);
 #define grub_mm_check() grub_mm_check_real (GRUB_FILE, __LINE__);
-- 
2.26.2

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-07-31 15:54:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3592 (New)


Package is "grub2"

Fri Jul 31 15:54:21 2020 rev:223 rq:823470 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-07-28 
17:22:15.957689250 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3592/grub2.changes2020-07-31 
15:56:22.228376572 +0200
@@ -1,0 +2,28 @@
+Mon Jul 27 10:04:49 UTC 2020 - Michael Chang 
+
+- Fix for CVE-2020-10713 (bsc#1168994)
+  * 0001-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+- Fix for CVE-2020-14308 CVE-2020-14309, CVE-2020-14310, CVE-2020-14311
+  (bsc#1173812)
+  * 0002-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+  * 0003-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+  * 0004-calloc-Use-calloc-at-most-places.patch
+  * 0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+  * 0006-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+  * 0007-font-Do-not-load-more-than-one-NAME-section.patch
+- Fix CVE-2020-15706 (bsc#1174463)
+  * 0008-script-Remove-unused-fields-from-grub_script_functio.patch
+  * 0009-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+- Fix CVE-2020-15707 (bsc#1174570)
+  * 0010-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+- Use overflow checking primitives where the arithmetic expression for buffer
+  allocations may include unvalidated data
+- Use grub_calloc for overflow check and return NULL when it would occur 
+  * 0001-add-support-for-UEFI-network-protocols.patch
+  * 0003-bootp-New-net_bootp6-command.patch
+  * grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
+  * grub2-btrfs-09-get-default-subvolume.patch
+  * grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
+  * grub2-grubenv-in-btrfs-header.patch
+
+---

New:

  0001-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
  0002-safemath-Add-some-arithmetic-primitives-that-check-f.patch
  0003-calloc-Make-sure-we-always-have-an-overflow-checking.patch
  0004-calloc-Use-calloc-at-most-places.patch
  0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch
  0006-iso9660-Don-t-leak-memory-on-realloc-failures.patch
  0007-font-Do-not-load-more-than-one-NAME-section.patch
  0008-script-Remove-unused-fields-from-grub_script_functio.patch
  0009-script-Avoid-a-use-after-free-when-redefining-a-func.patch
  0010-linux-Fix-integer-overflows-in-initrd-size-handling.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.84M0bi/_old  2020-07-31 15:56:25.472379933 +0200
+++ /var/tmp/diff_new_pack.84M0bi/_new  2020-07-31 15:56:25.476379937 +0200
@@ -302,6 +302,24 @@
 Patch701:   0002-kern-Add-X-option-to-printf-functions.patch
 Patch702:   0003-normal-main-Search-for-specific-config-files-for-net.patch
 Patch703:   0004-datetime-Enable-the-datetime-module-for-the-emu-plat.patch
+# bsc#1168994 VUL-0: EMBARGOED: CVE-2020-10713: grub2: parsing overflows can
+# bypass secure boot restrictions
+Patch704:   0001-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+# bsc#1173812 VUL-0: EMBARGOED: CVE-2020-14308, CVE-2020-14309, CVE-2020-14310,
+# CVE-2020-14311: grub2: avoid integer overflows
+Patch705:   0002-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+Patch706:   0003-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+Patch707:   0004-calloc-Use-calloc-at-most-places.patch
+Patch708:   0005-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+Patch709:   0006-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+Patch710:   0007-font-Do-not-load-more-than-one-NAME-section.patch
+# bsc#1174463 VUL-0: EMBARGOED: CVE-2020-15706: grub2: script: Avoid a
+# use-after-free when redefining a function during execution
+Patch711:   0008-script-Remove-unused-fields-from-grub_script_functio.patch
+Patch712:   0009-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+# bsc#1174570 VUL-0: EMBARGOED: CVE-2020-15707: grub2: linux: Fix integer
+# overflows in initrd size handling
+Patch713:   0010-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -607,6 +625,16 @@
 %patch701 -p1
 %patch702 -p1
 %patch703 -p1
+%patch704 -p1
+%patch705 -p1
+%patch706 -p1
+%patch707 -p1
+%patch708 -p1
+%patch709 -p1
+%patch710 -p1
+%patch711 -p1
+%patch712 -p1
+%patch713 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-07-28 17:22:14

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3592 (New)


Package is "grub2"

Tue Jul 28 17:22:14 2020 rev:222 rq:822680 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-05-26 
17:14:20.891329674 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.3592/grub2.changes2020-07-28 
17:22:15.957689250 +0200
@@ -1,0 +2,5 @@
+Thu Jul 16 13:15:27 UTC 2020 - Michel Normand 
+
+- No 95_textmode for PowerPC (boo#1174166)
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.oAawFn/_old  2020-07-28 17:22:19.837694397 +0200
+++ /var/tmp/diff_new_pack.oAawFn/_new  2020-07-28 17:22:19.841694402 +0200
@@ -899,6 +899,7 @@
 %endif
 
 %ifarch ppc ppc64 ppc64le
+rm -f $R%{_sysconfdir}/grub.d/95_textmode
 %else
 rm -f $R%{_sysconfdir}/grub.d/20_ppc_terminfo
 %endif
@@ -1107,7 +1108,9 @@
 %config(noreplace) %{_sysconfdir}/grub.d/40_custom
 %config(noreplace) %{_sysconfdir}/grub.d/41_custom
 %config(noreplace) %{_sysconfdir}/grub.d/90_persistent
+%ifnarch ppc ppc64 ppc64le
 %config(noreplace) %{_sysconfdir}/grub.d/95_textmode
+%endif
 %ifarch %{ix86} x86_64
 %config(noreplace) %{_sysconfdir}/grub.d/20_memtest86+
 %endif

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-05-26 17:14:05

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.2738 (New)


Package is "grub2"

Tue May 26 17:14:05 2020 rev:221 rq:807543 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-05-08 
23:01:18.105365857 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.2738/grub2.changes2020-05-26 
17:14:20.891329674 +0200
@@ -1,0 +2,6 @@
+Mon May 18 08:15:01 UTC 2020 - Michael Chang 
+
+- Skip zfcpdump kernel from the grub boot menu (bsc#1166513)
+  * grub2-s390x-skip-zfcpdump-image.patch 
+
+---

New:

  grub2-s390x-skip-zfcpdump-image.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.0pwkSd/_old  2020-05-26 17:14:22.68559 +0200
+++ /var/tmp/diff_new_pack.0pwkSd/_new  2020-05-26 17:14:22.68559 +0200
@@ -225,6 +225,7 @@
 Patch94:grub2-install-fix-not-a-directory-error.patch
 Patch95:grub2-verifiers-fix-system-freeze-if-verify-failed.patch
 Patch96:grub-install-force-journal-draining-to-ensure-data-i.patch
+Patch97:grub2-s390x-skip-zfcpdump-image.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -548,6 +549,7 @@
 %patch94 -p1
 %patch95 -p1
 %patch96 -p1
+%patch97 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-s390x-skip-zfcpdump-image.patch ++
Index: grub-2.04/util/grub-mkconfig_lib.in
===
--- grub-2.04.orig/util/grub-mkconfig_lib.in
+++ grub-2.04/util/grub-mkconfig_lib.in
@@ -189,6 +189,12 @@ grub_file_is_not_garbage ()
   *.rpmsave|*.rpmnew) return 1 ;;
   README*|*/README*)  return 1 ;; # documentation
   *.sig) return 1 ;; # signatures
+  # Skip zfcpdump kernel from the grub boot menu (bsc#1166513) The zfcpdump
+  # kernel image is used by zipl to prepare a SCSI dump disc and is only
+  # intended to boot from that disk for creating kernel crash dumps,
+  # therefore booting it from grub is not making sense and also will result
+  # in unbootable system.
+  *-zfcpdump) return 1 ;; # s390 zfcpdump image
 esac
   else
 return 1

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-05-08 23:01:14

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.2738 (New)


Package is "grub2"

Fri May  8 23:01:14 2020 rev:220 rq:800577 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-04-22 
20:42:33.638166877 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.2738/grub2.changes2020-05-08 
23:01:18.105365857 +0200
@@ -1,0 +2,7 @@
+Tue May  5 06:48:55 UTC 2020 - Michael Chang 
+
+- Fix boot failure as journaled data not get drained due to abrupt power
+  off after grub-install (bsc#1167756)
+  * grub-install-force-journal-draining-to-ensure-data-i.patch 
+
+---

New:

  grub-install-force-journal-draining-to-ensure-data-i.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.kZxosX/_old  2020-05-08 23:01:21.109371994 +0200
+++ /var/tmp/diff_new_pack.kZxosX/_new  2020-05-08 23:01:21.113372002 +0200
@@ -224,6 +224,7 @@
 Patch93:grub2-getroot-support-nvdimm.patch
 Patch94:grub2-install-fix-not-a-directory-error.patch
 Patch95:grub2-verifiers-fix-system-freeze-if-verify-failed.patch
+Patch96:grub-install-force-journal-draining-to-ensure-data-i.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -546,6 +547,7 @@
 %patch93 -p1
 %patch94 -p1
 %patch95 -p1
+%patch96 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub-install-force-journal-draining-to-ensure-data-i.patch ++
>From 3085db0922a1d803d4a9dfe54daae6fef20e4340 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Mon, 13 Apr 2020 16:08:59 +0800
Subject: [PATCH] grub-install: force journal draining to ensure data integrity

In XFS, the system would end up in unbootable state if an abrupt power
off after grub-install is occuring. It can be easily reproduced with.

  grub-install /dev/vda; reboot -f

The grub error would show many different kinds of corruption in
filesystem and the problem boils down to incompleted journal transaction
which would leave pending writes behind in the on-disk journal. It is
therefore necessary to recover the system via re-mounting the filesystem
from linux system that all pending journal log can be replayed.

On the other hand if journal draining can be enforced by grub-install
then it can bring more resilience to such abrupt power loss. The fsync
is not enough here for XFS, because that only writes in-memory log to
on-disk (ie makes sure broken state can be repaired). Unfortunately
there's no designated system call to serve solely for the journal
draining, so it can only be achieved via fsfreeze system call that the
journal draining can happen as a byproduct during the process.

This patch adds fsfreeze/unfreeze at the end of grub-install to induce
journal draining on journaled file system. However btrfs is excluded
from the list as it is using fsync to drain journal and also is not
desired as reportedly having negative side effect. With this patch
applied, the boot falilure can no longer be reproduced with above
procedure.

Signed-off-by: Michael Chang 
---
 Makefile.util.def|  1 +
 grub-core/osdep/basic/journaled_fs.c | 26 +++
 grub-core/osdep/journaled_fs.c   |  5 
 grub-core/osdep/linux/journaled_fs.c | 48 
 include/grub/util/install.h  |  2 ++
 util/grub-install.c  | 20 +++
 6 files changed, 102 insertions(+)
 create mode 100644 grub-core/osdep/basic/journaled_fs.c
 create mode 100644 grub-core/osdep/journaled_fs.c
 create mode 100644 grub-core/osdep/linux/journaled_fs.c

Index: grub-2.04/Makefile.util.def
===
--- grub-2.04.orig/Makefile.util.def
+++ grub-2.04/Makefile.util.def
@@ -645,6 +645,7 @@ program = {
   emu_condition = COND_s390x;
   common = grub-core/kern/emu/argp_common.c;
   common = grub-core/osdep/init.c;
+  common = grub-core/osdep/journaled_fs.c;
 
   ldadd = '$(LIBLZMA)';
   ldadd = libgrubmods.a;
Index: grub-2.04/grub-core/osdep/basic/journaled_fs.c
===
--- /dev/null
+++ grub-2.04/grub-core/osdep/basic/journaled_fs.c
@@ -0,0 +1,26 @@
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2010,2011,2012,2013  Free Software Foundation, Inc.
+ *
+ *  GRUB is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-04-22 20:42:32

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.2738 (New)


Package is "grub2"

Wed Apr 22 20:42:32 2020 rev:219 rq:794921 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-04-13 
12:51:41.240606329 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.2738/grub2.changes2020-04-22 
20:42:33.638166877 +0200
@@ -1,0 +2,6 @@
+Thu Apr 16 13:35:10 UTC 2020 - Michael Chang 
+
+- Fix executable stack in grub-probe and other grub utility (bsc#1169137)
+  * grub2-btrfs-06-subvol-mount.patch
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.qxWsvM/_old  2020-04-22 20:42:35.846171200 +0200
+++ /var/tmp/diff_new_pack.qxWsvM/_new  2020-04-22 20:42:35.850171208 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed


++ grub2-btrfs-06-subvol-mount.patch ++
--- /var/tmp/diff_new_pack.qxWsvM/_old  2020-04-22 20:42:35.998171497 +0200
+++ /var/tmp/diff_new_pack.qxWsvM/_new  2020-04-22 20:42:35.998171497 +0200
@@ -3,11 +3,15 @@
 * Fix grub2-install --root-directory does not work for /boot/grub2/ on
   separate btrfs subvolume (boo#1098420) 
 
-Index: grub-2.02/grub-core/fs/btrfs.c
+v3:
+* Fix executable stack on which function trampoline is constructed to support
+  closure (nested function). The closure sematic is replaced.
+
+Index: grub-2.04/grub-core/fs/btrfs.c
 ===
 grub-2.02.orig/grub-core/fs/btrfs.c
-+++ grub-2.02/grub-core/fs/btrfs.c
-@@ -32,6 +32,7 @@
+--- grub-2.04.orig/grub-core/fs/btrfs.c
 grub-2.04/grub-core/fs/btrfs.c
+@@ -43,6 +43,7 @@
  #include 
  #include 
  #include 
@@ -15,7 +19,7 @@
  
  GRUB_MOD_LICENSE ("GPLv3+");
  
-@@ -245,6 +246,12 @@ static grub_err_t
+@@ -263,6 +264,12 @@ static grub_err_t
  grub_btrfs_read_logical (struct grub_btrfs_data *data,
 grub_disk_addr_t addr, void *buf, grub_size_t size,
 int recursion_depth);
@@ -28,7 +32,7 @@
  
  static grub_err_t
  read_sblock (grub_disk_t disk, struct grub_btrfs_superblock *sb)
-@@ -887,9 +894,26 @@ lookup_root_by_name(struct grub_btrfs_da
+@@ -1203,9 +1210,26 @@ lookup_root_by_name(struct grub_btrfs_da
grub_err_t err;
grub_uint64_t tree = 0;
grub_uint8_t type;
@@ -55,7 +59,7 @@
if (err)
return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", 
path);
  
-@@ -1758,11 +1782,20 @@ grub_btrfs_dir (grub_device_t device, co
+@@ -2179,11 +2203,20 @@ grub_btrfs_dir (grub_device_t device, co
int r = 0;
grub_uint64_t tree;
grub_uint8_t type;
@@ -77,7 +81,7 @@
if (err)
  {
grub_btrfs_unmount (data);
-@@ -1864,11 +1897,21 @@ grub_btrfs_open (struct grub_file *file,
+@@ -2285,11 +2318,21 @@ grub_btrfs_open (struct grub_file *file,
struct grub_btrfs_inode inode;
grub_uint8_t type;
struct grub_btrfs_key key_in;
@@ -100,7 +104,7 @@
if (err)
  {
grub_btrfs_unmount (data);
-@@ -2039,6 +2082,150 @@ grub_cmd_btrfs_info (grub_command_t cmd
+@@ -2460,6 +2503,150 @@ grub_cmd_btrfs_info (grub_command_t cmd
return 0;
  }
  
@@ -251,7 +255,7 @@
  static grub_err_t
  get_fs_root(struct grub_btrfs_data *data, grub_uint64_t tree,
  grub_uint64_t objectid, grub_uint64_t offset,
-@@ -2245,6 +2432,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2666,6 +2853,7 @@ static struct grub_fs grub_btrfs_fs = {
  };
  
  static grub_command_t cmd_info;
@@ -259,7 +263,7 @@
  static grub_extcmd_t cmd_list_subvols;
  
  static char *
-@@ -2308,6 +2496,9 @@ GRUB_MOD_INIT (btrfs)
+@@ -2729,6 +2917,9 @@ GRUB_MOD_INIT (btrfs)
cmd_info = grub_register_command("btrfs-info", grub_cmd_btrfs_info,
   "DEVICE",
   "Print BtrFS info about DEVICE.");
@@ -269,10 +273,10 @@
cmd_list_subvols = grub_register_extcmd("btrfs-list-subvols",
 grub_cmd_btrfs_list_subvols, 0,
 "[-p|-n] [-o var] DEVICE",
-Index: grub-2.02/grub-core/osdep/linux/getroot.c
+Index: grub-2.04/grub-core/osdep/linux/getroot.c
 ===
 grub-2.02.orig/grub-core/osdep/linux/getroot.c
-+++ 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-04-13 12:51:36

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3248 (New)


Package is "grub2"

Mon Apr 13 12:51:36 2020 rev:218 rq:792409 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-03-25 
23:43:46.988003154 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.3248/grub2.changes2020-04-13 
12:51:41.240606329 +0200
@@ -1,0 +2,7 @@
+Tue Mar 24 08:17:33 UTC 2020 - Michael Chang 
+
+- Fix GCC 10 build fail (bsc#1158189)
+  * 0001-mdraid1x_linux-Fix-gcc10-error-Werror-array-bounds.patch
+  * 0002-zfs-Fix-gcc10-error-Werror-zero-length-bounds.patch
+
+---

New:

  0001-mdraid1x_linux-Fix-gcc10-error-Werror-array-bounds.patch
  0002-zfs-Fix-gcc10-error-Werror-zero-length-bounds.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.H8eep8/_old  2020-04-13 12:51:43.860607470 +0200
+++ /var/tmp/diff_new_pack.H8eep8/_new  2020-04-13 12:51:43.864607473 +0200
@@ -291,6 +291,9 @@
 Patch601:   risc-v-fix-computation-of-pc-relative-relocation-offset.patch
 Patch602:   risc-v-add-clzdi2-symbol.patch
 Patch603:   grub-install-define-default-platform-for-risc-v.patch
+# Fix gcc-10 build fail
+Patch610:   0001-mdraid1x_linux-Fix-gcc10-error-Werror-array-bounds.patch
+Patch611:   0002-zfs-Fix-gcc10-error-Werror-zero-length-bounds.patch
 # bsc#1166409 - Grub netbooting does not search for grub.cfg files with mac
 # address or ip address in filename
 Patch700:   0001-normal-Move-common-datetime-functions-out-of-the-nor.patch
@@ -594,6 +597,8 @@
 %patch601 -p1
 %patch602 -p1
 %patch603 -p1
+%patch610 -p1
+%patch611 -p1
 %patch700 -p1
 %patch701 -p1
 %patch702 -p1

++ 0001-mdraid1x_linux-Fix-gcc10-error-Werror-array-bounds.patch ++
>From fe8a83722bf1af7ea3949e6d96e7906407f78d5c Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Wed, 25 Mar 2020 13:52:51 +0800
Subject: [PATCH 1/2] mdraid1x_linux: Fix gcc10 error -Werror=array-bounds

We bumped into the build error while testing gcc-10 pre-release.

../../grub-core/disk/mdraid1x_linux.c: In function 'grub_mdraid_detect':
../../grub-core/disk/mdraid1x_linux.c:181:15: error: array subscript  
is outside array bounds of 'grub_uint16_t[0]' {aka 'short unsigned int[0]'} 
[-Werror=array-bounds]
  181 |  (char *) _roles[grub_le_to_cpu32 (sb.dev_number)]
  |   ^~~
../../grub-core/disk/mdraid1x_linux.c:98:17: note: while referencing 'dev_roles'
   98 |   grub_uint16_t dev_roles[0]; /* Role in array, or 0x for a spare, 
or 0xfffe for faulty.  */
  | ^
../../grub-core/disk/mdraid1x_linux.c:127:33: note: defined here 'sb'
  127 |   struct grub_raid_super_1x sb;
  | ^~
cc1: all warnings being treated as errors

Apparently gcc issues the warning when trying to access sb.dev_roles
array's member, since it is a zero length array as the last element of
struct grub_raid_super_1x that is allocated sparsely without extra
chunks for the trailing bits, so the warning looks legitimate in this
regard.

As the whole thing here is doing offset computation, it is undue to use
syntax that would imply array member access then take address from it
later. Instead we could accomplish the same thing through basic array
pointer arithmetic to pacify the warning.

Signed-off-by: Michael Chang 
Reviewed-by: Daniel Kiper 
---
 grub-core/disk/mdraid1x_linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grub-core/disk/mdraid1x_linux.c b/grub-core/disk/mdraid1x_linux.c
index 7cc80d3df..c980feba4 100644
--- a/grub-core/disk/mdraid1x_linux.c
+++ b/grub-core/disk/mdraid1x_linux.c
@@ -178,7 +178,7 @@ grub_mdraid_detect (grub_disk_t disk,
return NULL;
 
   if (grub_disk_read (disk, sector, 
- (char *) _roles[grub_le_to_cpu32 
(sb.dev_number)]
+ (char *) (sb.dev_roles + grub_le_to_cpu32 
(sb.dev_number))
  - (char *) ,
  sizeof (role), ))
return NULL;
-- 
2.16.4

++ 0002-zfs-Fix-gcc10-error-Werror-zero-length-bounds.patch ++
>From 30379c2280c5b4514abafc2492e081209a330cb0 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Wed, 25 Mar 2020 14:28:15 +0800
Subject: [PATCH 2/2] zfs: Fix gcc10 error -Werror=zero-length-bounds

We bumped into the build error while testing gcc-10 pre-release.

In file included from ../../include/grub/file.h:22,
from ../../grub-core/fs/zfs/zfs.c:34:

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-03-25 23:43:37

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3160 (New)


Package is "grub2"

Wed Mar 25 23:43:37 2020 rev:217 rq:788095 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-03-12 
22:59:15.375013452 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.3160/grub2.changes2020-03-25 
23:43:46.988003154 +0100
@@ -1,0 +2,15 @@
+Fri Mar 20 10:36:54 UTC 2020 - Michael Chang 
+
+- Backport to support searching for specific config files for netboot
+  (bsc#1166409)
+  * 0001-normal-Move-common-datetime-functions-out-of-the-nor.patch
+  * 0002-kern-Add-X-option-to-printf-functions.patch
+  * 0003-normal-main-Search-for-specific-config-files-for-net.patch
+  * 0004-datetime-Enable-the-datetime-module-for-the-emu-plat.patch
+
+---
+Mon Mar 16 11:42:08 UTC 2020 - Ludwig Nussel 
+
+- move *.module files to separate -debug subpackage (boo#1166578)
+
+---
@@ -4 +19 @@
-- Adjust patch to make EFI detection a runtime decision (bsc#1164385):
+- Fix EFI console detection to make it a runtime decision (bsc#1164385)
@@ -5,0 +21,6 @@
+
+---
+Tue Mar 10 11:59:23 UTC 2020 - Ludwig Nussel 
+
+- Downgrade mtools to Suggests for consistency with xorriso (boo#1165839)
+- remove info requirements, file triggers are used now (boo#1152105)

New:

  0001-normal-Move-common-datetime-functions-out-of-the-nor.patch
  0002-kern-Add-X-option-to-printf-functions.patch
  0003-normal-main-Search-for-specific-config-files-for-net.patch
  0004-datetime-Enable-the-datetime-module-for-the-emu-plat.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.au8itP/_old  2020-03-25 23:43:50.064004161 +0100
+++ /var/tmp/diff_new_pack.au8itP/_new  2020-03-25 23:43:50.072004163 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -291,6 +291,12 @@
 Patch601:   risc-v-fix-computation-of-pc-relative-relocation-offset.patch
 Patch602:   risc-v-add-clzdi2-symbol.patch
 Patch603:   grub-install-define-default-platform-for-risc-v.patch
+# bsc#1166409 - Grub netbooting does not search for grub.cfg files with mac
+# address or ip address in filename
+Patch700:   0001-normal-Move-common-datetime-functions-out-of-the-nor.patch
+Patch701:   0002-kern-Add-X-option-to-printf-functions.patch
+Patch702:   0003-normal-main-Search-for-specific-config-files-for-net.patch
+Patch703:   0004-datetime-Enable-the-datetime-module-for-the-emu-plat.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -300,10 +306,8 @@
 # xorriso not available using grub2-mkrescue (bnc#812681)
 # downgrade to suggest as minimal system can't afford pulling in tcl/tk and 
half of the x11 stack (bsc#1102515)
 Suggests:   libburnia-tools
-Recommends: mtools
+Suggests:   mtools
 %endif
-Requires(post): /sbin/install-info
-Requires(preun):/sbin/install-info
 %if ! 0%{?only_efi:1}
 Requires:   grub2-%{grubarch} = %{version}-%{release}
 %endif
@@ -378,6 +382,20 @@
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for %{platform} systems.
 
+%package %{grubarch}-debug
+Summary:Debug symbols for %{grubarch}
+Group:  System/Boot
+%if %{platform} != emu
+BuildArch:  noarch
+%endif
+Requires:   %{name}-%{grubarch} = %{version}
+
+%description %{grubarch}-debug
+Debug information for %{name}-%{grubarch}
+
+Information on how to debug grub can be found online:
+https://www.cnblogs.com/coryxie/archive/2013/03/12/2956807.html
+
 %endif
 
 %ifarch %{efi}
@@ -408,6 +426,20 @@
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for EFI systems.
 
+%package %{grubefiarch}-debug
+Summary:Debug symbols for %{grubefiarch}
+Group:  System/Boot
+%if %{platform} != emu
+BuildArch:  noarch
+%endif
+Requires:   %{name}-%{grubefiarch} = %{version}
+
+%description %{grubefiarch}-debug
+Debug symbols for %{name}-%{grubefiarch}
+
+Information on how to debug grub can be found online:
+https://www.cnblogs.com/coryxie/archive/2013/03/12/2956807.html
+
 %endif
 
 %ifarch %{ix86} x86_64
@@ -562,6 +594,10 @@
 %patch601 -p1
 %patch602 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-03-12 22:58:59

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.3160 (New)


Package is "grub2"

Thu Mar 12 22:58:59 2020 rev:216 rq:784300 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-02-22 
18:56:31.505184534 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.3160/grub2.changes2020-03-12 
22:59:15.375013452 +0100
@@ -1,0 +2,12 @@
+Thu Mar 12 08:29:55 UTC 2020 - Fabian Vogt 
+
+- Adjust patch to make EFI detection a runtime decision (bsc#1164385):
+  * grub2-SUSE-Add-the-t-hotkey.patch
+
+---
+Fri Feb 28 16:36:57 UTC 2020 - r...@suse.com
+
+- Add secure boot support for s390x.  (jsc#SLE-9425)
+  * grub2-s390x-11-secureboot.patch
+
+---

New:

  grub2-s390x-11-secureboot.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.hG288P/_old  2020-03-12 22:59:17.491014296 +0100
+++ /var/tmp/diff_new_pack.hG288P/_new  2020-03-12 22:59:17.491014296 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -153,7 +153,7 @@
 Summary:Bootloader with support for Linux, Multiboot and more
 License:GPL-3.0-or-later
 Group:  System/Boot
-Url:http://www.gnu.org/software/grub/
+URL:http://www.gnu.org/software/grub/
 Source0:https://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
 Source1:90_persistent
 Source2:grub.default
@@ -279,6 +279,7 @@
 # and/or use fallback entry if default kernel entry removed (bsc#1065349)
 Patch430:   grub2-mkconfig-default-entry-correction.patch
 Patch431:   grub2-s390x-10-keep-network-at-kexec.patch
+Patch432:   grub2-s390x-11-secureboot.patch
 # Support for UEFI Secure Boot on AArch64 (FATE#326541)
 Patch450:   grub2-secureboot-install-signed-grub.patch
 Patch501:   grub2-btrfs-help-on-snapper-rollback.patch
@@ -553,6 +554,7 @@
 %patch421 -p1
 %patch430 -p1
 %patch431 -p1
+%patch432 -p1
 %patch450 -p1
 %patch501 -p1
 %patch510 -p1


++ grub2-SUSE-Add-the-t-hotkey.patch ++
--- /var/tmp/diff_new_pack.hG288P/_old  2020-03-12 22:59:17.595014337 +0100
+++ /var/tmp/diff_new_pack.hG288P/_new  2020-03-12 22:59:17.595014337 +0100
@@ -11,18 +11,21 @@
 hidden option "t" that switches the output device back to the firmware default.
 
 Signed-off-by: Alexander Graf 
-
 ---
 
 v1 -> v2
 
   - use hiddenentry instead of --hidden
 
-diff --git a/Makefile.util.def b/Makefile.util.def
-index f9caccb..d94de92 100644
 a/Makefile.util.def
-+++ b/Makefile.util.def
-@@ -504,6 +504,12 @@ script = {
+v2 -> v3 (by fv...@suse.de)
+
+  - make it a runtime decision (bsc#1164385)
+
+Index: grub-2.04/Makefile.util.def
+===
+--- grub-2.04.orig/Makefile.util.def
 grub-2.04/Makefile.util.def
+@@ -525,6 +525,12 @@ script = {
installdir = grubconf;
  };
  
@@ -35,34 +38,35 @@
  program = {
mansection = 1;
name = grub-mkrescue;
-diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 93a9023..b6ec7e2 100644
 a/util/grub.d/00_header.in
-+++ b/util/grub.d/00_header.in
-@@ -184,6 +184,9 @@ EOF
-   fi
+Index: grub-2.04/util/grub.d/00_header.in
+===
+--- grub-2.04.orig/util/grub.d/00_header.in
 grub-2.04/util/grub.d/00_header.in
+@@ -240,6 +240,10 @@ EOF
fi
  
-+if [ -d /sys/firmware/efi ]; then
-+  echo 'echo "Please press 't' to show the boot menu on this console"'
-+fi
  cat << EOF
++  if [ "\${grub_platform}" = "efi" ]; then
++echo "Please press 't' to show the boot menu on this console"
++  fi
++
set gfxmode=${GRUB_GFXMODE}
load_video
-diff --git a/util/grub.d/95_textmode.in b/util/grub.d/95_textmode.in
-new file mode 100644
-index 000..fa48cf9
+   insmod gfxterm
+Index: grub-2.04/util/grub.d/95_textmode.in
+===
 --- /dev/null
-+++ b/util/grub.d/95_textmode.in
-@@ -0,0 +1,11 @@
 grub-2.04/util/grub.d/95_textmode.in
+@@ -0,0 +1,12 @@
 +#!/bin/sh
 +
-+if [ -d /sys/firmware/efi ]; then
-+echo "
-+# On EFI systems we can only have graphics *or* serial, so allow the user
-+# to switch between the two
-+

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-02-22 18:56:29

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.26092 (New)


Package is "grub2"

Sat Feb 22 18:56:29 2020 rev:215 rq:777573 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2020-02-14 
16:26:53.127239858 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.26092/grub2.changes   2020-02-22 
18:56:31.505184534 +0100
@@ -1,0 +2,7 @@
+Tue Feb 18 08:43:30 UTC 2020 - Michael Chang 
+
+- Fix grub hangs after loading rogue image without valid signature for uefi
+  secure boot (bsc#1159102)
+  * grub2-verifiers-fix-system-freeze-if-verify-failed.patch
+
+---

New:

  grub2-verifiers-fix-system-freeze-if-verify-failed.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.LKrt1z/_old  2020-02-22 18:56:33.461188323 +0100
+++ /var/tmp/diff_new_pack.LKrt1z/_new  2020-02-22 18:56:33.461188323 +0100
@@ -223,6 +223,7 @@
 Patch92:grub2-util-30_os-prober-multiple-initrd.patch
 Patch93:grub2-getroot-support-nvdimm.patch
 Patch94:grub2-install-fix-not-a-directory-error.patch
+Patch95:grub2-verifiers-fix-system-freeze-if-verify-failed.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -508,6 +509,7 @@
 %patch92 -p1
 %patch93 -p1
 %patch94 -p1
+%patch95 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-verifiers-fix-system-freeze-if-verify-failed.patch ++
>From d0de8b37f651e13886ef0e0fda285a1294adafe8 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Tue, 18 Feb 2020 18:08:18 +0800
Subject: [PATCH] verifiers: Fix calling uninitialized function pointer

The necessary check for NULL before use of function ver->close is not
taking place in the failure path. This patch simply adds the missing
check and fixes the problem that GRUB hangs indefinitely after booting
rogue image without valid signature if secure boot is turned on.

Now it displays like this for booting rogue UEFI image:

  error: bad shim signature
  error: you need to load the kernel first

  Press any key to continue...

and then you can go back to boot menu by pressing any key or after a few
seconds expired.

Signed-off-by: Michael Chang 
Reviewed-by: Javier Martinez Canillas 
Reviewed-by: Daniel Kiper 
---
 grub-core/commands/verifiers.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/grub-core/commands/verifiers.c b/grub-core/commands/verifiers.c
index 0dde48182..7b9297cd3 100644
--- a/grub-core/commands/verifiers.c
+++ b/grub-core/commands/verifiers.c
@@ -196,7 +196,8 @@ grub_verifiers_open (grub_file_t io, enum grub_file_type 
type)
   return ret;
 
  fail:
-  ver->close (context);
+  if (ver->close)
+ver->close (context);
  fail_noclose:
   verified_free (verified);
   grub_free (ret);
-- 
2.16.4

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2020-02-14 16:26:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.26092 (New)


Package is "grub2"

Fri Feb 14 16:26:49 2020 rev:214 rq:770419 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-12-23 
22:36:01.741783484 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.26092/grub2.changes   2020-02-14 
16:26:53.127239858 +0100
@@ -1,0 +2,7 @@
+Tue Feb  4 07:59:40 UTC 2020 - Michael Chang 
+
+- From Stefan Seyfried  : Fix grub2-install fails
+  with "not a directory" error (boo#1161641, bsc#1162403)
+  * grub2-install-fix-not-a-directory-error.patch
+
+---

New:

  grub2-install-fix-not-a-directory-error.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.tjWIXC/_old  2020-02-14 16:26:55.011240880 +0100
+++ /var/tmp/diff_new_pack.tjWIXC/_new  2020-02-14 16:26:55.015240883 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -222,6 +222,7 @@
 Patch85:grub2-getroot-scan-disk-pv.patch
 Patch92:grub2-util-30_os-prober-multiple-initrd.patch
 Patch93:grub2-getroot-support-nvdimm.patch
+Patch94:grub2-install-fix-not-a-directory-error.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -506,6 +507,7 @@
 %patch85 -p1
 %patch92 -p1
 %patch93 -p1
+%patch94 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-install-fix-not-a-directory-error.patch ++
From: Stefan Seyfried 
Subject: Makefile.am: makes sure that ext2/3/4 is tried before minix
References: boo#1161641

I recently came across a strange grub2-install error when building kiwi images
in OBS. The reason is a bug in the minix file system detection. I filed
upstream bug [1].
  
Note I experienced this on SLES15-SP1. The bug is still present in current
Tumbleweed [2]. This bug thus needs fixing in all supported openSUSE releases.
  
The reproducer-script is called as root like

  bash ./grub-bug-57652-reproduce-suse.sh /tmp/grub-test.img /mnt

/tmp needs 1GB of free storage to store the image.

Maybe this would be good enough as a minimal-intrusive fix. It does not fix the
minix detection code, but instead makes sure that ext[234] is tried before
minix.

[1] https://savannah.gnu.org/bugs/index.php?57652
[2] https://bugzilla.opensuse.org/attachment.cgi?id=828118

Index: grub-2.04/Makefile.am
===
--- grub-2.04.orig/Makefile.am
+++ grub-2.04/Makefile.am
@@ -42,8 +42,11 @@ libgrub.pp: grub_script.tab.h grub_scrip
  -D'GRUB_MOD_INIT(x)=@MARKER@x@' $^ > $@ || (rm -f $@; exit 1)
 CLEANFILES += libgrub.pp
 
+# the grep/sed ensures that ext2 gets initialized before minix*
+# see https://savannah.gnu.org/bugs/?57652
 libgrub_a_init.lst: libgrub.pp
cat $< | grep '@MARKER@' | sed 's/@MARKER@\(.*\)@/\1/g' | sort -u > $@ 
|| (rm -f $@; exit 1)
+   if grep ^ext2 $@ >/dev/null; then sed '/ext2/d;/newc/iext2' < $@ > 
$@.tmp && mv $@.tmp $@; fi
 CLEANFILES += libgrub_a_init.lst
 
 libgrub_a_init.c: libgrub_a_init.lst $(top_srcdir)/geninit.sh

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-12-23 22:34:50

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.6675 (New)


Package is "grub2"

Mon Dec 23 22:34:50 2019 rev:213 rq:755447 version:2.04

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-11-03 
11:24:43.328902797 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.6675/grub2.changes2019-12-23 
22:36:01.741783484 +0100
@@ -1,0 +2,10 @@
+Wed Nov 27 17:09:42 UTC 2019 - o...@aepfle.de
+
+- Correct awk pattern in 20_linux_xen (bsc#900418, bsc#1157912)
+- Correct linux and initrd handling in 20_linux_xen (bsc#1157912)
+  M grub2-efi-xen-cfg-unquote.patch
+  M grub2-efi-xen-chainload.patch
+  M grub2-efi-xen-cmdline.patch
+  M grub2-efi-xen-removable.patch
+
+---



Other differences:
--

++ grub2-efi-xen-cfg-unquote.patch ++
--- /var/tmp/diff_new_pack.ou7zQx/_old  2019-12-23 22:36:03.405784206 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new  2019-12-23 22:36:03.409784208 +0100
@@ -44,7 +44,7 @@
 +  print sep[0]
 +  for (i in words) {
 +w = words[i]
-+if (w ~ /^\$?\"/) {
++if (w ~ /^\$?"/) {
 +  # Double-quoted string
 +  patsplit(w, segs, var"|"dqesc, ssep)
 +  print ssep[0]
@@ -87,6 +87,6 @@
 -  kernel=${basename} root=${linux_root_device_thisversion} ${args}
 +  options=${xen_args_unq}
 +  kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
-   ramdisk=${initrd}
+   ramdisk=${initrd_real}
EOF
  message="$(gettext_printf "Loading Xen %s with Linux %s ..." 
${xen_version} ${version})"

++ grub2-efi-xen-chainload.patch ++
--- /var/tmp/diff_new_pack.ou7zQx/_old  2019-12-23 22:36:03.413784209 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new  2019-12-23 22:36:03.413784209 +0100
@@ -119,7 +119,7 @@
 +  [$section]
 +  options=${xen_args}
 +  kernel=${basename} root=${linux_root_device_thisversion} ${args}
-+  ramdisk=${initrd}
++  ramdisk=${initrd_real}
 +  EOF
 +message="$(gettext_printf "Loading Xen %s with Linux %s ..." 
${xen_version} ${version})"
 +sed "s/^/$submenu_indentation/" <<-EOF
@@ -127,7 +127,7 @@
 +  chainloader  \$cmdpath/${xen_basename} ${xen_basename} $section
 +  }
 +  EOF
-+for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd}; do
++for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd_real}; do
 +  cp --preserve=timestamps $f $efi_dir
 +  echo $(basename $f) >> $efi_dir/grub.xen-files
 +done

++ grub2-efi-xen-cmdline.patch ++
--- /var/tmp/diff_new_pack.ou7zQx/_old  2019-12-23 22:36:03.421784212 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new  2019-12-23 22:36:03.421784212 +0100
@@ -24,4 +24,4 @@
 +  chainloader  \$cmdpath/${xen_basename} ${xen_basename} 
${SUSE_CMDLINE_XENEFI} $section
}
EOF
- for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd}; do
+ for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd_real}; do

++ grub2-efi-xen-removable.patch ++
--- /var/tmp/diff_new_pack.ou7zQx/_old  2019-12-23 22:36:03.429784217 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new  2019-12-23 22:36:03.429784217 +0100
@@ -57,7 +57,7 @@
awk '
 @@ -234,10 +208,15 @@ linux_entry ()
kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
-   ramdisk=${initrd}
+   ramdisk=${initrd_real}
EOF
 +if [ -z "${prepare_efi_cache}" ]; then
 +  grub_device_efi="`${grub_probe} --target=device /boot/efi`"
@@ -71,7 +71,7 @@
 +  chainloader  ${rel_efi_dir}/${xen_basename} ${xen_basename} 
${SUSE_CMDLINE_XENEFI} $section
}
EOF
- for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd}; do
+ for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} 
${dirname}/${basename} ${dirname}/${initrd_real}; do
 @@ -318,6 +297,7 @@ else
  done
  fi

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-09-23 12:00:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.7948 (New)


Package is "grub2"

Mon Sep 23 12:00:21 2019 rev:209 rq:730301 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-07-23 
22:32:22.419033347 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.7948/grub2.changes2019-09-23 
12:00:22.501975068 +0200
@@ -1,0 +2,6 @@
+Fri Aug 16 04:51:16 UTC 2019 - Michael Chang 
+
+- Fix fallback embed doesn't work when no post mbr gap at all (boo#1142229)
+  * Refresh grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
+
+---



Other differences:
--

++ grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch ++
--- /var/tmp/diff_new_pack.Qphmzb/_old  2019-09-23 12:00:25.189974624 +0200
+++ /var/tmp/diff_new_pack.Qphmzb/_new  2019-09-23 12:00:25.189974624 +0200
@@ -1,8 +1,8 @@
-Index: grub-2.02~beta2/util/setup.c
+Index: grub-2.02/util/setup.c
 ===
 grub-2.02~beta2.orig/util/setup.c
-+++ grub-2.02~beta2/util/setup.c
-@@ -501,8 +501,42 @@ SETUP (const char *dir,
+--- grub-2.02.orig/util/setup.c
 grub-2.02/util/setup.c
+@@ -511,8 +511,42 @@ SETUP (const char *dir,
err = grub_util_ldm_embed (dest_dev->disk, , maxsec,
 GRUB_EMBED_PCBIOS, );
  else if (ctx.dest_partmap)
@@ -12,7 +12,7 @@
 +err = ctx.dest_partmap->embed (dest_dev->disk, , maxsec,
 + GRUB_EMBED_PCBIOS, );
 +#ifdef GRUB_SETUP_BIOS
-+if (err == GRUB_ERR_OUT_OF_RANGE
++if ((err == GRUB_ERR_OUT_OF_RANGE || err == GRUB_ERR_FILE_NOT_FOUND)
 +&& dest_dev->disk->id == root_dev->disk->id
 +&& dest_dev->disk->dev->id == root_dev->disk->dev->id)
 +  {
@@ -47,7 +47,7 @@
  else
err = fs->embed (dest_dev, , maxsec,
   GRUB_EMBED_PCBIOS, );
-@@ -584,7 +618,7 @@ SETUP (const char *dir,
+@@ -594,7 +628,7 @@ SETUP (const char *dir,
  
  /* Write the core image onto the disk.  */
  for (i = 0; i < nsec; i++)

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-07-23 22:32:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.4126 (New)


Package is "grub2"

Tue Jul 23 22:32:21 2019 rev:208 rq:716998 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-07-16 
08:37:41.851098322 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.4126/grub2.changes2019-07-23 
22:32:22.419033347 +0200
@@ -1,0 +2,6 @@
+Thu Jul 18 09:54:14 UTC 2019 - mch...@suse.com
+
+- Revert grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch until merged by
+  upstream (bsc#1134287, bsc#1139345, LTC#177836, LTC#174229).
+
+---

Old:

  grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.6fkRxG/_old  2019-07-23 22:32:27.091032382 +0200
+++ /var/tmp/diff_new_pack.6fkRxG/_new  2019-07-23 22:32:27.091032382 +0200
@@ -267,7 +267,6 @@
 Patch213:   grub2-Fix-incorrect-netmask-on-ppc64.patch
 Patch215:   grub2-ppc64-cas-new-scope.patch
 Patch216:   0001-ofnet-Initialize-structs-in-bootpath-parser.patch
-Patch217:   grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
 Patch218:   grub2-ppc64-cas-fix-double-free.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
@@ -581,7 +580,6 @@
 %patch213 -p1
 %patch215 -p1
 %patch216 -p1
-%patch217 -p1
 %patch218 -p1
 %patch233 -p1
 %patch234 -p1

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-07-16 08:37:40

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.1887 (New)


Package is "grub2"

Tue Jul 16 08:37:40 2019 rev:207 rq:714608 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-07-08 
15:01:23.494567813 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.1887/grub2.changes2019-07-16 
08:37:41.851098322 +0200
@@ -1,0 +2,6 @@
+Mon Jun 24 17:56:12 UTC 2019 - Michal Suchanek 
+
+- Fix iteration of FCP LUNs (bsc#1134287, bsc#1139345, LTC#177836, LTC#174229).
+  * Refresh grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
+
+---



Other differences:
--

++ grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch ++
--- /var/tmp/diff_new_pack.HHCYPm/_old  2019-07-16 08:37:44.267097560 +0200
+++ /var/tmp/diff_new_pack.HHCYPm/_new  2019-07-16 08:37:44.267097560 +0200
@@ -1,6 +1,6 @@
-From a7a3ad361b4a75d052e9b4389b44a9f3848f3b9f Mon Sep 17 00:00:00 2001
-From: Diego Domingos 
-Date: Fri, 10 Aug 2018 16:29:50 -0400
+From 3540ebd05d545ba8f55b0f94983aeb82ad9232f3 Mon Sep 17 00:00:00 2001
+From: Diego Domingos 
+Date: Mon, 24 Jun 2019 10:15:56 -0400
 Subject: [PATCH] ieee1275: implement FCP methods for WWPN and LUNs
 
 This patch enables the fcp-targets and fcp-luns methods which are
@@ -9,133 +9,138 @@
 Those methods are specially necessary if the boot directory and grub
 installation are in different FCP disks, allowing the dev_iterate()
 to find the WWPNs and LUNs when called by searchfs.uuid tool.
-
-Signed-off-by: Diego Domingos 
 ---
- grub-core/disk/ieee1275/ofdisk.c | 109 ++-
- 1 file changed, 108 insertions(+), 1 deletion(-)
+ grub-core/disk/ieee1275/ofdisk.c | 117 ++-
+ 1 file changed, 116 insertions(+), 1 deletion(-)
 
-Index: grub-2.02/grub-core/disk/ieee1275/ofdisk.c
-===
 grub-2.02.orig/grub-core/disk/ieee1275/ofdisk.c
-+++ grub-2.02/grub-core/disk/ieee1275/ofdisk.c
-@@ -209,7 +209,118 @@ dev_iterate_real (const char *name, cons
+diff --git a/grub-core/disk/ieee1275/ofdisk.c 
b/grub-core/disk/ieee1275/ofdisk.c
+index 235c0fe..eb907c3 100644
+--- a/grub-core/disk/ieee1275/ofdisk.c
 b/grub-core/disk/ieee1275/ofdisk.c
+@@ -209,7 +209,122 @@ dev_iterate_real (const char *name, const char *path)
  static void
  dev_iterate (const struct grub_ieee1275_devalias *alias)
  {
 -  if (grub_strcmp (alias->type, "vscsi") == 0)
-+  if (grub_strcmp (alias->type, "fcp") == 0){
++  if (grub_strcmp (alias->type, "fcp") == 0)
++  {
 +
-+  /* If we are dealing with fcp devices, we need
-+   * to find the WWPNs and LUNs to iterate them */
-+  grub_ieee1275_ihandle_t ihandle;
-+  grub_uint64_t *ptr_targets, *ptr_luns;
-+  unsigned int i, j, pos;
-+  char *buf, *bufptr;
-+
-+  struct set_fcp_targets_args
-+  {
-+  struct grub_ieee1275_common_hdr common;
-+  grub_ieee1275_cell_t method;
-+  grub_ieee1275_cell_t ihandle;
-+  grub_ieee1275_cell_t catch_result;
-+  grub_ieee1275_cell_t nentries;
-+  grub_ieee1275_cell_t table;
-+  } args_targets;
-+
-+  struct set_fcp_luns_args
-+  {
-+  struct grub_ieee1275_common_hdr common;
-+  grub_ieee1275_cell_t method;
-+  grub_ieee1275_cell_t ihandle;
-+  grub_ieee1275_cell_t wwpn_h;
-+  grub_ieee1275_cell_t wwpn_l;
-+  grub_ieee1275_cell_t catch_result;
-+  grub_ieee1275_cell_t nentries;
-+  grub_ieee1275_cell_t table;
-+  } args_luns;
-+
-+  if(grub_ieee1275_open (alias->path, ))
-+  {
-+  grub_dprintf("disk", "failed to open the disk while iterating 
FCP disk path=%s\n", alias->path);
-+  return;
-+  }
-+
-+  INIT_IEEE1275_COMMON (_targets.common, "call-method", 2, 3);
-+  args_targets.method = (grub_ieee1275_cell_t) "fcp-targets";
-+  args_targets.ihandle = ihandle;
-+  args_targets.table = 0;
-+  args_targets.nentries = 0;
-+
-+  INIT_IEEE1275_COMMON (_luns.common, "call-method", 4, 3);
-+  args_luns.method = (grub_ieee1275_cell_t) "fcp-luns";
-+  args_luns.ihandle = ihandle;
-+  args_luns.table = 0;
-+  args_luns.nentries = 0;
-+
-+  if (IEEE1275_CALL_ENTRY_FN (_targets) == -1)
-+  {
-+  grub_dprintf("disk", "failed to get the targets while iterating FCP 
disk path=%s\n", alias->path);
-+  grub_ieee1275_close(ihandle);
-+  

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-07-08 15:01:22

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.4615 (New)


Package is "grub2"

Mon Jul  8 15:01:22 2019 rev:206 rq:713148 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-06-18 
14:53:33.613509884 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.4615/grub2.changes2019-07-08 
15:01:23.494567813 +0200
@@ -1,0 +2,14 @@
+Mon Jun 17 09:45:49 UTC 2019 - mch...@suse.com
+
+- Use grub2-install to handle signed grub installation for UEFI secure
+  boot and also provide options to override default (bsc#1136601)
+  * grub2-secureboot-install-signed-grub.patch
+- Remove arm64 linuxefi patches as it's not needed for secure boot
+  * 0001-efi-refactor-grub_efi_allocate_pages.patch
+  * 0002-Remove-grub_efi_allocate_pages.patch
+  * 0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
+  * 0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
+  * 0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
+  * 0006-Add-support-for-EFI-handover-on-ARM64.patch
+
+---

Old:

  0001-efi-refactor-grub_efi_allocate_pages.patch
  0002-Remove-grub_efi_allocate_pages.patch
  0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
  0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
  0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
  0006-Add-support-for-EFI-handover-on-ARM64.patch

New:

  grub2-secureboot-install-signed-grub.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.RmfBvZ/_old  2019-07-08 15:01:31.866580470 +0200
+++ /var/tmp/diff_new_pack.RmfBvZ/_new  2019-07-08 15:01:31.870580477 +0200
@@ -305,12 +305,7 @@
 Patch430:   grub2-mkconfig-default-entry-correction.patch
 Patch431:   grub2-s390x-10-keep-network-at-kexec.patch
 # Support for UEFI Secure Boot on AArch64 (FATE#326541)
-Patch450:   0001-efi-refactor-grub_efi_allocate_pages.patch
-Patch451:   0002-Remove-grub_efi_allocate_pages.patch
-Patch452:   0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
-Patch453:   0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
-Patch454:   0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
-Patch455:   0006-Add-support-for-EFI-handover-on-ARM64.patch
+Patch450:   grub2-secureboot-install-signed-grub.patch
 # Use pkg-config to find Freetype2
 Patch500:   grub2-freetype-pkgconfig.patch
 Patch501:   grub2-btrfs-help-on-snapper-rollback.patch
@@ -618,11 +613,6 @@
 %patch430 -p1
 %patch431 -p1
 %patch450 -p1
-%patch451 -p1
-%patch452 -p1
-%patch453 -p1
-%patch454 -p1
-%patch455 -p1
 %patch500 -p1
 %patch501 -p1
 %patch510 -p1
@@ -747,7 +737,7 @@
 PXE_MODULES="efinet tftp http"
 CRYPTO_MODULES="luks gcry_rijndael gcry_sha1 gcry_sha256"
 
-%ifarch x86_64 aarch64
+%ifarch x86_64
 CD_MODULES="${CD_MODULES} linuxefi" 
 %else
 CD_MODULES="${CD_MODULES} linux" 


++ grub2-secureboot-install-signed-grub.patch ++
>From 1ff2f31d12f7235423a1eb8a117e0c6f8b2f41c7 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Tue, 4 Jun 2019 12:32:35 +0800
Subject: [PATCH] grub-install: handle signed grub installation on arm64-efi

Use grub2-install to handle signed grub installation for arm64 UEFI secure
boot, the default behavior is auto, which will install signed grub whenever
detected.

Two options, --suse-force-signed and --suse-inhibit-signed, can be used to
override the default auto detecting behavior. The former will force to use
prebuilt signed image and thus will fail if missing, the latter will always use
'mkimage' to create unsigned core image per the user's running environment.

Signed-off-by: Michael Chang 
---
 util/grub-install.c | 86 -
 1 file changed, 85 insertions(+), 1 deletion(-)

Index: grub-2.02/util/grub-install.c
===
--- grub-2.02.orig/util/grub-install.c
+++ grub-2.02/util/grub-install.c
@@ -84,6 +84,15 @@ static int suse_enable_tpm = 0;
 
 enum
   {
+SIGNED_GRUB_INHIBIT,
+SIGNED_GRUB_AUTO,
+SIGNED_GRUB_FORCE
+  };
+
+static int signed_grub_mode = SIGNED_GRUB_AUTO;
+
+enum
+  {
 OPTION_BOOT_DIRECTORY = 0x301,
 OPTION_ROOT_DIRECTORY,
 OPTION_TARGET,
@@ -108,6 +117,8 @@ enum
 OPTION_NO_BOOTSECTOR,
 OPTION_NO_RS_CODES,
 OPTION_SUSE_ENABLE_TPM,
+OPTION_SUSE_FORCE_SIGNED,
+OPTION_SUSE_INHIBIT_SIGNED,
 OPTION_MACPPC_DIRECTORY,
 OPTION_ZIPL_DIRECTORY,
 OPTION_LABEL_FONT,
@@ -237,6 +248,14 @@ 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-06-18 14:53:30

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.4811 (New)


Package is "grub2"

Tue Jun 18 14:53:30 2019 rev:205 rq:709900 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-05-22 
10:53:52.755206435 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.4811/grub2.changes2019-06-18 
14:53:33.613509884 +0200
@@ -1,0 +2,8 @@
+Fri Jun 14 06:13:58 UTC 2019 - mch...@suse.com
+
+- Avoid high resolution when trying to keep current mode (bsc#1133842) 
+  * grub2-video-limit-the-resolution-for-fixed-bimap-font.patch
+- Make GRUB_SAVEDEFAULT working with btrfs (bsc#1128592)
+  * grub2-grubenv-in-btrfs-header.patch
+
+---



Other differences:
--

++ grub2-grubenv-in-btrfs-header.patch ++
--- /var/tmp/diff_new_pack.Twm4I6/_old  2019-06-18 14:53:36.309507865 +0200
+++ /var/tmp/diff_new_pack.Twm4I6/_new  2019-06-18 14:53:36.309507865 +0200
@@ -2,6 +2,8 @@
 modify values set from userspace (e.g. "next_entry" set by grub2-once).
 As a workaround use the Btrfs header to store known data of the GRUB 
environment
 block.
+
+v2: export env_block and make sure to use the device of grubenv
 ---
 Index: grub-2.02/grub-core/kern/fs.c
 ===
@@ -447,19 +449,21 @@
 ===
 --- grub-2.02.orig/util/grub.d/00_header.in
 +++ grub-2.02/util/grub.d/00_header.in
-@@ -46,6 +46,11 @@ cat << EOF
+@@ -46,6 +46,13 @@ cat << EOF
  if [ -s \$prefix/grubenv ]; then
load_env
  fi
 +
 +if [ "\${env_block}" ] ; then
++  set env_block="(\${root})\${env_block}"
++  export env_block
 +  load_env -f "\${env_block}"
 +fi
 +
  EOF
  if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
  cat mode->info &&
+-  (!avoid_low_resolution ||
+-   (gop->mode->info->width >= 800 && gop->mode->info->height >= 600)))
++  (!avoid_extreme_resolution ||
++   ((gop->mode->info->width >= 800 && gop->mode->info->height >= 600) &&
++   (gop->mode->info->width <= 1920 && gop->mode->info->height <= 1080
+ {
+   bpp = grub_video_gop_get_bpp (gop->mode->info);
+   if (bpp && ((width == gop->mode->info->width
+@@ -456,9 +464,9 @@ again:
+ 
+   if (!found)
+ {
+-  if (avoid_low_resolution && gop->mode->info)
++  if (avoid_extreme_resolution && gop->mode->info)
+ {
+-  avoid_low_resolution = 0;
++  avoid_extreme_resolution = 0;
+   goto again;
+ }
+   grub_dprintf ("video", "GOP: no mode found\n");
+Index: grub-2.02/grub-core/video/i386/pc/vbe.c
+===
+--- grub-2.02.orig/grub-core/video/i386/pc/vbe.c
 grub-2.02/grub-core/video/i386/pc/vbe.c
+@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width
  {
grub_vbe_get_preferred_mode (, );
if (grub_errno == GRUB_ERR_NONE)
@@ -54,6 +88,3 @@
else
{
  /* Fall back to 640x480.  This 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-05-22 10:53:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.5148 (New)


Package is "grub2"

Wed May 22 10:53:49 2019 rev:204 rq:704131 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-05-09 
10:01:17.851634369 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.5148/grub2.changes2019-05-22 
10:53:52.755206435 +0200
@@ -1,0 +2,18 @@
+Fri May 17 13:57:29 UTC 2019 - r...@suse.com
+
+- Check/refresh zipl-kernel before hibernate on s390x.  (bsc#940457)
+  (Getting rid of hardcoded 'vmlinuz', which failed on PPC as well.)
+  * grub2-systemd-sleep.sh
+
+---
+Fri May 17 12:22:55 UTC 2019 - r...@suse.com
+
+- Try to refresh zipl-kernel on failed kexec.  (bsc#1127293)
+  * grub2-s390x-04-grub2-install.patch
+- Fully support "previous" zipl-kernel,
+  with 'mem=1G' being available on dedicated entries.  (bsc#928131)
+  * grub2-s390x-09-improve-zipl-setup.patch
+- Refresh
+  * grub2-zipl-setup-fix-btrfs-multipledev.patch
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.o7D0xp/_old  2019-05-22 10:53:55.207204188 +0200
+++ /var/tmp/diff_new_pack.o7D0xp/_new  2019-05-22 10:53:55.211204185 +0200
@@ -941,6 +941,8 @@
 for f in module-setup.sh grub2.sh; do
   mv $R%{_datadir}/%{name}/%{grubarch}/dracut-$f $R%{dracutgrubmoddir}/$f
 done
+mv $R%{_datadir}/%{name}/%{grubarch}/dracut-zipl-refresh \
+   $R%{_datadir}/%{name}/zipl-refresh
 rm -f $R%{_sysconfdir}/grub.d/30_os-prober
 
 perl -ni -e '
@@ -1149,6 +1151,7 @@
 %config(noreplace) %{_sysconfdir}/default/zipl2grub.conf.in
 %{dracutlibdir}
 %{_sbindir}/%{name}-zipl-setup
+%{_datadir}/%{name}/zipl-refresh
 %endif
 %{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-mkconfig


++ grub2-s390x-04-grub2-install.patch ++
--- /var/tmp/diff_new_pack.o7D0xp/_old  2019-05-22 10:53:55.571203855 +0200
+++ /var/tmp/diff_new_pack.o7D0xp/_new  2019-05-22 10:53:55.575203851 +0200
@@ -47,27 +47,30 @@
  * dracut-grub2.sh: force read-only '/usr' for kexec.  [bsc#932951]
 V17:
  * grub2-zipl-setup: remove arybase dependency by not referencing $[.  
[bsc#1055280]
+V18:
+ * dracut-zipl-refresh.sh.in: initial submission.  [bsc#1127293]
+ * dracut-grub2.sh: try to call zipl-refresh on failed kexec and drop
+   to an emergency shell otherwise
 
 ---
- Makefile.util.def|   39 +++
- configure.ac |9 
- grub-core/Makefile.core.def  |7 
- grub-core/osdep/basic/no_platform.c  |7 
- grub-core/osdep/unix/platform.c  |   11 
- grub-core/osdep/windows/platform.c   |6 
- include/grub/util/install.h  |4 
- util/grub-install-common.c   |1 
- util/grub-install.c  |   43 +++
- util/s390x/dracut-grub2.sh.in|  110 +
- util/s390x/dracut-module-setup.sh.in |   19 +
- util/s390x/zipl2grub.conf.in |   26 ++
- util/s390x/zipl2grub.pl.in   |  424 
+++
- 13 files changed, 702 insertions(+), 4 deletions(-)
+ Makefile.util.def  |   46 +++
+ configure.ac   |9 
+ grub-core/Makefile.core.def|7 
+ grub-core/osdep/basic/no_platform.c|7 
+ grub-core/osdep/unix/platform.c|   11 
+ grub-core/osdep/windows/platform.c |6 
+ include/grub/util/install.h|4 
+ util/grub-install-common.c |1 
+ util/grub-install.c|   43 +++
+ util/s390x/dracut-grub2.sh.in  |  126 +
+ util/s390x/dracut-module-setup.sh.in   |   19 +
+ util/s390x/dracut-zipl-refresh.sh.in   |  183 ++
+ util/s390x/zipl2grub.conf.in   |   26 ++
+ util/s390x/zipl2grub.pl.in |  423 
+
+ 14 files changed, 908 insertions(+), 3 deletions(-)
 
-Index: grub-2.02/Makefile.util.def
-===
 grub-2.02.orig/Makefile.util.def
-+++ grub-2.02/Makefile.util.def
+--- a/Makefile.util.def
 b/Makefile.util.def
 @@ -352,6 +352,7 @@ program = {
ldadd = grub-core/gnulib/libgnu.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) 
$(LIBGEOM)';
@@ -108,7 +111,7 @@
common = grub-core/kern/emu/argp_common.c;
common = grub-core/osdep/init.c;
  
-@@ -697,6 +702,38 @@ script = {
+@@ -697,6 +702,46 @@ script = {
  };
  
  script = {
@@ -144,10 +147,18 @@
 +};
 +
 +script = {
++  name = dracut-zipl-refresh;
++  common = 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-05-09 10:01:05

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.5148 (New)


Package is "grub2"

Thu May  9 10:01:05 2019 rev:203 rq:700269 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-03-24 
14:55:51.631209293 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.5148/grub2.changes2019-05-09 
10:01:17.851634369 +0200
@@ -1,0 +2,13 @@
+Fri May  3 02:42:27 UTC 2019 - mchang 
+
+- Fix GCC 9 build failure (bsc#1121208)
+  * 0001-cpio-Disable-gcc9-Waddress-of-packed-member.patch
+  * 0002-jfs-Disable-gcc9-Waddress-of-packed-member.patch
+  * 0003-hfs-Fix-gcc9-error-Waddress-of-packed-member.patch
+  * 0004-hfsplus-Fix-gcc9-error-with-Waddress-of-packed-membe.patch
+  * 0005-acpi-Fix-gcc9-error-Waddress-of-packed-member.patch
+  * 0006-usbtest-Disable-gcc9-Waddress-of-packed-member.patch
+  * 0007-chainloader-Fix-gcc9-error-Waddress-of-packed-member.patch
+  * 0008-efi-Fix-gcc9-error-Waddress-of-packed-member.patch
+
+---

New:

  0001-cpio-Disable-gcc9-Waddress-of-packed-member.patch
  0002-jfs-Disable-gcc9-Waddress-of-packed-member.patch
  0003-hfs-Fix-gcc9-error-Waddress-of-packed-member.patch
  0004-hfsplus-Fix-gcc9-error-with-Waddress-of-packed-membe.patch
  0005-acpi-Fix-gcc9-error-Waddress-of-packed-member.patch
  0006-usbtest-Disable-gcc9-Waddress-of-packed-member.patch
  0007-chainloader-Fix-gcc9-error-Waddress-of-packed-member.patch
  0008-efi-Fix-gcc9-error-Waddress-of-packed-member.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.zhWVbx/_old  2019-05-09 10:01:19.779639890 +0200
+++ /var/tmp/diff_new_pack.zhWVbx/_new  2019-05-09 10:01:19.783639901 +0200
@@ -318,6 +318,15 @@
 Patch510:   grub2-video-limit-the-resolution-for-fixed-bimap-font.patch
 # Support long menuentries (FATE#325760)
 Patch511:   grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
+# Fix GCC 9 build failure (bsc#1121208)
+Patch520:   0001-cpio-Disable-gcc9-Waddress-of-packed-member.patch
+Patch521:   0002-jfs-Disable-gcc9-Waddress-of-packed-member.patch
+Patch522:   0003-hfs-Fix-gcc9-error-Waddress-of-packed-member.patch
+Patch523:   0004-hfsplus-Fix-gcc9-error-with-Waddress-of-packed-membe.patch
+Patch524:   0005-acpi-Fix-gcc9-error-Waddress-of-packed-member.patch
+Patch525:   0006-usbtest-Disable-gcc9-Waddress-of-packed-member.patch
+Patch526:   0007-chainloader-Fix-gcc9-error-Waddress-of-packed-member.patch
+Patch527:   0008-efi-Fix-gcc9-error-Waddress-of-packed-member.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -618,6 +627,14 @@
 %patch501 -p1
 %patch510 -p1
 %patch511 -p1
+%patch520 -p1
+%patch521 -p1
+%patch522 -p1
+%patch523 -p1
+%patch524 -p1
+%patch525 -p1
+%patch526 -p1
+%patch527 -p1
 
 %build
 # collect evidence to debug spurious build failure on SLE15

++ 0001-cpio-Disable-gcc9-Waddress-of-packed-member.patch ++
>From 7ea474c68847757d4c67ffc67f7d714b77c41578 Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Thu, 11 Apr 2019 17:14:02 +0800
Subject: [PATCH 1/8] cpio: Disable gcc9 -Waddress-of-packed-member

Disable the -Wadress-of-packaed-member diagnostic for the
grub_cpio_find_file function since the result is found to be false
postive. Any pointers to member of the 'struct head hd' is aligned even
if the structure is packed without paddings.

[   59s] In file included from ../grub-core/fs/cpio.c:51:
[   59s] ../grub-core/fs/cpio_common.c: In function 'grub_cpio_find_file':
[   59s] ../grub-core/fs/cpio_common.c:58:31: error: taking address of packed 
member of 'struct head' may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
[   59s]58 |   data->size = read_number (hd.filesize, ARRAY_SIZE 
(hd.filesize));
[   59s]   | ~~^
[   59s] ../grub-core/fs/cpio_common.c:60:29: error: taking address of packed 
member of 'struct head' may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
[   59s]60 | *mtime = read_number (hd.mtime, ARRAY_SIZE (hd.mtime));
[   59s]   |   ~~^~
[   59s] ../grub-core/fs/cpio_common.c:61:28: error: taking address of packed 
member of 'struct head' may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
[   59s]61 |   modeval = read_number (hd.mode, ARRAY_SIZE (hd.mode));
[   59s]   |  ~~^
[   59s] ../grub-core/fs/cpio_common.c:62:29: error: taking address of packed 
member of 'struct head' may result in 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-03-24 14:55:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.25356 (New)


Package is "grub2"

Sun Mar 24 14:55:49 2019 rev:202 rq:686300 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-03-12 
09:49:49.687580958 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.25356/grub2.changes   2019-03-24 
14:55:51.631209293 +0100
@@ -1,0 +2,16 @@
+Tue Mar 19 06:14:47 UTC 2019 - mchang 
+
+- Use %doc for older products for compatibility, or may end up with
+  unsuccessful build result
+  * grub2.spec
+
+---
+Tue Mar 19 04:18:46 UTC 2019 - mchang 
+
+- Revert grub2-ieee1275-open-raw-mode.patch for regression of crashing lvm on
+  multipath SAN (bsc#1113702)
+  * deleted grub2-ieee1275-open-raw-mode.patch
+- Add exception handling to FCP lun enumeration (bsc#1113702)
+  * grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
+
+---

Old:

  grub2-ieee1275-open-raw-mode.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.BGzs6M/_old  2019-03-24 14:55:56.027208829 +0100
+++ /var/tmp/diff_new_pack.BGzs6M/_new  2019-03-24 14:55:56.083208823 +0100
@@ -265,7 +265,6 @@
 Patch211:   grub2-ppc64-cas-reboot-support.patch
 Patch212:   
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
 Patch213:   grub2-Fix-incorrect-netmask-on-ppc64.patch
-Patch214:   grub2-ieee1275-open-raw-mode.patch
 Patch215:   grub2-ppc64-cas-new-scope.patch
 Patch216:   0001-ofnet-Initialize-structs-in-bootpath-parser.patch
 Patch217:   grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
@@ -576,7 +575,6 @@
 %patch211 -p1
 %patch212 -p1
 %patch213 -p1
-%patch214 -p1
 %patch215 -p1
 %patch216 -p1
 %patch217 -p1
@@ -1100,7 +1098,11 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%if 0%{?suse_version} < 1500
+%doc COPYING
+%else
 %license COPYING
+%endif
 %doc NEWS README
 %doc THANKS TODO ChangeLog
 %doc docs/autoiso.cfg docs/osdetect.cfg


++ grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch ++
--- /var/tmp/diff_new_pack.BGzs6M/_old  2019-03-24 14:55:56.567208772 +0100
+++ /var/tmp/diff_new_pack.BGzs6M/_new  2019-03-24 14:55:56.567208772 +0100
@@ -1,8 +1,7 @@
+From a7a3ad361b4a75d052e9b4389b44a9f3848f3b9f Mon Sep 17 00:00:00 2001
 From: Diego Domingos 
 Date: Fri, 10 Aug 2018 16:29:50 -0400
-Subject: ieee1275: implement FCP methods for WWPN and LUNs
-References: bsc#1093145
-Patch-mainline: not yet
+Subject: [PATCH] ieee1275: implement FCP methods for WWPN and LUNs
 
 This patch enables the fcp-targets and fcp-luns methods which are
 responsible to get WWPNs and LUNs for fibre channel devices.
@@ -13,21 +12,21 @@
 
 Signed-off-by: Diego Domingos 
 ---
- grub-core/disk/ieee1275/ofdisk.c | 89 +++-
- 1 file changed, 88 insertions(+), 1 deletion(-)
+ grub-core/disk/ieee1275/ofdisk.c | 109 ++-
+ 1 file changed, 108 insertions(+), 1 deletion(-)
 
-diff --git a/grub-core/disk/ieee1275/ofdisk.c 
b/grub-core/disk/ieee1275/ofdisk.c
-index 235c0fe..bb213f1 100644
 a/grub-core/disk/ieee1275/ofdisk.c
-+++ b/grub-core/disk/ieee1275/ofdisk.c
-@@ -209,7 +209,94 @@ dev_iterate_real (const char *name, const char *path)
+Index: grub-2.02/grub-core/disk/ieee1275/ofdisk.c
+===
+--- grub-2.02.orig/grub-core/disk/ieee1275/ofdisk.c
 grub-2.02/grub-core/disk/ieee1275/ofdisk.c
+@@ -209,7 +209,118 @@ dev_iterate_real (const char *name, cons
  static void
  dev_iterate (const struct grub_ieee1275_devalias *alias)
  {
 -  if (grub_strcmp (alias->type, "vscsi") == 0)
 +  if (grub_strcmp (alias->type, "fcp") == 0){
 +
-+  /* If we are dealing with fcp devices, we need 
++  /* If we are dealing with fcp devices, we need
 +   * to find the WWPNs and LUNs to iterate them */
 +  grub_ieee1275_ihandle_t ihandle;
 +  grub_uint64_t *ptr_targets, *ptr_luns;
@@ -56,7 +55,11 @@
 +  grub_ieee1275_cell_t table;
 +  } args_luns;
 +
-+  grub_ieee1275_open (alias->path, );
++  if(grub_ieee1275_open (alias->path, ))
++  {
++  grub_dprintf("disk", "failed to open the disk while iterating 
FCP disk path=%s\n", alias->path);
++  return;
++  }
 +
 +  INIT_IEEE1275_COMMON (_targets.common, "call-method", 2, 3);
 +  args_targets.method = (grub_ieee1275_cell_t) "fcp-targets";
@@ -70,41 +73,61 @@
 +  args_luns.table = 0;
 +  

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-03-12 09:49:46

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.28833 (New)


Package is "grub2"

Tue Mar 12 09:49:46 2019 rev:201 rq:683534 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-02-17 
12:18:41.576244210 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes   2019-03-12 
09:49:49.687580958 +0100
@@ -1,0 +2,5 @@
+Wed Feb 20 08:38:55 UTC 2019 - mch...@suse.com
+
+- Fix LOADER_TYPE parsing in grub2-once (boo#1122569)
+
+---



Other differences:
--

++ grub2-once ++
--- /var/tmp/diff_new_pack.txWAVY/_old  2019-03-12 09:49:55.987579702 +0100
+++ /var/tmp/diff_new_pack.txWAVY/_new  2019-03-12 09:49:55.987579702 +0100
@@ -199,17 +199,24 @@
 
 $grub2_dir = "";
 while () {
-if (/^#/) {
-   next
-};
-if (/LOADER_TYPE="(.*)"/) {
-my $bl = $1; 
-if ($bl eq "grub2" || $bl eq "grub2-efi") {
+chomp;
+next if ( /^\s*#/ );
+if ( /LOADER_TYPE=(\'|\"|)([^\'\"\s]+)\1(\s*|\s+#.*)$/ ) {
+dPrint("OK  : $2\n");
+if ($2 eq "grub2" || $2 eq "grub2-efi") {
+# Found grub2 to be the incumbent loader ...
 $grub2_dir = "/boot/grub2";
 $grub2_reboot = "/usr/sbin/grub2-reboot";
 $grub2_editenv = "/usr/bin/grub2-editenv";
+# Note : Here we continues rather than exiting the loop, which
+# results in different behavior than previous "the first wins". Now
+# the latest defined LOADER_TYPE can be used to override any
+# previous one, which is identical to the result of regular shell
+# variable expansion to meet most people's expectation.
 }
-last;
+} else {
+next if ( /^\s*$/ );
+dPrint("SKIP: <$_>\n");
 }
 }
 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-02-17 12:18:40

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.28833 (New)


Package is "grub2"

Sun Feb 17 12:18:40 2019 rev:200 rq:676194 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-02-14 
14:12:47.352238425 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes   2019-02-17 
12:18:41.576244210 +0100
@@ -1,0 +2,6 @@
+Tue Feb 12 08:57:03 UTC 2019 - mch...@suse.com
+
+- Create compatibility sym-link of grub.xen in the old location to which
+  old VM definition is pointing (bsc#1123942)
+
+---
@@ -32 +37,0 @@
-



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.O2w4ns/_old  2019-02-17 12:18:43.480243687 +0100
+++ /var/tmp/diff_new_pack.O2w4ns/_new  2019-02-17 12:18:43.484243686 +0100
@@ -807,6 +807,14 @@
 cd build-xen
 %make_install
 install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/.
+# provide compatibility sym-link for VM definitions pointing to old location
+install -d %{buildroot}%{_libdir}/%{name}/%{grubxenarch}
+ln -srf %{buildroot}%{_datadir}/%{name}/%{grubxenarch}/grub.xen 
%{buildroot}%{_libdir}/%{name}/%{grubxenarch}/grub.xen
+cat <<-EoM >%{buildroot}%{_libdir}/%{name}/%{grubxenarch}/DEPRECATED
+   This directory and its contents was moved to 
%{_datadir}/%{name}/%{grubxenarch}.
+   Individual symbolic links are provided for a smooth transition.
+   Please update your VM definition files to use the new location!
+EoM
 cd ..
 %endif
 
@@ -820,7 +828,7 @@
 %define sysefibasedir %{_datadir}/efi
 %define sysefidir %{sysefibasedir}/%{_target_cpu} 
 install -d %{buildroot}/%{sysefidir}
-ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
%{buildroot}/%{sysefidir}/grub.efi
+ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
%{buildroot}%{sysefidir}/grub.efi
 %ifarch x86_64
 # provide compatibility sym-link for previous shim-install and the like
 install -d %{buildroot}/usr/lib64/efi
@@ -1271,8 +1279,12 @@
 
 %ifarch %{ix86} x86_64
 %files %{grubxenarch}
+%defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubxenarch}
 %{_datadir}/%{name}/%{grubxenarch}/*
+# provide compatibility sym-link for VM definitions pointing to old location
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/%{grubxenarch}
 %endif
 
 %if 0%{?has_systemd:1}

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-02-14 14:12:45

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.28833 (New)


Package is "grub2"

Thu Feb 14 14:12:45 2019 rev:199 rq:673568 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2019-02-06 
15:44:35.571362155 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes   2019-02-14 
14:12:47.352238425 +0100
@@ -7,0 +8,5 @@
+Fri Jan 25 22:20:36 UTC 2019 - Jan Engelhardt 
+
+- Replace old $RPM_* shell vars.
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.CBN27r/_old  2019-02-14 14:12:49.028237594 +0100
+++ /var/tmp/diff_new_pack.CBN27r/_new  2019-02-14 14:12:49.032237592 +0100
@@ -805,29 +805,28 @@
 
 %ifarch %{ix86} x86_64
 cd build-xen
-make DESTDIR=$RPM_BUILD_ROOT install
-install -m 644 grub.xen $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubxenarch}/.
+%make_install
+install -m 644 grub.xen %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/.
 cd ..
 %endif
 
 %ifarch %{efi}
 cd build-efi
-make DESTDIR=$RPM_BUILD_ROOT install
-
-install -m 644 grub.efi grub-tpm.efi 
$RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/.
+%make_install
+install -m 644 grub.efi grub-tpm.efi 
%{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/.
 
 # Create grub.efi link to system efi directory
 # This is for tools like kiwi not fiddling with the path
 %define sysefibasedir %{_datadir}/efi
 %define sysefidir %{sysefibasedir}/%{_target_cpu} 
-install -d $RPM_BUILD_ROOT%{sysefidir}
-ln -sr $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
$RPM_BUILD_ROOT%{sysefidir}/grub.efi
+install -d %{buildroot}/%{sysefidir}
+ln -sr %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
%{buildroot}/%{sysefidir}/grub.efi
 %ifarch x86_64
 # provide compatibility sym-link for previous shim-install and the like
-install -d $RPM_BUILD_ROOT/usr/lib64/efi
-ln -srf $RPM_BUILD_ROOT%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
$RPM_BUILD_ROOT/usr/lib64/efi/grub.efi
-cat <<-EoM > $RPM_BUILD_ROOT/usr/lib64/efi/DEPRECATED
-   This directory and it's contents was moved to %{_datadir}/efi/x86_64.
+install -d %{buildroot}/usr/lib64/efi
+ln -srf %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
%{buildroot}/usr/lib64/efi/grub.efi
+cat <<-EoM >%{buildroot}/usr/lib64/efi/DEPRECATED
+   This directory and its contents was moved to %{_datadir}/efi/x86_64.
Individual symbolic links are provided for a smooth transition and
may vanish at any point in time.  Please use the new location!
 EoM
@@ -836,7 +835,7 @@
 %ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
 export BRP_PESIGN_FILES="%{_datadir}/%{name}/%{grubefiarch}/grub.efi 
%{_datadir}/%{name}/%{grubefiarch}/grub-tpm.efi"
-install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/
+install -m 444 grub.der %{buildroot}/%{sysefidir}/
 %endif
 %endif
 
@@ -845,60 +844,60 @@
 
 %if ! 0%{?only_efi:1}
 cd build
-make DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 cd ..
 %endif
 
 if [ "%{platform}" = "emu" ]; then
   # emu-lite is currently broken (and not needed), don't install!
-  rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite
+  rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite
 elif [ -d build-emu/grub-core ]; then
   cd build-emu/grub-core
-  install -m 755 grub-emu $RPM_BUILD_ROOT%{_bindir}/%{name}-emu
+  install -m 755 grub-emu %{buildroot}/%{_bindir}/%{name}-emu
   if false; then
 # this needs to go to '-emu'-package; until that is ready, don't install!
-install -m 755 grub-emu-lite $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite
+install -m 755 grub-emu-lite %{buildroot}/%{_bindir}/%{name}-emu-lite
   else
-rm -f $RPM_BUILD_ROOT%{_bindir}/%{name}-emu-lite
+rm -f %{buildroot}/%{_bindir}/%{name}-emu-lite
   fi
-  install -m 644 grub-emu.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-emu.1
+  install -m 644 grub-emu.1 %{buildroot}/%{_mandir}/man1/%{name}-emu.1
   cd ../..
 fi
 
 # *.module files are installed with executable bits due to the way grub2 build
 # system works. Clear executable bits to not confuse find-debuginfo.sh
-find $RPM_BUILD_ROOT%{_datadir}/%{name} \
+find %{buildroot}/%{_datadir}/%{name} \
\( -name '*.module' -o -name '*.image' -o -name '*.exec' \) -print0 | \
xargs --no-run-if-empty -0 chmod a-x
 
 # Script that makes part of grub.cfg persist across updates
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/grub.d/
+install -m 755 %{SOURCE1} %{buildroot}/%{_sysconfdir}/grub.d/
 
 # Script to generate memtest86+ menu entry
-install -m 755 %{SOURCE7} 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2019-02-06 15:44:34

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.28833 (New)


Package is "grub2"

Wed Feb  6 15:44:34 2019 rev:198 rq:669452 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-12-27 
00:21:54.820029365 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes   2019-02-06 
15:44:35.571362155 +0100
@@ -1,0 +2,28 @@
+Mon Jan 28 14:12:05 UTC 2019 - Guillaume GARDET 
+
+- Add patch to fix ARM boot, when kernel become too big:
+  * grub2-move-initrd-upper.patch (boo#1123350)
+
+---
+Fri Jan 25 07:08:32 UTC 2019 - mch...@suse.com
+
+- Support long menu entry by scrolling its text left and right through
+  the key stroke ctrl+l and ctrl+r (FATE#325760) 
+  * grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
+
+---
+Thu Jan 24 09:26:09 UTC 2019 - mch...@suse.com
+
+- Improved hiDPI device support (FATE#326680)
+  * grub2-video-limit-the-resolution-for-fixed-bimap-font.patch 
+
+---
+Wed Jan 23 10:44:09 UTC 2019 - r...@suse.com
+
+- Build platform-packages 'noarch' and move to '/usr/share/efi'
+  for SUSE Manager.  (FATE#326960)
+  * grub2-efi-xen-chainload.patch (bsc#1122563)
+  * grub2-efi-xen-removable.patch (refresh)
+
+
+---

Old:

  grub2-rpmlintrc

New:

  grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
  grub2-move-initrd-upper.patch
  grub2-video-limit-the-resolution-for-fixed-bimap-font.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Rxahg6/_old  2019-02-06 15:44:37.159361188 +0100
+++ /var/tmp/diff_new_pack.Rxahg6/_new  2019-02-06 15:44:37.159361188 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,11 +12,13 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 # needssslcertforbuild
 
 
+%define _binaries_in_noarch_package_terminate_build 0
+
 Name:   grub2
 %ifarch x86_64 ppc64
 BuildRequires:  gcc-32bit
@@ -28,13 +30,13 @@
 %endif
 BuildRequires:  automake
 BuildRequires:  bison
-BuildRequires:  dejavu-fonts
 BuildRequires:  device-mapper-devel
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  freetype2-devel
 BuildRequires:  fuse-devel
 %if 0%{?suse_version} >= 1140
+BuildRequires:  dejavu-fonts
 BuildRequires:  gnu-unifont
 %endif
 BuildRequires:  help2man
@@ -44,7 +46,11 @@
 %else
 BuildRequires:  texinfo
 %endif
-BuildRequires:  python3
+%if %{defined pythons}
+BuildRequires:  %{pythons}
+%else
+BuildRequires:  python
+%endif
 BuildRequires:  xz-devel
 %ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
@@ -127,7 +133,7 @@
 %endif
 
 %if %{platform} == emu
-# force %{emu} to 1, e.g. for s390
+# force %%{emu} to 1, e.g. for s390
 %define emu 1
 %endif
 
@@ -161,7 +167,6 @@
 # required hook for systemd-sleep (bsc#941758)
 Source17:   grub2-systemd-sleep.sh
 Source18:   grub2-check-default.sh
-Source999:  grub2-rpmlintrc
 Source1000: PATCH_POLICY
 Patch1: rename-grub-info-file-to-grub2.patch
 Patch2: grub2-linux.patch
@@ -250,6 +255,8 @@
 # Linux root device related patches
 Patch163:   grub2-zipl-setup-fix-btrfs-multipledev.patch
 Patch164:   grub2-suse-remove-linux-root-param.patch
+# ARM patches - boo#1123350
+Patch180:   grub2-move-initrd-upper.patch
 # PPC64 LE support
 Patch205:   grub2-ppc64le-disable-video.patch
 Patch207:   grub2-ppc64le-memory-map.patch
@@ -308,6 +315,10 @@
 # Use pkg-config to find Freetype2
 Patch500:   grub2-freetype-pkgconfig.patch
 Patch501:   grub2-btrfs-help-on-snapper-rollback.patch
+# Improved hiDPI device support (FATE#326680)
+Patch510:   grub2-video-limit-the-resolution-for-fixed-bimap-font.patch
+# Support long menuentries (FATE#325760)
+Patch511:   grub2-gfxmenu-support-scrolling-menu-entry-s-text.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -324,6 +335,17 @@
 %if ! 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-12-27 00:21:53

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.28833 (New)


Package is "grub2"

Thu Dec 27 00:21:53 2018 rev:197 rq:660471 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-11-28 
11:11:07.151090993 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.28833/grub2.changes   2018-12-27 
00:21:54.820029365 +0100
@@ -1,0 +2,11 @@
+Thu Dec 20 09:21:27 UTC 2018 - mch...@suse.com
+
+- Support for UEFI Secure Boot on AArch64 (FATE#326541)
+  * 0001-efi-refactor-grub_efi_allocate_pages.patch
+  * 0002-Remove-grub_efi_allocate_pages.patch
+  * 0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
+  * 0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
+  * 0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
+  * 0006-Add-support-for-EFI-handover-on-ARM64.patch
+
+---

New:

  0001-efi-refactor-grub_efi_allocate_pages.patch
  0002-Remove-grub_efi_allocate_pages.patch
  0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
  0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
  0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
  0006-Add-support-for-EFI-handover-on-ARM64.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.IW8RmJ/_old  2018-12-27 00:21:56.440028047 +0100
+++ /var/tmp/diff_new_pack.IW8RmJ/_new  2018-12-27 00:21:56.444028044 +0100
@@ -46,7 +46,7 @@
 %endif
 BuildRequires:  python3
 BuildRequires:  xz-devel
-%ifarch x86_64
+%ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
 BuildRequires:  openssl >= 0.9.8
 BuildRequires:  pesign-obs-integration
@@ -298,6 +298,13 @@
 # and/or use fallback entry if default kernel entry removed (bsc#1065349)
 Patch430:   grub2-mkconfig-default-entry-correction.patch
 Patch431:   grub2-s390x-10-keep-network-at-kexec.patch
+# Support for UEFI Secure Boot on AArch64 (FATE#326541)
+Patch450:   0001-efi-refactor-grub_efi_allocate_pages.patch
+Patch451:   0002-Remove-grub_efi_allocate_pages.patch
+Patch452:   0003-arm64-efi-move-EFI_PAGE-definitions-to-efi-memory.h.patch
+Patch453:   0004-efi-Add-central-copy-of-grub_efi_find_mmap_size.patch
+Patch454:   0005-efi-Add-grub_efi_get_ram_base-function-for-arm64.patch
+Patch455:   0006-Add-support-for-EFI-handover-on-ARM64.patch
 # Use pkg-config to find Freetype2
 Patch500:   grub2-freetype-pkgconfig.patch
 Patch501:   grub2-btrfs-help-on-snapper-rollback.patch
@@ -587,6 +594,12 @@
 %patch421 -p1
 %patch430 -p1
 %patch431 -p1
+%patch450 -p1
+%patch451 -p1
+%patch452 -p1
+%patch453 -p1
+%patch454 -p1
+%patch455 -p1
 %patch500 -p1
 %patch501 -p1
 
@@ -697,7 +710,7 @@
 PXE_MODULES="efinet tftp http"
 CRYPTO_MODULES="luks gcry_rijndael gcry_sha1 gcry_sha256"
 
-%ifarch x86_64
+%ifarch x86_64 aarch64
 CD_MODULES="${CD_MODULES} linuxefi" 
 %else
 CD_MODULES="${CD_MODULES} linux" 
@@ -712,7 +725,7 @@
 #ext2 btrfs normal chain boot configfile linux appleldr minicmd \
 #loadbios reboot halt search font gfxterm
 
-%ifarch x86_64
+%ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
 if test -e %{_sourcedir}/_projectcert.crt ; then
 prjsubject=$(openssl x509 -in %{_sourcedir}/_projectcert.crt -noout 
-subject_hash)
@@ -793,7 +806,7 @@
 install -d $RPM_BUILD_ROOT%{sysefidir}
 ln -sf ../../../%{_libdir}/%{name}/%{grubefiarch}/grub.efi 
$RPM_BUILD_ROOT%{sysefidir}/grub.efi
 
-%ifarch x86_64
+%ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
 export BRP_PESIGN_FILES="%{_libdir}/%{name}/%{grubefiarch}/grub.efi 
%{_libdir}/%{name}/%{grubefiarch}/grub-tpm.efi"
 install -m 444 grub.der $RPM_BUILD_ROOT%{sysefidir}/
@@ -1197,7 +1210,7 @@
 %dir %{sysefidir}
 %{sysefidir}/grub.efi
 
-%ifarch x86_64
+%ifarch x86_64 aarch64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
 %{sysefidir}/grub.der
 %endif

++ 0001-efi-refactor-grub_efi_allocate_pages.patch ++
>From f44433a343f4b10b8682f44937e929fb94dda642 Mon Sep 17 00:00:00 2001
From: Leif Lindholm 
Date: Thu, 3 Aug 2017 11:04:23 +0100
Subject: [PATCH 1/6] efi: refactor grub_efi_allocate_pages

Expose a new function, grub_efi_allocate_pages_real(), making it possible
to specify allocation type and memory type as supported by the UEFI
AllocatePages boot service.

Make grub_efi_allocate_pages() a consumer of the new function,
maintaining its old functionality.

Also delete some left-around #if 1/#else blocks in the affected
functions.

Signed-off-by: Leif 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-11-28 11:10:33

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new.19453 (New)


Package is "grub2"

Wed Nov 28 11:10:33 2018 rev:196 rq:651971 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-10-09 
15:53:08.594355530 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.19453/grub2.changes   2018-11-28 
11:11:07.151090993 +0100
@@ -1,0 +2,12 @@
+Mon Nov 26 06:54:34 UTC 2018 - mch...@suse.com
+
+- Change default tsc calibration method to pmtimer on EFI (bsc#1114754)
+  * 0001-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch
+
+---
+Fri Oct 19 07:17:34 UTC 2018 - mch...@suse.com
+
+- ieee1275: Fix double free in CAS reboot (bsc#955)
+  * grub2-ppc64-cas-fix-double-free.patch
+
+---

New:

  0001-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch
  grub2-ppc64-cas-fix-double-free.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.FlO7zI/_old  2018-11-28 11:11:08.939088473 +0100
+++ /var/tmp/diff_new_pack.FlO7zI/_new  2018-11-28 11:11:08.943088467 +0100
@@ -223,6 +223,7 @@
 Patch91:grub2-msdos-fix-overflow.patch
 Patch92:grub2-util-30_os-prober-multiple-initrd.patch
 Patch93:grub2-getroot-support-nvdimm.patch
+Patch94:0001-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -261,6 +262,7 @@
 Patch215:   grub2-ppc64-cas-new-scope.patch
 Patch216:   0001-ofnet-Initialize-structs-in-bootpath-parser.patch
 Patch217:   grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
+Patch218:   grub2-ppc64-cas-fix-double-free.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
@@ -523,6 +525,7 @@
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1
+%patch94 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -554,6 +557,7 @@
 %patch215 -p1
 %patch216 -p1
 %patch217 -p1
+%patch218 -p1
 %patch233 -p1
 %patch234 -p1
 %patch236 -p1

++ 0001-tsc-Change-default-tsc-calibration-method-to-pmtimer.patch ++
>From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001
From: "David E. Box" 
Date: Fri, 15 Sep 2017 15:37:05 -0700
Subject: [PATCH] tsc: Change default tsc calibration method to pmtimer on EFI
 systems

On efi systems, make pmtimer based tsc calibration the default over the
pit. This prevents Grub from hanging on Intel SoC systems that power gate
the pit.

Signed-off-by: David E. Box 
Reviewed-by: Daniel Kiper 
---
 grub-core/kern/i386/tsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: grub-2.02/grub-core/kern/i386/tsc.c
===
--- grub-2.02.orig/grub-core/kern/i386/tsc.c
+++ grub-2.02/grub-core/kern/i386/tsc.c
@@ -68,7 +68,7 @@ grub_tsc_init (void)
 #ifdef GRUB_MACHINE_XEN
   (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode());
 #elif defined (GRUB_MACHINE_EFI)
-  (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () 
|| grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
+  (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () 
|| grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode());
 #elif defined (GRUB_MACHINE_COREBOOT)
   (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () 
|| calibrate_tsc_hardcode());
 #else

++ grub2-ppc64-cas-fix-double-free.patch ++
Index: grub-2.02/grub-core/kern/ieee1275/openfw.c
===
--- grub-2.02.orig/grub-core/kern/ieee1275/openfw.c
+++ grub-2.02/grub-core/kern/ieee1275/openfw.c
@@ -592,7 +592,7 @@ grub_ieee1275_canonicalise_devname (cons
 
 /* Check if it's a CAS reboot. If so, set the script to be executed.  */
 int
-grub_ieee1275_cas_reboot (char *script)
+grub_ieee1275_cas_reboot (char **script)
 {
   grub_uint32_t ibm_ca_support_reboot;
   grub_uint32_t ibm_fw_nbr_reboots;
@@ -625,16 +625,37 @@ grub_ieee1275_cas_reboot (char *script)
 
   if (ibm_ca_support_reboot || ibm_fw_nbr_reboots)
 {
-  if (! grub_ieee1275_get_property_length (options, "boot-last-label", 
))
-{
-  if (actual > 1024)
-

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-10-09 15:52:40

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Oct  9 15:52:40 2018 rev:195 rq:639871 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-10-02 
19:39:29.146382073 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-10-09 
15:53:08.594355530 +0200
@@ -1,0 +2,13 @@
+Thu Oct  4 06:52:58 UTC 2018 - g...@suse.com
+
+- Support NVDIMM device names (bsc#1110073)
+  * grub2-getroot-support-nvdimm.patch
+
+---
+Wed Oct  3 07:08:14 UTC 2018 - mch...@suse.com
+
+- Translate caret back to space as the initrd stanza could use space to
+  delimit multiple files loaded (bsc#1101942)
+  * grub2-util-30_os-prober-multiple-initrd.patch
+
+---

New:

  grub2-getroot-support-nvdimm.patch
  grub2-util-30_os-prober-multiple-initrd.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.jMTERu/_old  2018-10-09 15:53:10.194353635 +0200
+++ /var/tmp/diff_new_pack.jMTERu/_new  2018-10-09 15:53:10.198353630 +0200
@@ -221,6 +221,8 @@
 Patch89:0001-xfs-Accept-filesystem-with-sparse-inodes.patch
 Patch90:grub2-binutils2.31.patch
 Patch91:grub2-msdos-fix-overflow.patch
+Patch92:grub2-util-30_os-prober-multiple-initrd.patch
+Patch93:grub2-getroot-support-nvdimm.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -519,6 +521,8 @@
 %patch89 -p1
 %patch90 -p1
 %patch91 -p1
+%patch92 -p1
+%patch93 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-getroot-support-nvdimm.patch ++
>From 889c0894d358e48c02f8225426893094f20004e5 Mon Sep 17 00:00:00 2001
From: Gary Lin 
Date: Thu, 4 Oct 2018 10:32:07 +0800
Subject: [PATCH] linux/getroot: Support NVDIMM device names

There are two types of NVDIMM block devices in linux: fsdax and blk.
For fsdax, the device name would be /dev/pmemXpY, /dev/pmemXsY,
/dev/pmemX.YpZ, or /dev/pmemX.YsZ.
For blk, the name would be /dev/ndblkX.YpZ or /dev/ndblkX.YsZ
---
 grub-core/osdep/linux/getroot.c | 44 +
 1 file changed, 44 insertions(+)

diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 8776009..d2ab60f 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -1082,6 +1082,50 @@ grub_util_part_to_disk (const char *os_dev, struct stat 
*st,
  *pp = '\0';
  return path;
}
+
+  /* If this is a NVDIMM device in fsdax mode */
+  if (strncmp ("pmem", p, 4) == 0 && p[4] >= '0' && p[4] <= '9')
+   {
+ /* /dev/pmem[0-9]+(\.[0-9]+)?((p[0-9]+)?|s[0-9]*) */
+ char *pp = strchr (p + 4, 'p');
+ if (pp)
+   {
+ *is_part = 1;
+ *pp = '\0';
+   }
+ else
+   {
+ pp = strchr (p + 4, 's');
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
+   {
+ *is_part = 1;
+ pp[1] = '\0';
+   }
+   }
+ return path;
+   }
+
+  /* If this is a NVDIMM device in block mode */
+  if (strncmp ("ndblk", p, 5) == 0 && p[5] >= '0' && p[5] <= '9')
+   {
+ /* /dev/ndblk[0-9]+\.[0-9]+((p[0-9]+)?|s[0-9]*) */
+ char *pp = strchr (p + 5, 'p');
+ if (pp)
+   {
+ *is_part = 1;
+ *pp = '\0';
+   }
+ else
+   {
+ pp = strchr (p + 5, 's');
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
+   {
+ *is_part = 1;
+ pp[1] = '\0';
+   }
+   }
+ return path;
+   }
 }
 
   return path;
-- 
2.19.0

++ grub2-util-30_os-prober-multiple-initrd.patch ++
Index: grub-2.02/util/grub.d/30_os-prober.in
===
--- grub-2.02.orig/util/grub.d/30_os-prober.in
+++ grub-2.02/util/grub.d/30_os-prober.in
@@ -216,7 +216,7 @@ EOF
 LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
 LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
 LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
-LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
+LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
 LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
 
 if [ -z "${LLABEL}" ] ; 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-10-02 19:39:25

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Oct  2 19:39:25 2018 rev:194 rq:638658 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-09-16 
18:30:23.859442246 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-10-02 
19:39:29.146382073 +0200
@@ -1,0 +2,6 @@
+Wed Sep 26 08:01:05 UTC 2018 - mch...@suse.com
+
+- ieee1275: implement FCP methods for WWPN and LUNs (bsc#1093145)
+  * grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
+
+---

New:

  grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.wJlK2g/_old  2018-10-02 19:39:30.946379403 +0200
+++ /var/tmp/diff_new_pack.wJlK2g/_new  2018-10-02 19:39:30.950379396 +0200
@@ -258,6 +258,7 @@
 Patch214:   grub2-ieee1275-open-raw-mode.patch
 Patch215:   grub2-ppc64-cas-new-scope.patch
 Patch216:   0001-ofnet-Initialize-structs-in-bootpath-parser.patch
+Patch217:   grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
@@ -548,6 +549,7 @@
 %patch214 -p1
 %patch215 -p1
 %patch216 -p1
+%patch217 -p1
 %patch233 -p1
 %patch234 -p1
 %patch236 -p1


++ grub2-ieee1275-FCP-methods-for-WWPN-and-LUNs.patch ++
From: Diego Domingos 
Date: Fri, 10 Aug 2018 16:29:50 -0400
Subject: ieee1275: implement FCP methods for WWPN and LUNs
References: bsc#1093145
Patch-mainline: not yet

This patch enables the fcp-targets and fcp-luns methods which are
responsible to get WWPNs and LUNs for fibre channel devices.

Those methods are specially necessary if the boot directory and grub
installation are in different FCP disks, allowing the dev_iterate()
to find the WWPNs and LUNs when called by searchfs.uuid tool.

Signed-off-by: Diego Domingos 
---
 grub-core/disk/ieee1275/ofdisk.c | 89 +++-
 1 file changed, 88 insertions(+), 1 deletion(-)

diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
index 235c0fe..bb213f1 100644
--- a/grub-core/disk/ieee1275/ofdisk.c
+++ b/grub-core/disk/ieee1275/ofdisk.c
@@ -209,7 +209,94 @@ dev_iterate_real (const char *name, const char *path)
 static void
 dev_iterate (const struct grub_ieee1275_devalias *alias)
 {
-  if (grub_strcmp (alias->type, "vscsi") == 0)
+  if (grub_strcmp (alias->type, "fcp") == 0){
+
+   /* If we are dealing with fcp devices, we need 
+* to find the WWPNs and LUNs to iterate them */
+   grub_ieee1275_ihandle_t ihandle;
+   grub_uint64_t *ptr_targets, *ptr_luns;
+   unsigned int i, j, pos;
+   char *buf, *bufptr;
+
+   struct set_fcp_targets_args
+   {
+   struct grub_ieee1275_common_hdr common;
+   grub_ieee1275_cell_t method;
+   grub_ieee1275_cell_t ihandle;
+   grub_ieee1275_cell_t catch_result;
+   grub_ieee1275_cell_t nentries;
+   grub_ieee1275_cell_t table;
+   } args_targets;
+
+   struct set_fcp_luns_args
+   {
+   struct grub_ieee1275_common_hdr common;
+   grub_ieee1275_cell_t method;
+   grub_ieee1275_cell_t ihandle;
+   grub_ieee1275_cell_t wwpn_h;
+   grub_ieee1275_cell_t wwpn_l;
+   grub_ieee1275_cell_t catch_result;
+   grub_ieee1275_cell_t nentries;
+   grub_ieee1275_cell_t table;
+   } args_luns;
+
+   grub_ieee1275_open (alias->path, );
+
+   INIT_IEEE1275_COMMON (_targets.common, "call-method", 2, 3);
+   args_targets.method = (grub_ieee1275_cell_t) "fcp-targets";
+   args_targets.ihandle = ihandle;
+   args_targets.table = 0;
+   args_targets.nentries = 0;
+
+   INIT_IEEE1275_COMMON (_luns.common, "call-method", 4, 3);
+   args_luns.method = (grub_ieee1275_cell_t) "fcp-luns";
+   args_luns.ihandle = ihandle;
+   args_luns.table = 0;
+   args_luns.nentries = 0;
+
+   IEEE1275_CALL_ENTRY_FN (_targets);
+
+   buf = grub_malloc (grub_strlen (alias->path) + 32 + 32);
+
+   if (!buf)
+   return;
+
+   bufptr = grub_stpcpy (buf, alias->path);
+
+   /* For each WWPN discovered we need to find his associated LUNS
+* calling the fcp-luns method */
+   for (i=0; i< 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-09-16 18:30:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sun Sep 16 18:30:21 2018 rev:193 rq:635552 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-09-03 
10:32:57.364337644 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-09-16 
18:30:23.859442246 +0200
@@ -1,0 +2,13 @@
+Thu Sep 13 08:38:01 UTC 2018 - mch...@suse.com
+
+- Fix broken network interface with random address and same name (bsc#1084508) 
+  * 0001-ofnet-Initialize-structs-in-bootpath-parser.patch
+
+---
+Fri Aug 31 10:06:56 UTC 2018 - mch...@suse.com
+
+- Fix outputting invalid btrfs subvol path on non btrfs filesystem due to bogus
+  return code handling. (bsc#1106381)
+  * modified grub2-btrfs-10-config-directory.patch 
+
+---

New:

  0001-ofnet-Initialize-structs-in-bootpath-parser.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.rQmQO5/_old  2018-09-16 18:30:25.643441535 +0200
+++ /var/tmp/diff_new_pack.rQmQO5/_new  2018-09-16 18:30:25.647441534 +0200
@@ -257,6 +257,7 @@
 Patch213:   grub2-Fix-incorrect-netmask-on-ppc64.patch
 Patch214:   grub2-ieee1275-open-raw-mode.patch
 Patch215:   grub2-ppc64-cas-new-scope.patch
+Patch216:   0001-ofnet-Initialize-structs-in-bootpath-parser.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
@@ -546,6 +547,7 @@
 %patch213 -p1
 %patch214 -p1
 %patch215 -p1
+%patch216 -p1
 %patch233 -p1
 %patch234 -p1
 %patch236 -p1

++ 0001-ofnet-Initialize-structs-in-bootpath-parser.patch ++
>From ddd47864e98cb32a718075bab4462dc56919ec6c Mon Sep 17 00:00:00 2001
From: Julian Andres Klode 
Date: Mon, 3 Sep 2018 10:09:15 +0200
Subject: [PATCH] ofnet: Initialize structs in bootpath parser

Code later on checks if variables inside the struct are
0 to see if they have been set, like if there were addresses
in the bootpath.

The variables were not initialized however, so the check
might succeed with uninitialized data, and a new interface
with random addresses and the same name is added. This causes
$net_default_mac to point to the random one, so, for example,
using that variable to load per-mac config files fails.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1785859
Signed-off-by: Julian Andres Klode 
---
 grub-core/net/drivers/ieee1275/ofnet.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: grub-2.02/grub-core/net/drivers/ieee1275/ofnet.c
===
--- grub-2.02.orig/grub-core/net/drivers/ieee1275/ofnet.c
+++ grub-2.02/grub-core/net/drivers/ieee1275/ofnet.c
@@ -153,8 +153,8 @@ grub_ieee1275_parse_bootpath (const char
   char *comma_char = 0;
   char *equal_char = 0;
   grub_size_t field_counter = 0;
-  grub_net_network_level_address_t client_addr, gateway_addr, subnet_mask;
-  grub_net_link_level_address_t hw_addr;
+  grub_net_network_level_address_t client_addr = {}, gateway_addr = {}, 
subnet_mask = {};
+  grub_net_link_level_address_t hw_addr = {};
   grub_net_interface_flags_t flags = 0;
   struct grub_net_network_level_interface *inter = NULL;
   grub_uint32_t vlantag = 0;

++ grub2-btrfs-10-config-directory.patch ++
--- /var/tmp/diff_new_pack.rQmQO5/_old  2018-09-16 18:30:25.819441465 +0200
+++ /var/tmp/diff_new_pack.rQmQO5/_new  2018-09-16 18:30:25.823441463 +0200
@@ -1,3 +1,11 @@
+v1:
+References: bsc#1063443
+
+v2:
+References: bsc#1106381
+Fix outputting invalid btrfs subvol path on non btrfs filesystem due to bogus
+return code handling.
+
 Index: grub-2.02/grub-core/fs/btrfs.c
 ===
 --- grub-2.02.orig/grub-core/fs/btrfs.c
@@ -35,7 +43,17 @@
dev = grub_device_open (devname);
grub_free (devname);
if (!dev)
-@@ -2655,12 +2641,43 @@ grub_cmd_btrfs_get_default_subvol (struc
+@@ -2625,8 +2611,7 @@ grub_cmd_btrfs_get_default_subvol (struc
+ {
+   grub_device_close (dev);
+   grub_dprintf ("btrfs", "failed to open fs\n");
+-  grub_errno = GRUB_ERR_NONE;
+-  return 0;
++  return grub_errno;
+ }
+ 
+   err = grub_btrfs_get_default_subvolume_id (data, );
+@@ -2655,12 +2640,47 @@ grub_cmd_btrfs_get_default_subvol (struc
  return err;
}
  
@@ -76,12 +94,16 @@
 +return 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-09-03 10:32:55

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Sep  3 10:32:55 2018 rev:192 rq:631916 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-08-13 
09:54:07.974806819 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-09-03 
10:32:57.364337644 +0200
@@ -1,0 +2,6 @@
+Thu Aug 23 08:37:15 UTC 2018 - mch...@suse.com
+
+- Fix overflow in sector count calculation (bsc#1105163)
+  * grub2-msdos-fix-overflow.patch
+
+---

New:

  grub2-msdos-fix-overflow.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.3PbTlz/_old  2018-09-03 10:32:58.652340955 +0200
+++ /var/tmp/diff_new_pack.3PbTlz/_new  2018-09-03 10:32:58.652340955 +0200
@@ -220,6 +220,7 @@
 Patch88:unix-exec-avoid-atexit-handlers-when-child-exits.patch
 Patch89:0001-xfs-Accept-filesystem-with-sparse-inodes.patch
 Patch90:grub2-binutils2.31.patch
+Patch91:grub2-msdos-fix-overflow.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -515,6 +516,7 @@
 %patch88 -p1
 %patch89 -p1
 %patch90 -p1
+%patch91 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-msdos-fix-overflow.patch ++
Index: grub-2.02/grub-core/partmap/msdos.c
===
--- grub-2.02.orig/grub-core/partmap/msdos.c
+++ grub-2.02/grub-core/partmap/msdos.c
@@ -175,9 +175,9 @@ grub_partition_msdos_iterate (grub_disk_
  e = mbr.entries + p.index;
 
  p.start = p.offset
-   + (grub_le_to_cpu32 (e->start)
+   + ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
   << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)) - delta;
- p.len = grub_le_to_cpu32 (e->length)
+ p.len = (grub_uint64_t)grub_le_to_cpu32 (e->length)
<< (disk->log_sector_size - GRUB_DISK_SECTOR_BITS);
  p.msdostype = e->type;
 
@@ -217,7 +217,7 @@ grub_partition_msdos_iterate (grub_disk_
  if (grub_msdos_partition_is_extended (e->type))
{
  p.offset = ext_offset
-   + (grub_le_to_cpu32 (e->start)
+   + ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
   << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS));
  if (! ext_offset)
ext_offset = p.offset;
@@ -301,9 +301,9 @@ pc_partition_map_embed (struct grub_disk
 
  if (!grub_msdos_partition_is_empty (e->type)
  && end > offset
- + (grub_le_to_cpu32 (e->start)
+ + ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
 << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS)))
-   end = offset + (grub_le_to_cpu32 (e->start)
+   end = offset + ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
<< (disk->log_sector_size - GRUB_DISK_SECTOR_BITS));
 
  /* If this is a GPT partition, this MBR is just a dummy.  */
@@ -319,7 +319,7 @@ pc_partition_map_embed (struct grub_disk
  if (grub_msdos_partition_is_extended (e->type))
{
  offset = ext_offset 
-   + (grub_le_to_cpu32 (e->start) 
+   + ((grub_disk_addr_t)grub_le_to_cpu32 (e->start)
   << (disk->log_sector_size - GRUB_DISK_SECTOR_BITS));
  if (! ext_offset)
ext_offset = offset;

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-08-13 09:54:03

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Aug 13 09:54:03 2018 rev:191 rq:628303 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-08-02 
14:49:01.627352530 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-08-13 
09:54:07.974806819 +0200
@@ -1,0 +2,22 @@
+Thu Aug  9 02:48:18 UTC 2018 - mch...@suse.com
+
+- Downgrade libburnia-tools to suggest as minimal system can't afford pulling
+  in tcl/tk and half of the x11 stack (bsc#1102515)
+  * modified grub2.spec
+
+---
+Wed Aug  8 15:17:13 UTC 2018 - dims...@opensuse.org
+
+- Add grub2-binutils2.31.patch: x86-64: Treat R_X86_64_PLT32 as
+  R_X86_64_PC32. Starting from binutils commit bd7ab16b x86-64
+  assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
+  32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32
+  as R_X86_64_PC32.
+
+---
+Mon Aug  6 09:02:45 UTC 2018 - josef.moell...@suse.com
+
+- The grubxenarch packages are now architecture-independent.
+  [bsc#953297, grub2.spec, grub2-rpmlintrc]
+
+---

New:

  grub2-binutils2.31.patch
  grub2-rpmlintrc



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.rknVNM/_old  2018-08-13 09:54:09.170809241 +0200
+++ /var/tmp/diff_new_pack.rknVNM/_new  2018-08-13 09:54:09.170809241 +0200
@@ -161,6 +161,7 @@
 # required hook for systemd-sleep (bsc#941758)
 Source17:   grub2-systemd-sleep.sh
 Source18:   grub2-check-default.sh
+Source999:  grub2-rpmlintrc
 Source1000: PATCH_POLICY
 Patch1: rename-grub-info-file-to-grub2.patch
 Patch2: grub2-linux.patch
@@ -218,6 +219,7 @@
 Patch87:0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
 Patch88:unix-exec-avoid-atexit-handlers-when-child-exits.patch
 Patch89:0001-xfs-Accept-filesystem-with-sparse-inodes.patch
+Patch90:grub2-binutils2.31.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -299,7 +301,8 @@
 Recommends: os-prober
 %endif
 # xorriso not available using grub2-mkrescue (bnc#812681)
-Recommends: libburnia-tools
+# downgrade to suggest as minimal system can't afford pulling in tcl/tk and 
half of the x11 stack (bsc#1102515)
+Suggests:   libburnia-tools
 Recommends: mtools
 %endif
 Requires(post): /sbin/install-info
@@ -414,6 +417,7 @@
 Group:  System/Boot
 Provides:   %{name}-xen = %{version}-%{release}
 Obsoletes:  %{name}-xen < %{version}-%{release}
+BuildArch:  noarch
 
 %description %{grubxenarch}
 The GRand Unified Bootloader (GRUB) is a highly configurable and customizable
@@ -510,6 +514,7 @@
 %patch87 -p1
 %patch88 -p1
 %patch89 -p1
+%patch90 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-binutils2.31.patch ++
>From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" 
Date: Sat, 17 Feb 2018 06:47:28 -0800
Subject: x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32

Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:

https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a

x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
32-bit PC-relative branches.  Grub2 should treat R_X86_64_PLT32 as
R_X86_64_PC32.

Signed-off-by: H.J. Lu 
Reviewed-by: Daniel Kiper 
---
 grub-core/efiemu/i386/loadcore64.c | 1 +
 grub-core/kern/x86_64/dl.c | 1 +
 util/grub-mkimagexx.c  | 1 +
 util/grub-module-verifier.c| 1 +
 4 files changed, 4 insertions(+)

diff --git a/grub-core/efiemu/i386/loadcore64.c 
b/grub-core/efiemu/i386/loadcore64.c
index e49d0b6..18facf4 100644
--- a/grub-core/efiemu/i386/loadcore64.c
+++ b/grub-core/efiemu/i386/loadcore64.c
@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t 
segs,
break;
 
  case R_X86_64_PC32:
+ case R_X86_64_PLT32:
err = grub_efiemu_write_value (addr,
   *addr32 + rel->r_addend
   + sym.off
diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
index 4406906..3a73e6e 100644
--- 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-08-02 14:49:00

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Thu Aug  2 14:49:00 2018 rev:190 rq:625372 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-07-16 
10:41:39.694070729 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-08-02 
14:49:01.627352530 +0200
@@ -1,0 +2,12 @@
+Tue Jul 24 07:56:02 UTC 2018 - mch...@suse.com
+
+- Fix config_directory on btrfs to follow path scheme (bsc#1063443)
+  * grub2-btrfs-10-config-directory.patch 
+- Fix grub2-install --root-directory does not work for /boot/grub2/ on
+  separate btrfs subvolume (boo#1098420) 
+  * grub2-btrfs-06-subvol-mount.patch
+- Fix setparams doesn't work as expected from boot-last-label NVRAM var, after
+   inital CAS reboot on ieee1275 (bsc#1088830)
+  * grub2-ppc64-cas-new-scope.patch 
+
+---

New:

  grub2-btrfs-10-config-directory.patch
  grub2-ppc64-cas-new-scope.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.76jI33/_old  2018-08-02 14:49:03.875356832 +0200
+++ /var/tmp/diff_new_pack.76jI33/_new  2018-08-02 14:49:03.875356832 +0200
@@ -228,6 +228,7 @@
 Patch107:   grub2-btrfs-07-subvol-fallback.patch
 Patch108:   grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
 Patch109:   grub2-btrfs-09-get-default-subvolume.patch
+Patch110:   grub2-btrfs-10-config-directory.patch
 # Support EFI xen loader
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
@@ -252,6 +253,7 @@
 Patch212:   
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
 Patch213:   grub2-Fix-incorrect-netmask-on-ppc64.patch
 Patch214:   grub2-ieee1275-open-raw-mode.patch
+Patch215:   grub2-ppc64-cas-new-scope.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
@@ -517,6 +519,7 @@
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
+%patch110 -p1
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
@@ -535,6 +538,7 @@
 %patch212 -p1
 %patch213 -p1
 %patch214 -p1
+%patch215 -p1
 %patch233 -p1
 %patch234 -p1
 %patch236 -p1


++ grub2-btrfs-06-subvol-mount.patch ++
--- /var/tmp/diff_new_pack.76jI33/_old  2018-08-02 14:49:04.015357100 +0200
+++ /var/tmp/diff_new_pack.76jI33/_new  2018-08-02 14:49:04.015357100 +0200
@@ -1,7 +1,12 @@
-Index: grub-2.02~rc2/grub-core/fs/btrfs.c
+
+V2:
+* Fix grub2-install --root-directory does not work for /boot/grub2/ on
+  separate btrfs subvolume (boo#1098420) 
+
+Index: grub-2.02/grub-core/fs/btrfs.c
 ===
 grub-2.02~rc2.orig/grub-core/fs/btrfs.c
-+++ grub-2.02~rc2/grub-core/fs/btrfs.c
+--- grub-2.02.orig/grub-core/fs/btrfs.c
 grub-2.02/grub-core/fs/btrfs.c
 @@ -32,6 +32,7 @@
  #include 
  #include 
@@ -264,10 +269,10 @@
cmd_list_subvols = grub_register_extcmd("btrfs-list-subvols",
 grub_cmd_btrfs_list_subvols, 0,
 "[-p|-n] [-o var] DEVICE",
-Index: grub-2.02~rc2/grub-core/osdep/linux/getroot.c
+Index: grub-2.02/grub-core/osdep/linux/getroot.c
 ===
 grub-2.02~rc2.orig/grub-core/osdep/linux/getroot.c
-+++ grub-2.02~rc2/grub-core/osdep/linux/getroot.c
+--- grub-2.02.orig/grub-core/osdep/linux/getroot.c
 grub-2.02/grub-core/osdep/linux/getroot.c
 @@ -107,6 +107,14 @@ struct btrfs_ioctl_search_key
grub_uint32_t unused[9];
  };
@@ -447,11 +452,11 @@
  char *
  grub_make_system_path_relative_to_its_root_os (const char *path)
  {
-Index: grub-2.02~rc2/util/grub-install.c
+Index: grub-2.02/util/grub-install.c
 ===
 grub-2.02~rc2.orig/util/grub-install.c
-+++ grub-2.02~rc2/util/grub-install.c
-@@ -1560,6 +1560,55 @@ main (int argc, char *argv[])
+--- grub-2.02.orig/util/grub-install.c
 grub-2.02/util/grub-install.c
+@@ -1560,6 +1560,58 @@ main (int argc, char *argv[])
prefix_drive = xasprintf ("(%s)", grub_drives[0]);
  }
  
@@ -463,13 +468,12 @@
 +  char *subvol = NULL;
 +  char *mount_path = NULL;
 +  char **rootdir_devices = NULL;
-+  char *rootdir_path = grub_util_path_concat (2, "/", rootdir);
++  char *t = grub_util_path_concat (2, "/", rootdir);
++  char *rootdir_path = 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-07-16 10:41:34

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Jul 16 10:41:34 2018 rev:189 rq:623078 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-07-12 
09:17:15.722258652 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-07-16 
10:41:39.694070729 +0200
@@ -1,0 +2,12 @@
+Mon Jul 16 07:53:19 UTC 2018 - mch...@suse.com
+
+- Fix install on xfs error (bsc#1101283)
+  * 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
+
+---
+Tue Jul 10 15:57:50 UTC 2018 - jbo...@suse.cz
+
+- grub2.spec: change %config to %config(noreplace)
+  Don't overwrite user changes to config files on upgrades.
+
+---

New:

  0001-xfs-Accept-filesystem-with-sparse-inodes.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.AMbaAH/_old  2018-07-16 10:41:42.350061868 +0200
+++ /var/tmp/diff_new_pack.AMbaAH/_new  2018-07-16 10:41:42.350061868 +0200
@@ -217,6 +217,7 @@
 Patch86:0001-Fix-packed-not-aligned-error-on-GCC-8.patch
 Patch87:0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
 Patch88:unix-exec-avoid-atexit-handlers-when-child-exits.patch
+Patch89:0001-xfs-Accept-filesystem-with-sparse-inodes.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -506,6 +507,7 @@
 %patch86 -p1
 %patch87 -p1
 %patch88 -p1
+%patch89 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -1032,13 +1034,13 @@
 %config(noreplace) %{_sysconfdir}/default/grub
 %dir %{_sysconfdir}/grub.d
 %{_sysconfdir}/grub.d/README
-%config %{_sysconfdir}/grub.d/00_header
-%config %{_sysconfdir}/grub.d/10_linux
-%config %{_sysconfdir}/grub.d/20_linux_xen
+%config(noreplace) %{_sysconfdir}/grub.d/00_header
+%config(noreplace) %{_sysconfdir}/grub.d/10_linux
+%config(noreplace) %{_sysconfdir}/grub.d/20_linux_xen
 %config(noreplace) %{_sysconfdir}/grub.d/40_custom
-%config %{_sysconfdir}/grub.d/41_custom
-%config %{_sysconfdir}/grub.d/90_persistent
-%config %{_sysconfdir}/grub.d/95_textmode
+%config(noreplace) %{_sysconfdir}/grub.d/41_custom
+%config(noreplace) %{_sysconfdir}/grub.d/90_persistent
+%config(noreplace) %{_sysconfdir}/grub.d/95_textmode
 %{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-mkconfig
 %{_sbindir}/%{name}-once
@@ -1100,7 +1102,7 @@
 %{_mandir}/man1/%{name}-emu.1.*
 %endif
 %ifnarch s390x
-%config %{_sysconfdir}/grub.d/30_os-prober
+%config(noreplace) %{_sysconfdir}/grub.d/30_os-prober
 %{_bindir}/%{name}-glue-efi
 %{_bindir}/%{name}-mount
 %{_sbindir}/%{name}-bios-setup
@@ -1124,11 +1126,11 @@
 %files %{grubarch}
 %defattr(-,root,root,-)
 %ifarch %{ix86} x86_64
-%config %{_sysconfdir}/grub.d/20_memtest86+
+%config(noreplace) %{_sysconfdir}/grub.d/20_memtest86+
 %endif
 %dir %{_libdir}/%{name}/%{grubarch}
 %ifarch ppc ppc64 ppc64le
-%config %{_sysconfdir}/grub.d/20_ppc_terminfo
+%config(noreplace) %{_sysconfdir}/grub.d/20_ppc_terminfo
 # This is intentionally "grub.chrp" and not "%{name}.chrp"
 %{_libdir}/%{name}/%{grubarch}/grub.chrp
 %{_libdir}/%{name}/%{grubarch}/bootinfo.txt
@@ -1183,7 +1185,7 @@
 %defattr(-,root,root,-)
 %dir %{_libdir}/snapper
 %dir %{_libdir}/snapper/plugins
-%config %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
+%config(noreplace) %{_sysconfdir}/grub.d/80_suse_btrfs_snapshot
 %{_libdir}/snapper/plugins/grub
 
 %ifarch %{ix86} x86_64

++ 0001-xfs-Accept-filesystem-with-sparse-inodes.patch ++
>From cda0a857dd7a27cd5d621747464bfe71e8727fff Mon Sep 17 00:00:00 2001
From: Daniel Kiper 
Date: Tue, 29 May 2018 16:16:02 +0200
Subject: [PATCH] xfs: Accept filesystem with sparse inodes

The sparse inode metadata format became a mkfs.xfs default in
xfsprogs-4.16.0, and such filesystems are now rejected by grub as
containing an incompatible feature.

In essence, this feature allows xfs to allocate inodes into fragmented
freespace.  (Without this feature, if xfs could not allocate contiguous
space for 64 new inodes, inode creation would fail.)

In practice, the disk format change is restricted to the inode btree,
which as far as I can tell is not used by grub.  If all you're doing
today is parsing a directory, reading an inode number, and converting
that inode number to a disk location, then ignoring this feature
should be fine, so I've added it to XFS_SB_FEAT_INCOMPAT_SUPPORTED

I did some brief testing of this patch by 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-07-12 09:17:11

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Thu Jul 12 09:17:11 2018 rev:188 rq:620665 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-07-02 
23:28:18.097631910 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-07-12 
09:17:15.722258652 +0200
@@ -1,0 +2,6 @@
+Wed Jul  4 12:55:30 UTC 2018 - josef.moell...@suse.com
+
+- Marked %{_sysconfdir}/grub.d/40_custom as (noreplace)
+  [bsc#1079332, grub2.spec]
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.O6ITKq/_old  2018-07-12 09:17:17.678261389 +0200
+++ /var/tmp/diff_new_pack.O6ITKq/_new  2018-07-12 09:17:17.682261395 +0200
@@ -1035,7 +1035,7 @@
 %config %{_sysconfdir}/grub.d/00_header
 %config %{_sysconfdir}/grub.d/10_linux
 %config %{_sysconfdir}/grub.d/20_linux_xen
-%config %{_sysconfdir}/grub.d/40_custom
+%config(noreplace) %{_sysconfdir}/grub.d/40_custom
 %config %{_sysconfdir}/grub.d/41_custom
 %config %{_sysconfdir}/grub.d/90_persistent
 %config %{_sysconfdir}/grub.d/95_textmode

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-07-02 23:28:14

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Jul  2 23:28:14 2018 rev:187 rq:619524 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-06-25 
11:33:40.144818402 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-07-02 
23:28:18.097631910 +0200
@@ -1,0 +2,8 @@
+Wed Jun 27 08:39:07 UTC 2018 - josef.moell...@suse.com
+
+- Replace "GRUB_DISABLE_LINUX_RECOVERY" by "GRUB_DISABLE_RECOVERY"
+  in /etc/default/grub and remove test from s390x install
+  section in upec file.
+  [bsc#1042433, grub.default, grub2.spec]
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.tb3Geb/_old  2018-07-02 23:28:19.705629930 +0200
+++ /var/tmp/diff_new_pack.tb3Geb/_new  2018-07-02 23:28:19.709629926 +0200
@@ -852,9 +852,6 @@
   sub END() {
 print "\n# on s390x always:\nGRUB_DISABLE_OS_PROBER=true\n";
   }
-  if ( s{^#(GRUB_DISABLE_LINUX_RECOVERY)=\"?(true)\"?}{$1=$2} ) {
-$_ .= "GRUB_DISABLE_RECOVERY=true\n";
-  }
   if ( s{^#?(GRUB_TERMINAL)=(console|gfxterm)}{$1=console} ) {
 $_ .= "GRUB_GFXPAYLOAD_LINUX=text\n";
   }


++ grub.default ++
--- /var/tmp/diff_new_pack.tb3Geb/_old  2018-07-02 23:28:19.845629758 +0200
+++ /var/tmp/diff_new_pack.tb3Geb/_new  2018-07-02 23:28:19.849629753 +0200
@@ -33,7 +33,7 @@
 #GRUB_DISABLE_LINUX_UUID=true
 
 # Uncomment to disable generation of recovery mode menu entries
-#GRUB_DISABLE_LINUX_RECOVERY="true"
+#GRUB_DISABLE_RECOVERY="true"
 
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-06-25 11:33:36

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Jun 25 11:33:36 2018 rev:186 rq:618170 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-05-29 
16:45:56.541799943 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-06-25 
11:33:40.144818402 +0200
@@ -1,0 +2,13 @@
+Wed Jun 20 09:21:48 UTC 2018 - josef.moell...@suse.com
+
+- Added "# needssslcertforbuild", which got lost somewhere,
+  to spec file
+  [grub2.spec]
+
+---
+Fri Jun 15 09:33:17 UTC 2018 - josef.moell...@suse.com
+
+- Replace confusing menu on btrfs "snapper rollback" by help text.
+  [bsc#1027588, grub2-btrfs-help-on-snapper-rollback.patch]
+
+---

New:

  grub2-btrfs-help-on-snapper-rollback.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.M6LzxN/_old  2018-06-25 11:33:42.172743555 +0200
+++ /var/tmp/diff_new_pack.M6LzxN/_new  2018-06-25 11:33:42.176743407 +0200
@@ -288,6 +288,7 @@
 Patch431:   grub2-s390x-10-keep-network-at-kexec.patch
 # Use pkg-config to find Freetype2
 Patch500:   grub2-freetype-pkgconfig.patch
+Patch501:   grub2-btrfs-help-on-snapper-rollback.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -562,6 +563,7 @@
 %patch430 -p1
 %patch431 -p1
 %patch500 -p1
+%patch501 -p1
 
 %build
 # patches above may update the timestamp of grub.texi


++ grub2-btrfs-help-on-snapper-rollback.patch ++
Index: grub-2.02/util/grub.d/00_header.in
===
--- grub-2.02.orig/util/grub.d/00_header.in
+++ grub-2.02/util/grub.d/00_header.in
@@ -417,8 +417,14 @@ if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" =
 # Note: No $snapshot_num on *read-only* rollback!  (bsc#901487)
 cat <

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-05-29 16:45:55

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue May 29 16:45:55 2018 rev:185 rq:612189 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-05-23 
16:06:22.151987350 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-05-29 
16:45:56.541799943 +0200
@@ -1,0 +2,5 @@
+Thu May 24 11:02:04 CEST 2018 - ku...@suse.de
+
+- Use %license instead of %doc [bsc#1082318]
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.iKwo2y/_old  2018-05-29 16:45:58.309734876 +0200
+++ /var/tmp/diff_new_pack.iKwo2y/_new  2018-05-29 16:45:58.313734728 +0200
@@ -1020,7 +1020,8 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYING NEWS README
+%license COPYING
+%doc NEWS README
 %doc THANKS TODO ChangeLog
 %doc docs/autoiso.cfg docs/osdetect.cfg
 %ifarch s390x

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-05-23 16:06:18

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Wed May 23 16:06:18 2018 rev:184 rq:609945 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-05-13 
15:53:22.239934020 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-05-23 
16:06:22.151987350 +0200
@@ -1,0 +2,6 @@
+Wed May 16 09:07:08 UTC 2018 - thomas.bl...@suse.com
+
+- grub2-emu on s390 keep network during kexec boot (bsc#1089493)
+  * grub2-s390x-10-keep-network-at-kexec.patch
+
+---

New:

  grub2-s390x-10-keep-network-at-kexec.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.5ui12b/_old  2018-05-23 16:06:27.195802590 +0200
+++ /var/tmp/diff_new_pack.5ui12b/_new  2018-05-23 16:06:27.203802297 +0200
@@ -285,6 +285,7 @@
 # check if default entry need to be corrected for updated distributor version 
 # and/or use fallback entry if default kernel entry removed (bsc#1065349)
 Patch430:   grub2-mkconfig-default-entry-correction.patch
+Patch431:   grub2-s390x-10-keep-network-at-kexec.patch
 # Use pkg-config to find Freetype2
 Patch500:   grub2-freetype-pkgconfig.patch
 
@@ -559,6 +560,7 @@
 %patch420 -p1
 %patch421 -p1
 %patch430 -p1
+%patch431 -p1
 %patch500 -p1
 
 %build


++ grub2-s390x-10-keep-network-at-kexec.patch ++
Index: grub-2.02/grub-core/loader/emu/linux.c
===
--- grub-2.02.orig/grub-core/loader/emu/linux.c
+++ grub-2.02/grub-core/loader/emu/linux.c
@@ -76,9 +76,10 @@ grub_linux_boot (void)
 grub_fatal (N_("Error trying to perform 'systemctl kexec'"));
 
   /* need to check read-only root before resetting hard!? */
-  grub_printf("Performing 'kexec -e'");
+  grub_printf("Performing 'kexec -e -x'");
   kexec[1] = "-e";
-  kexec[2] = NULL;
+  kexec[2] = "-x";
+  kexec[3] = NULL;
   rc = grub_util_exec(kexec);
   if ( rc != GRUB_ERR_NONE )
 grub_fatal (N_("Error trying to directly perform 'kexec -e'."));

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-05-13 15:53:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sun May 13 15:53:21 2018 rev:183 rq:605634 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-04-22 
14:34:09.908854248 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-05-13 
15:53:22.239934020 +0200
@@ -1,0 +2,6 @@
+Fri May  4 08:07:09 UTC 2018 - idon...@suse.com
+
+- Add grub2-freetype-pkgconfig.patch to fix build with new freetype
+  use pkgconfig to find Freetype libraries.
+
+---

New:

  grub2-freetype-pkgconfig.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.v8QudT/_old  2018-05-13 15:53:24.363856511 +0200
+++ /var/tmp/diff_new_pack.v8QudT/_new  2018-05-13 15:53:24.371856219 +0200
@@ -139,7 +139,7 @@
 Version:2.02
 Release:0
 Summary:Bootloader with support for Linux, Multiboot and more
-License:GPL-3.0+
+License:GPL-3.0-or-later
 Group:  System/Boot
 Url:http://www.gnu.org/software/grub/
 %define rev 20120622
@@ -285,6 +285,8 @@
 # check if default entry need to be corrected for updated distributor version 
 # and/or use fallback entry if default kernel entry removed (bsc#1065349)
 Patch430:   grub2-mkconfig-default-entry-correction.patch
+# Use pkg-config to find Freetype2
+Patch500:   grub2-freetype-pkgconfig.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -557,6 +559,7 @@
 %patch420 -p1
 %patch421 -p1
 %patch430 -p1
+%patch500 -p1
 
 %build
 # patches above may update the timestamp of grub.texi


++ grub2-freetype-pkgconfig.patch ++
Index: grub-2.02/configure.ac
===
--- grub-2.02.orig/configure.ac
+++ grub-2.02/configure.ac
@@ -50,6 +50,10 @@ AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([include/grub/dl.h])
 AC_CONFIG_HEADER([config-util.h])
 
+# Explicitly check for pkg-config early on, since otherwise conditional
+# calls are problematic.
+PKG_PROG_PKG_CONFIG
+
 # Program name transformations
 AC_ARG_PROGRAM
 grub_TRANSFORM([grub-bios-setup])
@@ -1493,29 +1497,21 @@ if test x"$enable_grub_mkfont" = xno ; t
   grub_mkfont_excuse="explicitly disabled"
 fi
 
-if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  AC_CHECK_TOOLS([FREETYPE], [freetype-config])
-  if test "x$FREETYPE" = x ; then
-grub_mkfont_excuse=["need freetype2 library"]
-  fi
-fi
-
 unset ac_cv_header_ft2build_h
 
 if test x"$grub_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  freetype_cflags=`$FREETYPE --cflags`
-  freetype_libs=`$FREETYPE --libs`
-  SAVED_CPPFLAGS="$CPPFLAGS"
-  SAVED_LIBS="$LIBS"
-  CPPFLAGS="$CPPFLAGS $freetype_cflags"
-  LIBS="$LIBS $freetype_libs"
-  AC_CHECK_HEADERS([ft2build.h], [],
-   [grub_mkfont_excuse=["need freetype2 headers"]])
-  AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [], 
[grub_mkfont_excuse=["freetype2 library unusable"]])
-  CPPFLAGS="$SAVED_CPPFLAGS"
-  LIBS="$SAVED_LIBS"
+  PKG_CHECK_MODULES([FREETYPE], [freetype2], [
+SAVED_CPPFLAGS="$CPPFLAGS"
+SAVED_LIBS="$LIBS"
+CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS"
+LIBS="$LIBS $FREETYPE_LIBS"
+AC_CHECK_HEADERS([ft2build.h], [],
+  [grub_mkfont_excuse=["need freetype2 headers"]])
+AC_LINK_IFELSE([AC_LANG_CALL([], [FT_Load_Glyph])], [],
+  [grub_mkfont_excuse=["freetype2 library unusable"]])
+CPPFLAGS="$SAVED_CPPFLAGS"
+LIBS="$SAVED_LIBS"
+  ], [grub_mkfont_excuse=["need freetype2 library"]])
 fi
 
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; 
then
@@ -1527,8 +1523,6 @@ else
 enable_grub_mkfont=no
 fi
 AC_SUBST([enable_grub_mkfont])
-AC_SUBST([freetype_cflags])
-AC_SUBST([freetype_libs])
 
 SAVED_CC="$CC"
 SAVED_CPP="$CPP"
@@ -1558,25 +1552,21 @@ AC_SUBST([BUILD_WORDS_BIGENDIAN])
 
 if test x"$grub_build_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  AC_CHECK_PROGS([BUILD_FREETYPE], [freetype-config])
-  if test "x$BUILD_FREETYPE" = x ; then
-grub_build_mkfont_excuse=["need freetype2 library"]
-  fi
-fi
-
-if test x"$grub_build_mkfont_excuse" = x ; then
-  # Check for freetype libraries.
-  build_freetype_cflags=`$BUILD_FREETYPE --cflags`
-  build_freetype_libs=`$BUILD_FREETYPE --libs`
-  SAVED_CPPFLAGS_2="$CPPFLAGS"
-  SAVED_LIBS="$LIBS"
-  CPPFLAGS="$CPPFLAGS $build_freetype_cflags"
-  LIBS="$LIBS $build_freetype_libs"
-  AC_CHECK_HEADERS([ft2build.h], [],
-   [grub_build_mkfont_excuse=["need freetype2 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-04-22 14:34:07

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sun Apr 22 14:34:07 2018 rev:182 rq:598028 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-04-17 
11:09:32.904835222 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-04-22 
14:34:09.908854248 +0200
@@ -1,0 +2,6 @@
+Tue Apr 17 07:54:15 UTC 2018 - mch...@suse.com
+
+- Fallback to raw mode if Open Firmware returns invalid ihandler (bsc#1071559)
+  * grub2-ieee1275-open-raw-mode.patch
+
+---

New:

  grub2-ieee1275-open-raw-mode.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.bvG2nG/_old  2018-04-22 14:34:11.988778974 +0200
+++ /var/tmp/diff_new_pack.bvG2nG/_new  2018-04-22 14:34:11.992778829 +0200
@@ -245,13 +245,15 @@
 # PPC64 LE support
 Patch205:   grub2-ppc64le-disable-video.patch
 Patch207:   grub2-ppc64le-memory-map.patch
+# PPC 
+Patch210:   0002-Add-Virtual-LAN-support.patch 
+Patch211:   grub2-ppc64-cas-reboot-support.patch
+Patch212:   
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
+Patch213:   grub2-Fix-incorrect-netmask-on-ppc64.patch
+Patch214:   grub2-ieee1275-open-raw-mode.patch
 Patch233:   grub2-use-stat-instead-of-udevadm-for-partition-lookup.patch
 Patch234:   
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
-Patch235:   0002-Add-Virtual-LAN-support.patch 
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
-Patch277:   grub2-ppc64-cas-reboot-support.patch
-Patch278:   
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
-Patch279:   grub2-Fix-incorrect-netmask-on-ppc64.patch
 # Support HTTP Boot IPv4 and IPv6 (fate#320129)
 Patch280:   0001-misc-fix-invalid-character-recongition-in-strto-l.patch
 Patch281:   0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
@@ -522,13 +524,14 @@
 %patch164 -p1
 %patch205 -p1
 %patch207 -p1
+%patch210 -p1
+%patch211 -p1
+%patch212 -p1
+%patch213 -p1
+%patch214 -p1
 %patch233 -p1
 %patch234 -p1
-%patch235 -p1
 %patch236 -p1
-%patch277 -p1
-%patch278 -p1
-%patch279 -p1
 %patch280 -p1
 %patch281 -p1
 %patch282 -p1


++ grub2-ieee1275-open-raw-mode.patch ++
From: dieg...@br.ibm.com
References: bsc#1071559
Patch-Mainline: no

Because Openfirmware returns invalid ihandler when it tries to open a disk
which his first partition is not a supported one by the firmware (Prep, FAT,
ISO), the grub needs to understand when it should open the disk in "raw mode",
appending a ":0" in the end of the device path.

Openfirmware is unable to open disk that contains a unknown first partition
(i.e it is not a PreP, Fat, ISO) ; We needed to open the disk in "raw mode" and
so Grub was required to take care of partitions and contents.

Index: grub-2.02/grub-core/kern/ieee1275/ieee1275.c
===
--- grub-2.02.orig/grub-core/kern/ieee1275/ieee1275.c
+++ grub-2.02/grub-core/kern/ieee1275/ieee1275.c
@@ -19,6 +19,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 #define IEEE1275_PHANDLE_INVALID  ((grub_ieee1275_cell_t) -1)
 #define IEEE1275_IHANDLE_INVALID  ((grub_ieee1275_cell_t) 0)
@@ -458,8 +460,31 @@ grub_ieee1275_open (const char *path, gr
   if (IEEE1275_CALL_ENTRY_FN () == -1)
 return -1;
   *result = args.result;
-  if (args.result == IEEE1275_IHANDLE_INVALID)
-return -1;
+  if (args.result == IEEE1275_IHANDLE_INVALID){
+
+int path_len = grub_strlen(path);
+if ((path[path_len-3] == ':') && (path[path_len-2] == '0')){
+return -1;
+}
+
+char *new_path = grub_malloc(grub_strlen(path) + 3);
+char *optr;
+optr = grub_stpcpy (new_path, path);
+*optr++ = ':';
+*optr++ = '0';
+*optr++ = '\0';
+
+args.path = (grub_ieee1275_cell_t) new_path;
+
+if (IEEE1275_CALL_ENTRY_FN () == -1)
+return -1;
+
+*result = args.result;
+if (args.result == IEEE1275_IHANDLE_INVALID)
+return -1;
+
+  }
+
   return 0;
 }
 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-04-17 11:09:31

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Apr 17 11:09:31 2018 rev:181 rq:597264 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-04-05 
15:27:17.657582172 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-04-17 
11:09:32.904835222 +0200
@@ -1,0 +2,14 @@
+Thu Apr 12 08:41:39 UTC 2018 - mch...@suse.com
+
+- Fix error of essential directory not found on UEFI Xen host (bsc#1085842)
+  * add grub2-efi-xen-removable.patch
+  * rediff grub2-suse-remove-linux-root-param.patch
+
+---
+Tue Apr 10 15:12:28 CEST 2018 - jdelv...@suse.de
+
+- Fix corruption of "grub2-install --help" and grub2-install manual
+  page (bsc#1086670)
+  * unix-exec-avoid-atexit-handlers-when-child-exits.patch
+
+---

New:

  grub2-efi-xen-removable.patch
  unix-exec-avoid-atexit-handlers-when-child-exits.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.ZmqpCO/_old  2018-04-17 11:09:34.592756529 +0200
+++ /var/tmp/diff_new_pack.ZmqpCO/_new  2018-04-17 11:09:34.596756343 +0200
@@ -216,6 +216,7 @@
 Patch85:grub2-getroot-scan-disk-pv.patch
 Patch86:0001-Fix-packed-not-aligned-error-on-GCC-8.patch
 Patch87:0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
+Patch88:unix-exec-avoid-atexit-handlers-when-child-exits.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -231,6 +232,7 @@
 Patch121:   grub2-efi-chainloader-root.patch
 Patch122:   grub2-efi-xen-cmdline.patch
 Patch123:   grub2-efi-xen-cfg-unquote.patch
+Patch124:   grub2-efi-xen-removable.patch
 # Hidden menu entry and hotkey "t" for text console
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
@@ -497,6 +499,7 @@
 %patch85 -p1
 %patch86 -p1
 %patch87 -p1
+%patch88 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -510,6 +513,7 @@
 %patch121 -p1
 %patch122 -p1
 %patch123 -p1
+%patch124 -p1
 %patch140 -p1
 %patch141 -p1
 %patch150 -p1


++ grub2-efi-xen-removable.patch ++
From: Michael Chang 
References: bsc#1085842
Patch-Mainline: no

The grub can be installed with removable option to support booting from
removable media with standard UEFI default file path of the form:
 \EFI\BOOT\BOOT{machine type short-name}.EFI

It does not make use of distributor directory, which becomes a problem for UEFI
Xen installation as it requires that directory to be present for storing xen
stuff like chainloaded hypervisor, xen kernel and so on. Moreover it makes bad
assumption that hypervisor will be chainloaded by grub under the same
directory, which is also not always true.

This patch fixes the problem by ensuring the directory available to Xen
installation if any Xen hypervisor found and independent to grub boot path
$cmdpath to work.

Index: grub-2.02/util/grub.d/20_linux_xen.in
===
--- grub-2.02.orig/util/grub.d/20_linux_xen.in
+++ grub-2.02/util/grub.d/20_linux_xen.in
@@ -91,31 +91,6 @@ esac
 
 title_correction_code=
 
-if [ -d /sys/firmware/efi ]; then
-  is_efi=true
-  err_msg=""
-  efi_dir="/boot/efi/efi/${os}"
-  grub_dir=/boot/@PACKAGE@
-  xen_dir=/usr/lib64/efi
-  for d in $grub_dir $efi_dir $xen_dir; do
-[ ! -d "$d" ] || continue
-err_msg="${err_msg}$ME: Essential directory '$d' not found!\n"
-  done
-  if ! [ -d "$efi_dir" -a -d "$grub_dir" -a -d "$xen_dir" ]; then
-err_msg="${err_msg}$ME: XEN configuration skipped!\n"
-  else
-rm -f  $grub_dir/xen*.cfg
-if [ -s $efi_dir/grub.xen-files ]; then
-  for f in $(sort $efi_dir/grub.xen-files| uniq); do
-   rm -f $efi_dir/$f
-  done
-  : > $efi_dir/grub.xen-files
-fi
-  fi
-else
-  is_efi=false
-fi
-
 grub2_unquote ()
 {
   awk '
@@ -223,10 +198,15 @@ linux_entry ()
kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
ramdisk=${initrd}
EOF
+if [ -z "${prepare_efi_cache}" ]; then
+  grub_device_efi="`${grub_probe} --target=device /boot/efi`"
+  prepare_efi_cache="$(prepare_grub_to_access_device ${grub_device_efi} | 
grub_add_tab)"
+fi
+printf '%s\n' "${prepare_efi_cache}" | sed "s/^/$submenu_indentation/"
 message="$(gettext_printf "Loading Xen %s with 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-04-05 15:27:13

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Thu Apr  5 15:27:13 2018 rev:180 rq:593091 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-03-30 
12:01:03.707534300 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-04-05 
15:27:17.657582172 +0200
@@ -1,0 +2,13 @@
+Mon Apr  2 08:30:05 UTC 2018 - mch...@suse.com
+
+- Fix Nvidia GPU in legacy I/O slot 2 disappears during system
+  startup (bsc#1082914)
+  * 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch 
+
+---
+Fri Mar 30 09:16:06 UTC 2018 - mch...@suse.com
+
+- Fix packed-not-aligned error on GCC 8 (bsc#1084632)
+  * 0001-Fix-packed-not-aligned-error-on-GCC-8.patch
+
+---

New:

  0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
  0001-Fix-packed-not-aligned-error-on-GCC-8.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.W1zjgs/_old  2018-04-05 15:27:19.357520726 +0200
+++ /var/tmp/diff_new_pack.W1zjgs/_new  2018-04-05 15:27:19.361520582 +0200
@@ -214,6 +214,8 @@
 Patch83:grub2-efi-uga-64bit-fb.patch
 Patch84:grub2-s390x-09-improve-zipl-setup.patch
 Patch85:grub2-getroot-scan-disk-pv.patch
+Patch86:0001-Fix-packed-not-aligned-error-on-GCC-8.patch
+Patch87:0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -493,6 +495,8 @@
 %patch83 -p1
 %patch84 -p1
 %patch85 -p1
+%patch86 -p1
+%patch87 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++ 0001-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled-MMIO-da.patch ++
>From 2f06e09673e48f6a91486a8ad38f45c160d537fe Mon Sep 17 00:00:00 2001
From: "mike.tra...@hpe.com" 
Date: Wed, 28 Mar 2018 11:42:18 -0500
Subject: Fix PCIe LER when GRUB2 accesses non-enabled MMIO data from VGA

A GPU inserted into a PCIe I/O slot disappears during system startup.
The problem centers around GRUB and a specific VGA init function in
efi_uga.c.  This causes an LER (link error recorvery) because the MMIO
memory has not been enabled before attempting access.

The fix is to add the same coding used in other VGA drivers, specifically
to add a check to insure that it is indeed a VGA controller.  And then
enable the MMIO address space with the specific bits.

Signed-off-by: Mike Travis 
---
 grub-core/video/efi_uga.c | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/grub-core/video/efi_uga.c b/grub-core/video/efi_uga.c
index 464ede874..32ef7efbc 100644
--- a/grub-core/video/efi_uga.c
+++ b/grub-core/video/efi_uga.c
@@ -95,9 +95,18 @@ find_card (grub_pci_device_t dev, grub_pci_id_t pciid, void 
*data)
 {
   struct find_framebuf_ctx *ctx = data;
   grub_pci_address_t addr;
+  grub_pci_address_t rcaddr;
+  grub_uint32_t subclass;
 
   addr = grub_pci_make_address (dev, GRUB_PCI_REG_CLASS);
-  if (grub_pci_read (addr) >> 24 == 0x3)
+  subclass = (grub_pci_read (addr) >> 16) & 0x;
+  if (subclass != GRUB_PCI_CLASS_SUBCLASS_VGA)
+return 0;
+
+  /* Enable MEM address spaces */
+  rcaddr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
+  grub_pci_write_word (rcaddr, grub_pci_read_word (rcaddr) | 
GRUB_PCI_COMMAND_MEM_ENABLED);
+
 {
   int i;
 
-- 
2.13.6

++ 0001-Fix-packed-not-aligned-error-on-GCC-8.patch ++
>From 721f75ff7de467717658d2de9c20bbb18145790a Mon Sep 17 00:00:00 2001
From: Michael Chang 
Date: Mon, 26 Mar 2018 16:52:34 +0800
Subject: Fix packed-not-aligned error on GCC 8

When building with GCC 8, there are several errors regarding packed-not-aligned.

./include/grub/gpt_partition.h:79:1: error: alignment 1 of 'struct 
grub_gpt_partentry' is less than 8 [-Werror=packed-not-aligned]

This patch tries to fix the build error by cleaning up the ambiguity of placing
aligned structure in a packed one. In "struct grub_btrfs_time" and "struct
grub_gpt_part_type", the aligned attribute seems to be superfluous, and also
has to be packed, to ensure the structure is bit-to-bit mapped to the format
laid on disk. I think we could blame to copy and paste error here for the
mistake. In "struct efi_variable", we have to use grub_efi_packed_guid_t, as
the name suggests. :)

Signed-off-by: Michael Chang 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-03-30 12:01:00

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Fri Mar 30 12:01:00 2018 rev:179 rq:591814 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-03-19 
23:30:34.894228962 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-03-30 
12:01:03.707534300 +0200
@@ -1,0 +2,6 @@
+Mon Mar 26 11:37:13 UTC 2018 - msucha...@suse.com
+
+- Fix incorrect netmask on ppc64 (bsc#1085419)
+  * grub2-Fix-incorrect-netmask-on-ppc64.patch
+
+---

New:

  grub2-Fix-incorrect-netmask-on-ppc64.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.77DXVk/_old  2018-03-30 12:01:05.591466175 +0200
+++ /var/tmp/diff_new_pack.77DXVk/_new  2018-03-30 12:01:05.599465885 +0200
@@ -213,8 +213,7 @@
 Patch82:grub2-diskfilter-support-pv-without-metadatacopies.patch
 Patch83:grub2-efi-uga-64bit-fb.patch
 Patch84:grub2-s390x-09-improve-zipl-setup.patch
-Patch85:
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
-Patch86:grub2-getroot-scan-disk-pv.patch
+Patch85:grub2-getroot-scan-disk-pv.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -247,6 +246,8 @@
 Patch235:   0002-Add-Virtual-LAN-support.patch 
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
 Patch277:   grub2-ppc64-cas-reboot-support.patch
+Patch278:   
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
+Patch279:   grub2-Fix-incorrect-netmask-on-ppc64.patch
 # Support HTTP Boot IPv4 and IPv6 (fate#320129)
 Patch280:   0001-misc-fix-invalid-character-recongition-in-strto-l.patch
 Patch281:   0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
@@ -492,7 +493,6 @@
 %patch83 -p1
 %patch84 -p1
 %patch85 -p1
-%patch86 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -519,6 +519,8 @@
 %patch235 -p1
 %patch236 -p1
 %patch277 -p1
+%patch278 -p1
+%patch279 -p1
 %patch280 -p1
 %patch281 -p1
 %patch282 -p1


++ grub2-Fix-incorrect-netmask-on-ppc64.patch ++
From: Masahiro Matsuya 

The netmask configured in firmware is not respected on ppc64 (big endian).
When 255.255.252.0 is set as netmask in firmware, the following is the value of 
bootpath string in grub_ieee1275_parse_bootpath().

 
/vdevice/l-lan@3002:speed=auto,duplex=auto,192.168.88.10,,192.168.89.113,192.168.88.1,5,5,255.255.252.0,512

The netmask in this bootpath is no problem, since it's a value specified in 
firmware. But,
The value of 'subnet_mask.ipv4' was set with 0xfc00, and __builtin_ctz 
(~grub_le_to_cpu32 (subnet_mask.ipv4)) returned 16 (not 22).
As a result, 16 was used for netmask wrongly.

     1100   # subnet_mask.ipv4 (=0xfc00)
   1100     # grub_le_to_cpu32 (subnet_mask.ipv4)
   0011     # ~grub_le_to_cpu32 (subnet_mask.ipv4)

And, the count of zero with __builtin_ctz can be 16.
This patch changes it as below.

     1100   # subnet_mask.ipv4 (=0xfc00)
   1100     # grub_le_to_cpu32 (subnet_mask.ipv4)
     1100   # grub_swap_bytes32(grub_le_to_cpu32 
(subnet_mask.ipv4))
     0011   # ~grub_swap_bytes32(grub_le_to_cpu32 
(subnet_mask.ipv4))

The count of zero with __builtin_clz can be 22. (clz counts the number of one 
bits preceding the most significant zero bit)
---
 grub-core/net/drivers/ieee1275/ofnet.c | 2 +-
 1 file changed, 1 insertion(+), 2 deletions(-)

diff -ur grub-2.02~/grub-core/net/drivers/ieee1275/ofnet.c 
grub-2.02/grub-core/net/drivers/ieee1275/ofnet.c
--- grub-2.02~/grub-core/net/drivers/ieee1275/ofnet.c   2018-03-26 
13:49:55.399558334 +0200
+++ grub-2.02/grub-core/net/drivers/ieee1275/ofnet.c2018-03-26 
13:51:03.092656921 +0200
@@ -232,7 +232,7 @@
 }
 
   grub_net_add_ipv4_local (inter,
-  __builtin_ctz (~grub_le_to_cpu32 
(subnet_mask.ipv4)));
+  __builtin_clz (~ (subnet_mask.ipv4)));
 }
 
   if (gateway_addr.ipv4 != 0)

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-03-19 23:30:33

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Mar 19 23:30:33 2018 rev:178 rq:587448 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-02-13 
10:44:50.775704578 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-03-19 
23:30:34.894228962 +0100
@@ -1,0 +2,22 @@
+Mon Mar 12 07:31:10 UTC 2018 - mch...@suse.com
+
+- Fix UEFI HTTPS Boot from ISO installation image (bsc#1076132)
+  * 0001-add-support-for-UEFI-network-protocols.patch 
+
+---
+Tue Mar  6 08:21:43 UTC 2018 - mch...@suse.com
+
+- fix wrong command output when default subvolume is toplevel tree with
+  id 5 (bsc#1078775)
+  * grub2-btrfs-09-get-default-subvolume.patch
+- insert mdraid modules to support software RAID (bsc#1078775)
+  * grub2-xen-pv-firmware.cfg
+
+---
+Thu Mar  1 18:36:33 UTC 2018 - ifors...@suse.com
+
+- Rename grub2-btrfs-workaround-grub2-once.patch to
+  grub2-grubenv-in-btrfs-header.patch
+- Store GRUB environment variable health_checker_flag in Btrfs header
+
+---

Old:

  grub2-btrfs-workaround-grub2-once.patch

New:

  grub2-grubenv-in-btrfs-header.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.SqzaLY/_old  2018-03-19 23:30:37.858122039 +0100
+++ /var/tmp/diff_new_pack.SqzaLY/_new  2018-03-19 23:30:37.862121895 +0100
@@ -197,7 +197,7 @@
 Patch59:grub2-efi-disable-video-cirrus-and-bochus.patch
 Patch60:grub2-editenv-add-warning-message.patch
 Patch61:grub2-vbe-blacklist-preferred-1440x900x32.patch
-Patch64:grub2-btrfs-workaround-grub2-once.patch
+Patch64:grub2-grubenv-in-btrfs-header.patch
 Patch65:grub2-mkconfig-aarch64.patch
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch

++ 0001-add-support-for-UEFI-network-protocols.patch ++
 634 lines (skipped)
 between 
/work/SRC/openSUSE:Factory/grub2/0001-add-support-for-UEFI-network-protocols.patch
 and 
/work/SRC/openSUSE:Factory/.grub2.new/0001-add-support-for-UEFI-network-protocols.patch


++ grub2-btrfs-09-get-default-subvolume.patch ++
--- /var/tmp/diff_new_pack.SqzaLY/_old  2018-03-19 23:30:38.186110207 +0100
+++ /var/tmp/diff_new_pack.SqzaLY/_new  2018-03-19 23:30:38.190110063 +0100
@@ -1,8 +1,8 @@
-Index: grub-2.02~beta2/grub-core/fs/btrfs.c
+Index: grub-2.02/grub-core/fs/btrfs.c
 ===
 grub-2.02~beta2.orig/grub-core/fs/btrfs.c
-+++ grub-2.02~beta2/grub-core/fs/btrfs.c
-@@ -2439,6 +2439,238 @@ out:
+--- grub-2.02.orig/grub-core/fs/btrfs.c
 grub-2.02/grub-core/fs/btrfs.c
+@@ -2446,6 +2446,242 @@ out:
return 0;
  }
  
@@ -198,6 +198,10 @@
 +}
 +
 +  id = subvolid;
++
++  if (id == GRUB_BTRFS_ROOT_VOL_OBJECTID)
++subvol = grub_strdup ("");
++  else
 +  while (id != GRUB_BTRFS_ROOT_VOL_OBJECTID)
 +{
 +  grub_uint64_t parent_id;
@@ -241,7 +245,7 @@
  static struct grub_fs grub_btrfs_fs = {
.name = "btrfs",
.dir = grub_btrfs_dir,
-@@ -2457,6 +2689,7 @@ static struct grub_fs grub_btrfs_fs = {
+@@ -2464,6 +2700,7 @@ static struct grub_fs grub_btrfs_fs = {
  static grub_command_t cmd_info;
  static grub_command_t cmd_mount_subvol;
  static grub_extcmd_t cmd_list_subvols;
@@ -249,7 +253,7 @@
  
  static char *
  subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
-@@ -2527,6 +2760,11 @@ GRUB_MOD_INIT (btrfs)
+@@ -2534,6 +2771,11 @@ GRUB_MOD_INIT (btrfs)
 "[-p|-n] [-o var] DEVICE",
 "Print list of BtrFS subvolumes on "
 "DEVICE.", options);

++ grub2-grubenv-in-btrfs-header.patch ++
GRUB cannot write Btrfs file systems from the bootloader, so it cannot
modify values set from userspace (e.g. "next_entry" set by grub2-once).
As a workaround use the Btrfs header to store known data of the GRUB environment
block.
---
Index: grub-2.02/grub-core/kern/fs.c
===
--- grub-2.02.orig/grub-core/kern/fs.c
+++ grub-2.02/grub-core/kern/fs.c
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 
 grub_fs_t grub_fs_list = 0;
 
@@ -228,6 +229,13 @@ grub_fs_blocklist_read (grub_file_t file
  size, buf) != GRUB_ERR_NONE)
   

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-02-13 10:44:46

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Feb 13 10:44:46 2018 rev:177 rq:576013 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-02-09 
15:45:33.219683812 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-02-13 
10:44:50.775704578 +0100
@@ -1,0 +2,6 @@
+Tue Feb 13 09:05:45 UTC 2018 - mch...@suse.com
+
+- Fix incorrect check preventing the script from running (bsc#1078481)
+  * 80_suse_btrfs_snapshot 
+
+---



Other differences:
--
++ 80_suse_btrfs_snapshot ++
--- /var/tmp/diff_new_pack.wrGbpw/_old  2018-02-13 10:44:53.287614053 +0100
+++ /var/tmp/diff_new_pack.wrGbpw/_new  2018-02-13 10:44:53.291613909 +0100
@@ -3,7 +3,7 @@
 SNAPSHOTS="/.snapshots"
 if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
[ "x${GRUB_FS}" = "xbtrfs" ] && 
-   [ -f "${SNAPSHOTS}/grub-snapshot.cfg" ]; then
+   [ -d "${SNAPSHOTS}" ]; then
   SNAPSHOT_RID=`btrfs inspect-internal rootid ${SNAPSHOTS}`
   ROOT_RID=`btrfs inspect-internal rootid /`
   if [ -n "${SNAPSHOT_RID}" -a "${SNAPSHOT_RID}" != "${ROOT_RID}" ]; then

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-02-09 15:45:30

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Fri Feb  9 15:45:30 2018 rev:176 rq:574507 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2018-02-02 
22:19:59.808277231 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-02-09 
15:45:33.219683812 +0100
@@ -1,0 +2,19 @@
+Wed Feb  7 09:58:26 UTC 2018 - mch...@suse.com
+
+- Fix disappeared snapshot menu entry (bsc#1078481)
+  * 80_suse_btrfs_snapshot 
+
+---
+Tue Feb  6 09:44:26 UTC 2018 - mch...@suse.com
+
+- Fix unquoted string error and add some more checks (bsc#1079330) 
+  * grub2-check-default.sh
+
+---
+Mon Feb  5 08:52:20 UTC 2018 - o...@aepfle.de
+
+- The %prep section applies patches, the %build section builds.
+  Remove mixup of patching and building from %prep for quilt setup
+  Related to bsc#1065703
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.mBHEUe/_old  2018-02-09 15:45:36.379570350 +0100
+++ /var/tmp/diff_new_pack.mBHEUe/_new  2018-02-09 15:45:36.383570206 +0100
@@ -544,6 +544,8 @@
 %patch420 -p1
 %patch421 -p1
 %patch430 -p1
+
+%build
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
 [ -z "$SOURCE_DATE_EPOCH" ] ||\
@@ -574,7 +576,6 @@
 mkdir build-emu
 %endif
 
-%build
 export PYTHON=%{_bindir}/python3
 # autogen calls autoreconf -vi
 ./autogen.sh

++ 80_suse_btrfs_snapshot ++
--- /var/tmp/diff_new_pack.mBHEUe/_old  2018-02-09 15:45:36.499566042 +0100
+++ /var/tmp/diff_new_pack.mBHEUe/_new  2018-02-09 15:45:36.499566042 +0100
@@ -1,10 +1,22 @@
 #! /bin/sh
 set -e
+SNAPSHOTS="/.snapshots"
 if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
-   [ "x${GRUB_FS}" = "xbtrfs" ] ; then
+   [ "x${GRUB_FS}" = "xbtrfs" ] && 
+   [ -f "${SNAPSHOTS}/grub-snapshot.cfg" ]; then
+  SNAPSHOT_RID=`btrfs inspect-internal rootid ${SNAPSHOTS}`
+  ROOT_RID=`btrfs inspect-internal rootid /`
+  if [ -n "${SNAPSHOT_RID}" -a "${SNAPSHOT_RID}" != "${ROOT_RID}" ]; then
+SNAPSHOT_SUBVOL=`btrfs inspect-internal subvolid-resolve ${SNAPSHOT_RID} /`
+ROOT_SUBVOL=`btrfs inspect-internal subvolid-resolve ${ROOT_RID} /`
+INODE=`stat -c '%i' ${SNAPSHOTS}`
+if [ "x${INODE}" = "x256" -a "x${ROOT_SUBVOL}${SNAPSHOTS}" != 
"x${SNAPSHOT_SUBVOL}" ]; then
+  echo "btrfs-mount-subvol (\$root) ${SNAPSHOTS} ${SNAPSHOT_SUBVOL}"
+fi
+  fi
 cat 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2018-02-02 22:19:58

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Fri Feb  2 22:19:58 2018 rev:175 rq:571597 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-12-13 
11:56:00.559511479 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2018-02-02 
22:19:59.808277231 +0100
@@ -1,0 +2,10 @@
+Tue Jan 23 04:41:22 UTC 2018 - mch...@suse.com
+
+- Check if default entry need to be corrected for updated distributor version
+  and/or use fallback entry if default kernel entry removed (bsc#1065349)
+  * grub2-check-default.sh
+  * grub2-mkconfig-default-entry-correction.patch
+- Fix grub2-mkconfig warning when disk is LVM PV (bsc#1071239)
+  * grub2-getroot-scan-disk-pv.patch
+
+---

New:

  grub2-check-default.sh
  grub2-getroot-scan-disk-pv.patch
  grub2-mkconfig-default-entry-correction.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.XJhVrJ/_old  2018-02-02 22:20:03.152121123 +0100
+++ /var/tmp/diff_new_pack.XJhVrJ/_new  2018-02-02 22:20:03.156120937 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -160,6 +160,7 @@
 Source16:   grub2-xen-pv-firmware.cfg
 # required hook for systemd-sleep (bsc#941758)
 Source17:   grub2-systemd-sleep.sh
+Source18:   grub2-check-default.sh
 Source1000: PATCH_POLICY
 Patch1: rename-grub-info-file-to-grub2.patch
 Patch2: grub2-linux.patch
@@ -213,6 +214,7 @@
 Patch83:grub2-efi-uga-64bit-fb.patch
 Patch84:grub2-s390x-09-improve-zipl-setup.patch
 Patch85:
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
+Patch86:grub2-getroot-scan-disk-pv.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -273,6 +275,9 @@
 # UEFI HTTP and related network protocol support (FATE#320130)
 Patch420:   0001-add-support-for-UEFI-network-protocols.patch
 Patch421:   0002-AUDIT-0-http-boot-tracker-bug.patch
+# check if default entry need to be corrected for updated distributor version 
+# and/or use fallback entry if default kernel entry removed (bsc#1065349)
+Patch430:   grub2-mkconfig-default-entry-correction.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -487,6 +492,7 @@
 %patch83 -p1
 %patch84 -p1
 %patch85 -p1
+%patch86 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -537,6 +543,7 @@
 %patch412 -p1
 %patch420 -p1
 %patch421 -p1
+%patch430 -p1
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
 [ -z "$SOURCE_DATE_EPOCH" ] ||\
@@ -795,6 +802,7 @@
 install -m 644 -D %{SOURCE15} $RPM_BUILD_ROOT%{_unitdir}/grub2-once.service
 install -m 755 -D %{SOURCE17} 
$RPM_BUILD_ROOT%{_libdir}/systemd/system-sleep/grub2.sleep
 %endif
+install -m 755 -D %{SOURCE18} $RPM_BUILD_ROOT%{_sbindir}/grub2-check-default
 
 R=$RPM_BUILD_ROOT
 %ifarch %{ix86} x86_64
@@ -1018,6 +1026,7 @@
 %{_sbindir}/%{name}-probe
 %{_sbindir}/%{name}-reboot
 %{_sbindir}/%{name}-set-default
+%{_sbindir}/%{name}-check-default
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-file
 %{_bindir}/%{name}-fstest


++ grub2-check-default.sh ++
#!/bin/sh

set -e

fallback_entry () {

  local saved=$1
  local FALLBACK_MATCH=`echo $saved | sed -e '/>/!d' -e '/>/s/>.*$//'`

  if [ -n "$FALLBACK_MATCH" ]; then
for i in $MENU_ENTRIES; do
  if expr match "$i" "^$FALLBACK_MATCH" >/dev/null ; then
echo "$i"
return 0
  fi
done
  fi
  return 0
}

run_command () {
  [ x"$DEBUG_RUN" = x1 ] && echo $@ || $@ 
}

debug_print () {
  [ x"$DEBUG_RUN" = x1 ] && echo $@ || true
}

case $1 in
-d|--debug)
  DEBUG_RUN=1
  ;;
esac

GRUB_EDITENV="/usr/bin/grub2-editenv"
GRUB_SET_DEFAULT="/usr/sbin/grub2-set-default"

SAVED_ENTRY=`${GRUB_EDITENV} list | sed -ne "/^saved_entry=/{s@\"\(.*\)\"@\1@;t 
1;s@'\(.*\)'@\1@;: 1;s@^[^=]\+=@@;p;b}"`

debug_print "SAVED_ENTRY=$SAVED_ENTRY"

[ -z "$SAVED_ENTRY" ] && exit 0

MENU_ENTRIES=`awk '
  BEGIN {
bracket = 0
  }
  {
patsplit($0, words, "([^[:blank:]]+)|(\"[^\"]+\")|('\''[^'\'']*'\'')", sep)

cmd = words[1]

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-12-13 11:55:58

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Wed Dec 13 11:55:58 2017 rev:174 rq:555805 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-12-06 
08:53:06.757013601 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-12-13 
11:56:00.559511479 +0100
@@ -1,0 +2,7 @@
+Fri Dec  8 09:30:46 UTC 2017 - mch...@suse.com
+
+-  Filter out autofs and securityfs from /proc/self/mountinfo to speed
+   up nfsroot test in large number of autofs mounts (bsc#1069094)
+  * modified grub2-pass-corret-root-for-nfsroot.patch
+
+---



Other differences:
--

++ grub2-pass-corret-root-for-nfsroot.patch ++
--- /var/tmp/diff_new_pack.WCfLCZ/_old  2017-12-13 11:56:02.695408371 +0100
+++ /var/tmp/diff_new_pack.WCfLCZ/_new  2017-12-13 11:56:02.695408371 +0100
@@ -3,7 +3,7 @@
 Date: Thu, 30 Aug 2012 15:43:17 +0800
 Subject: [PATCH] Pass corret root= for nfsroot
 
-References: bnc#774548
+References: bnc#774548, bsc#1069094
 Patch-Mainline: no
 
 Fix / is mounted on nfs. The fix is to pass kernel parameters
@@ -11,15 +11,18 @@
 nfs file system module, the /boot on nfs is not possible and
 grub2-probe not work in probing nfs mounted path. The fix is merely
 on the script level and not use grub2-probe for above reasons.
+
+v2: Filter out autofs and securityfs from /proc/self/mountinfo (bsc#1069094)
+
 ---
  util/grub-mkconfig.in |   37 ++---
  1 files changed, 30 insertions(+), 7 deletions(-)
 
-Index: grub-2.02~beta2/util/grub-mkconfig.in
+Index: grub-2.02/util/grub-mkconfig.in
 ===
 grub-2.02~beta2.orig/util/grub-mkconfig.in
-+++ grub-2.02~beta2/util/grub-mkconfig.in
-@@ -128,22 +128,47 @@ else
+--- grub-2.02.orig/util/grub-mkconfig.in
 grub-2.02/util/grub-mkconfig.in
+@@ -131,22 +131,47 @@ else
  exit 1
  fi
  
@@ -47,9 +50,9 @@
 +return
 +fi
 +done
-+} 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-12-06 08:53:04

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Wed Dec  6 08:53:04 2017 rev:173 rq:547741 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-11-19 
11:05:32.600181146 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-12-06 
08:53:06.757013601 +0100
@@ -1,0 +2,6 @@
+Tue Nov 28 09:35:48 UTC 2017 - mch...@suse.com
+
+- Fix http(s) boot security review (bsc#1058090)
+  * 0002-AUDIT-0-http-boot-tracker-bug.patch 
+
+---

New:

  0002-AUDIT-0-http-boot-tracker-bug.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.5fiQuc/_old  2017-12-06 08:53:08.668943608 +0100
+++ /var/tmp/diff_new_pack.5fiQuc/_new  2017-12-06 08:53:08.672943461 +0100
@@ -272,6 +272,7 @@
 Patch412:   0013-tpm-i386-pc-diskboot-img.patch
 # UEFI HTTP and related network protocol support (FATE#320130)
 Patch420:   0001-add-support-for-UEFI-network-protocols.patch
+Patch421:   0002-AUDIT-0-http-boot-tracker-bug.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -535,6 +536,7 @@
 %patch411 -p1
 %patch412 -p1
 %patch420 -p1
+%patch421 -p1
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
 [ -z "$SOURCE_DATE_EPOCH" ] ||\

++ 0002-AUDIT-0-http-boot-tracker-bug.patch ++
>From b5c3492f31a98f5ef0f9bec2c0665ad0b71ad5cb Mon Sep 17 00:00:00 2001
From: Sebastian Krahmer 
Date: Tue, 28 Nov 2017 17:24:38 +0800
Subject: [PATCH] AUDIT-0: http boot tracker bug

Fixing a memory leak in case of error, and a integer overflow, leading to a
heap overflow due to overly large chunk sizes.

We need to check against some maximum value, otherwise values like 0x
will eventually lead in the allocation functions to small sized buffers, since
the len is rounded up to the next reasonable alignment. The following memcpy
will then smash the heap, leading to RCE.

This is no big issue for pure http boot, since its going to execute an
untrusted kernel anyway, but it will break trusted boot scenarios, where only
signed code is allowed to be executed.

Signed-off-by: Michael Chang 
---
 grub-core/net/efi/net.c | 4 +++-
 grub-core/net/http.c| 5 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/grub-core/net/efi/net.c b/grub-core/net/efi/net.c
index 0bac343b4..5bc604ff0 100644
--- a/grub-core/net/efi/net.c
+++ b/grub-core/net/efi/net.c
@@ -645,8 +645,10 @@ grub_efihttp_chunk_read (grub_file_t file, char *buf,
 
   rd = efi_net_interface (read, file, chunk, sz);
 
-  if (rd <= 0)
+  if (rd <= 0) {
+   grub_free (chunk);
return rd;
+  }
 
   if (buf)
{
diff --git a/grub-core/net/http.c b/grub-core/net/http.c
index f182d7b87..5004ecfee 100644
--- a/grub-core/net/http.c
+++ b/grub-core/net/http.c
@@ -31,7 +31,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
 
 enum
   {
-HTTP_PORT = 80
+HTTP_PORT = 80,
+HTTP_MAX_CHUNK_SIZE = 0x8000
   };
 
 
@@ -78,6 +79,8 @@ parse_line (grub_file_t file, http_data_t data, char *ptr, 
grub_size_t len)
   if (data->in_chunk_len == 2)
 {
   data->chunk_rem = grub_strtoul (ptr, 0, 16);
+  if (data->chunk_rem > HTTP_MAX_CHUNK_SIZE)
+ return GRUB_ERR_NET_PACKET_TOO_BIG;
   grub_errno = GRUB_ERR_NONE;
   if (data->chunk_rem == 0)
{
-- 
2.12.0

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-11-19 11:05:27

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sun Nov 19 11:05:27 2017 rev:172 rq:541952 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-11-10 
14:42:36.792153766 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-11-19 
11:05:32.600181146 +0100
@@ -1,0 +2,9 @@
+Tue Nov 14 09:02:19 UTC 2017 - mch...@suse.com
+
+- 0001-add-support-for-UEFI-network-protocols.patch:
+  * Workaround http data access in firmware
+  * Fix DNS device path parsing for efinet device
+  * Relaxed UEFI Protocol requirement
+  * Support Intel OPA (Omni-Path Architecture) PXE Boot (bsc#1015589)
+
+---



Other differences:
--
++ 0001-add-support-for-UEFI-network-protocols.patch ++
 1160 lines (skipped)
 between 
/work/SRC/openSUSE:Factory/grub2/0001-add-support-for-UEFI-network-protocols.patch
 and 
/work/SRC/openSUSE:Factory/.grub2.new/0001-add-support-for-UEFI-network-protocols.patch

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-11-10 14:42:35

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Fri Nov 10 14:42:35 2017 rev:171 rq:540121 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-10-07 
17:46:07.739269299 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-11-10 
14:42:36.792153766 +0100
@@ -1,0 +2,18 @@
+Wed Nov  8 09:37:12 UTC 2017 - o...@aepfle.de
+
+- grub2-xen-pv-firmware.cfg: remove linemode=1 from cmdline for
+  SUSE installer. openQA expects ncurses interface. (bsc#1066919)
+
+---
+Mon Nov  6 15:34:03 UTC 2017 - jmate...@suse.com
+
+- use python3 for autogen.sh (fate#323526)
+
+---
+Tue Oct 31 13:36:02 UTC 2017 - msucha...@suse.com
+
+- Do not check that PReP partition does not contain an ELF during installation
+  (bsc#1065738).
+  * grub2-install-remove-useless-check-PReP-partition-is-empty.patch
+
+---

New:

  grub2-install-remove-useless-check-PReP-partition-is-empty.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.u74bD8/_old  2017-11-10 14:42:40.732011347 +0100
+++ /var/tmp/diff_new_pack.u74bD8/_new  2017-11-10 14:42:40.736011202 +0100
@@ -44,7 +44,7 @@
 %else
 BuildRequires:  texinfo
 %endif
-BuildRequires:  python
+BuildRequires:  python3
 BuildRequires:  xz-devel
 %ifarch x86_64
 %if 0%{?suse_version} >= 1230 || 0%{?suse_version} == 1110
@@ -212,6 +212,7 @@
 Patch82:grub2-diskfilter-support-pv-without-metadatacopies.patch
 Patch83:grub2-efi-uga-64bit-fb.patch
 Patch84:grub2-s390x-09-improve-zipl-setup.patch
+Patch85:
grub2-install-remove-useless-check-PReP-partition-is-empty.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -484,6 +485,7 @@
 %patch82 -p1
 %patch83 -p1
 %patch84 -p1
+%patch85 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -564,6 +566,7 @@
 %endif
 
 %build
+export PYTHON=%{_bindir}/python3
 # autogen calls autoreconf -vi
 ./autogen.sh
 # Not yet:


++ grub2-install-remove-useless-check-PReP-partition-is-empty.patch ++
>From b57af595c94db6d7babb7623c1530ee4f5b956f0 Mon Sep 17 00:00:00 2001
From: Michal Suchanek 
Date: Tue, 31 Oct 2017 14:28:54 +0100
Subject: [PATCH] grub-install: remove useless check PReP partition is empty.

References: bsc#1065738

The grub-install rewrite in commit cd46aa6cefab checks that the PPeP
partition does not install an ELF binary before writing grub to it. This
causes regression in installer scripts that expect to be able to
reinstall bootloaders without first witping the partition by hand.

Fixes: cd46aa6cefab ("Rewrite grub-install, grub-mkrescue,
grub-mkstandalone and grub-mknetdir ")
---
 util/grub-install.c | 39 ++-
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/util/grub-install.c b/util/grub-install.c
index 75e3e5ba6f07..ae859476e3da 100644
--- a/util/grub-install.c
+++ b/util/grub-install.c
@@ -731,34 +731,6 @@ is_prep_partition (grub_device_t dev)
   return 0;
 }
 
-static int
-is_prep_empty (grub_device_t dev)
-{
-  grub_disk_addr_t dsize, addr;
-  grub_uint32_t buffer[32768];
-
-  dsize = grub_disk_get_size (dev->disk);
-  for (addr = 0; addr < dsize;
-   addr += sizeof (buffer) / GRUB_DISK_SECTOR_SIZE)
-{
-  grub_size_t sz = sizeof (buffer);
-  grub_uint32_t *ptr;
-
-  if (sizeof (buffer) / GRUB_DISK_SECTOR_SIZE > dsize - addr)
-   sz = (dsize - addr) * GRUB_DISK_SECTOR_SIZE;
-  grub_disk_read (dev->disk, addr, 0, sz, buffer);
-
-  if (addr == 0 && grub_memcmp (buffer, ELFMAG, SELFMAG) == 0)
-   return 1;
-
-  for (ptr = buffer; ptr < buffer + sz / sizeof (*buffer); ptr++)
-   if (*ptr)
- return 0;
-}
-
-  return 1;
-}
-
 static void
 bless (grub_device_t dev, const char *path, int x86)
 {
@@ -1772,16 +1744,9 @@ main (int argc, char *argv[])
{
  grub_util_error ("%s", _("the chosen partition is not a PReP 
partition"));
}
- if (is_prep_empty (ins_dev))
-   {
- if (write_to_disk (ins_dev, imgfile))
-   grub_util_error ("%s", _("failed to copy Grub to the PReP 
partition"));
-   }
- else
+ if (write_to_disk (ins_dev, imgfile))
{
- 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-10-07 17:46:05

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sat Oct  7 17:46:05 2017 rev:170 rq:530250 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-09-21 
12:29:22.609434670 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-10-07 
17:46:07.739269299 +0200
@@ -1,0 +2,8 @@
+Tue Sep 26 06:35:50 UTC 2017 - mch...@suse.com
+
+- Build diskboot_tpm.img as separate image to diskboot.img to prevent failure
+  in booting on some bogus firmware. To use the TPM image you have to use
+  suse-enable-tpm option of grub2-install (bsc#1052401)
+  * 0013-tpm-i386-pc-diskboot-img.patch  
+
+---

New:

  0013-tpm-i386-pc-diskboot-img.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.JBHEI0/_old  2017-10-07 17:46:10.771136027 +0200
+++ /var/tmp/diff_new_pack.JBHEI0/_new  2017-10-07 17:46:10.775135852 +0200
@@ -268,6 +268,7 @@
 Patch409:   0010-tpm-Fix-boot-when-there-s-no-TPM.patch
 Patch410:   0011-tpm-Fix-build-error.patch
 Patch411:   0012-tpm-Build-tpm-as-module.patch
+Patch412:   0013-tpm-i386-pc-diskboot-img.patch
 # UEFI HTTP and related network protocol support (FATE#320130)
 Patch420:   0001-add-support-for-UEFI-network-protocols.patch
 
@@ -530,6 +531,7 @@
 %patch409 -p1
 %patch410 -p1
 %patch411 -p1
+%patch412 -p1
 %patch420 -p1
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare

++ 0013-tpm-i386-pc-diskboot-img.patch ++
Index: grub-2.02/grub-core/Makefile.core.def
===
--- grub-2.02.orig/grub-core/Makefile.core.def
+++ grub-2.02/grub-core/Makefile.core.def
@@ -451,6 +451,20 @@ image = {
 };
 
 image = {
+  name = diskboot_tpm;
+  i386_pc = boot/i386/pc/diskboot.S;
+
+  cppflags = '-DTPM=1';
+
+  i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+  i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000';
+
+  objcopyflags = '-O binary';
+
+  enable = i386_pc;
+};
+
+image = {
   name = lnxboot;
   i386_pc = boot/i386/pc/lnxboot.S;
 
Index: grub-2.02/grub-core/boot/i386/pc/diskboot.S
===
--- grub-2.02.orig/grub-core/boot/i386/pc/diskboot.S
+++ grub-2.02/grub-core/boot/i386/pc/diskboot.S
@@ -19,8 +19,6 @@
 #include 
 #include 
 
-#define TPM 1
-
 /*
  *  defines for the code go here
  */
Index: grub-2.02/include/grub/util/mkimage.h
===
--- grub-2.02.orig/include/grub/util/mkimage.h
+++ grub-2.02/include/grub/util/mkimage.h
@@ -71,7 +71,8 @@ struct grub_install_image_target_desc
 IMAGE_I386_IEEE1275,
 IMAGE_LOONGSON_ELF, IMAGE_QEMU, IMAGE_PPC, IMAGE_YEELOONG_FLASH,
 IMAGE_FULOONG2F_FLASH, IMAGE_I386_PC_PXE, IMAGE_MIPS_ARC,
-IMAGE_QEMU_MIPS_FLASH, IMAGE_UBOOT, IMAGE_XEN, IMAGE_I386_PC_ELTORITO
+IMAGE_QEMU_MIPS_FLASH, IMAGE_UBOOT, IMAGE_XEN, IMAGE_I386_PC_ELTORITO,
+IMAGE_I386_PC_TPM
   } id;
   enum
 {
Index: grub-2.02/util/grub-install.c
===
--- grub-2.02.orig/util/grub-install.c
+++ grub-2.02/util/grub-install.c
@@ -1660,6 +1660,16 @@ main (int argc, char *argv[])
 
 
 case GRUB_INSTALL_PLATFORM_I386_PC:
+  if (suse_enable_tpm)
+   {
+ snprintf (mkimage_target, sizeof (mkimage_target),
+   "%s-%s-tpm",
+   grub_install_get_platform_cpu (platform),
+   grub_install_get_platform_platform (platform));
+ core_name = "core.img";
+ break;
+   }
+  /* FALLTHROUGH */
 case GRUB_INSTALL_PLATFORM_MIPSEL_ARC:
 case GRUB_INSTALL_PLATFORM_MIPS_ARC:
 case GRUB_INSTALL_PLATFORM_ARM_UBOOT:
Index: grub-2.02/util/mkimage.c
===
--- grub-2.02.orig/util/mkimage.c
+++ grub-2.02/util/mkimage.c
@@ -165,6 +165,22 @@ static const struct grub_install_image_t
   .default_compression = GRUB_COMPRESSION_LZMA
 },
 {
+  .dirname = "i386-pc",
+  .names = { "i386-pc-tpm", NULL },
+  .voidp_sizeof = 4,
+  .bigendian = 0,
+  .id = IMAGE_I386_PC_TPM,
+  .flags = PLATFORM_FLAGS_DECOMPRESSORS,
+  .total_module_size = TARGET_NO_FIELD,
+  .decompressor_compressed_size = 
GRUB_DECOMPRESSOR_I386_PC_COMPRESSED_SIZE,
+  .decompressor_uncompressed_size = 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-09-21 12:29:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Thu Sep 21 12:29:21 2017 rev:169 rq:527631 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-09-15 
21:02:24.306675489 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-09-21 
12:29:22.609434670 +0200
@@ -1,0 +2,12 @@
+Wed Sep 20 22:17:10 UTC 2017 - mlati...@suse.com
+
+- Use /boot//loader/linux to determine if install media
+  is SUSE instead of /contents file (bsc#1054453)
+
+---
+Tue Sep 19 22:52:45 UTC 2017 - mlati...@suse.com
+
+- Use the pvops-enabled default kernel if the traditional xen
+  pv kernel and initrd are not found (bsc#1054453)
+
+---



Other differences:
--

++ grub2-xen-pv-firmware.cfg ++
--- /var/tmp/diff_new_pack.sDTPME/_old  2017-09-21 12:29:24.921109493 +0200
+++ /var/tmp/diff_new_pack.sDTPME/_new  2017-09-21 12:29:24.921109493 +0200
@@ -36,10 +36,19 @@
 fi
 
 set suse_cddev=""
-search -s suse_cddev_content -f "/content"
-search -s suse_cddev_product -f "/media.1/products"
-if [ -n "${suse_cddev_content}" -a -n "${suse_cddev_product}" -a 
"${suse_cddev_content}" = "${suse_cddev_product}" ]; then
-set suse_cddev="${suse_cddev_content}"
+if [ "${grub_cpu}" = "i386" ]; then
+set suse_cdarch="i586" 
+else
+set suse_cdarch="${grub_cpu}" 
+fi
+if [ -n "${suse_cdarch}" ]; then
+set suse_kern="/boot/${suse_cdarch}/loader/linux"
+set suse_initrd="/boot/${suse_cdarch}/loader/initrd"
+search -s suse_cdkern -f "${suse_kern}"
+search -s suse_cdinitrd -f "${suse_initrd}"
+if [ -n "${suse_cdkern}" -a -n "${suse_cdinitrd}" -a "${suse_cdkern}" = 
"${suse_cdinitrd}" ]; then
+set suse_cddev="${suse_cdkern}"
+fi
 fi
 
 set hdcfg_list="\
@@ -115,33 +124,30 @@
 fi
 
 if [ -n "${suse_cddev}" ]; then
-if [ "${grub_cpu}" = "i386" ]; then
-set suse_cdarch="i586" 
-else
-set suse_cdarch="${grub_cpu}" 
-fi
 set timeout=8
 set root="${suse_cddev}"
 set suse_cdcfg="/boot/${suse_cdarch}/grub2-xen/grub.cfg"
-set suse_cdkern="/boot/${suse_cdarch}/vmlinuz-xen"
-set suse_cdinitrd="/boot/${suse_cdarch}/initrd-xen"
+if [ -e "/boot/${suse_cdarch}/vmlinuz-xen" ]; then
+set suse_kern="/boot/${suse_cdarch}/vmlinuz-xen"
+set suse_initrd="/boot/${suse_cdarch}/initrd-xen"
+fi
 if [ -f "${suse_cdcfg}" ]; then
 menuentry "${suse_cddev} SUSE Install menu" {
 set root="${suse_cddev}"
 configfile "${suse_cdcfg}"
 }
-elif [ -f "${suse_cdkern}" -a -f "$suse_cdinitrd" ]; then
+elif [ -f "${suse_kern}" -a -f "$suse_initrd" ]; then
 menuentry "${suse_cddev} SUSE Install" {
-linux "${suse_cdkern}" linemode=1 xencons=hvc0 
-initrd "${suse_cdinitrd}"
+linux "${suse_kern}" linemode=1 xencons=hvc0 
+initrd "${suse_initrd}"
 }
 menuentry "${suse_cddev} SUSE Rescue" {
-linux "${suse_cdkern}" linemode=1 xencons=hvc0 rescue=1
-initrd "${suse_cdinitrd}"
+linux "${suse_kern}" linemode=1 xencons=hvc0 rescue=1
+initrd "${suse_initrd}"
 }
 menuentry "${suse_cddev} SUSE Upgrade" {
-linux "${suse_cdkern}" linemode=1 xencons=hvc0 upgrade=1
-initrd "${suse_cdinitrd}"
+linux "${suse_kern}" linemode=1 xencons=hvc0 upgrade=1
+initrd "${suse_initrd}"
 }
 else
 echo "the device ${suse_cddev} is not xen pv bootable"

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-09-15 21:02:22

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Fri Sep 15 21:02:22 2017 rev:168 rq:523219 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-09-07 
22:10:44.955819442 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-09-15 
21:02:24.306675489 +0200
@@ -1,0 +2,7 @@
+Fri Sep  8 08:04:41 UTC 2017 - ag...@suse.com
+
+- Fix reboot in UEFI environments (bsc#1047331)
+  * Add grub2-efi-Move-grub_reboot-into-kernel.patch
+  * Refresh grub2-efi-Free-malloc-regions-on-exit.patch
+
+---

New:

  grub2-efi-Move-grub_reboot-into-kernel.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.GgHj4q/_old  2017-09-15 21:02:26.082426223 +0200
+++ /var/tmp/diff_new_pack.GgHj4q/_new  2017-09-15 21:02:26.086425662 +0200
@@ -231,7 +231,8 @@
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
 # EFI free memory on exit fix (bsc#980739)
-Patch150:   grub2-efi-Free-malloc-regions-on-exit.patch
+Patch150:   grub2-efi-Move-grub_reboot-into-kernel.patch
+Patch151:   grub2-efi-Free-malloc-regions-on-exit.patch
 # Linux root device related patches
 Patch163:   grub2-zipl-setup-fix-btrfs-multipledev.patch
 Patch164:   grub2-suse-remove-linux-root-param.patch
@@ -359,9 +360,9 @@
 %package %{grubefiarch}
 
 Summary:Bootloader with support for Linux, Multiboot and more
-Group:  System/Boot
 # Require efibootmgr
 # Without it grub-install is broken so break the package as well if unavailable
+Group:  System/Boot
 Requires:   efibootmgr
 Requires(post): efibootmgr
 Requires:   %{name} = %{version}-%{release}
@@ -498,6 +499,7 @@
 %patch140 -p1
 %patch141 -p1
 %patch150 -p1
+%patch151 -p1
 %patch163 -p1
 %patch164 -p1
 %patch205 -p1


++ grub2-efi-Free-malloc-regions-on-exit.patch ++
--- /var/tmp/diff_new_pack.GgHj4q/_old  2017-09-15 21:02:26.334390854 +0200
+++ /var/tmp/diff_new_pack.GgHj4q/_new  2017-09-15 21:02:26.334390854 +0200
@@ -1,7 +1,6 @@
-From 0c5fbc745846a53cc04ac1052cfbd35c699394c5 Mon Sep 17 00:00:00 2001
+From 33298c813c36a50ccc881c33c9b6eacfb830c21a Mon Sep 17 00:00:00 2001
 From: Alexander Graf 
-Date: Thu, 19 May 2016 15:01:06 +0200
-Subject: [PATCH] efi: Free malloc regions on exit
+Subject: [PATCH v7 2/2] efi: Free malloc regions on exit
 
 When we exit grub, we don't free all the memory that we allocated earlier
 for our heap region. This can cause problems with setups where you try
@@ -9,76 +8,172 @@
 scenarios.
 
 Signed-off-by: Alexander Graf 
+
+---
+
+v2 -> v3:
+
+  - add comment explaining the number of regions
+  - move nr of regions into a define
+  - add warning if we exceed the number of freeable regions
+  - reset region counter to 0 on fini
+
+v3 -> v4:
+
+  - use dynamic list instead of static array at runtime
+  - use allocate_pool for list, so we are not bound by heap or random numbers
+  - remember all allocations, not just the heap
+
+v4 -> v5:
+
+  - free dynamic list entries on allocation removal
+
+v5 -> v6:
+
+  - move next ptr to last field
+  - s/start_addr/address/
+  - s/grub_efi_unremember_pages()/grub_efi_drop_alloc()/
+  - s/grub_efi_remember_pages()/grub_efi_store_alloc()/
+  - move grub_efi_drop_alloc after grub_efi_store_alloc
+  - s/grub2/GRUB/
+  - Make grub_efi_memory_fini comment more verbose
+  - Drop useless efi_allocated_memory = NULL; line
+
+v6 -> v7:
+
+  - rewrite grub_efi_drop_alloc() according to Daniel's comments
 ---
  grub-core/kern/efi/init.c |  1 +
- grub-core/kern/efi/mm.c   | 24 
+ grub-core/kern/efi/mm.c   | 79 +++
  include/grub/efi/efi.h|  1 +
- 3 files changed, 26 insertions(+)
+ 3 files changed, 81 insertions(+)
 
-Index: grub-2.02~beta3/grub-core/kern/efi/init.c
-===
 grub-2.02~beta3.orig/grub-core/kern/efi/init.c
-+++ grub-2.02~beta3/grub-core/kern/efi/init.c
-@@ -167,4 +167,5 @@ grub_efi_fini (void)
+diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
+index 2c31847bf..3dfdf2d22 100644
+--- a/grub-core/kern/efi/init.c
 b/grub-core/kern/efi/init.c
+@@ -80,4 +80,5 @@ grub_efi_fini (void)
  {
grub_efidisk_fini ();
grub_console_fini ();
 +  grub_efi_memory_fini ();
  }
-Index: grub-2.02~beta3/grub-core/kern/efi/mm.c
-===

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-09-07 22:10:42

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Thu Sep  7 22:10:42 2017 rev:167 rq:520583 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-08-29 
11:34:18.758782723 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-09-07 
22:10:44.955819442 +0200
@@ -1,0 +2,13 @@
+Sun Sep  3 12:12:21 UTC 2017 - mch...@suse.com
+
+- Add preliminary patch for UEFI HTTPS and related network protocol support
+  (fate#320130)
+  * 0001-add-support-for-UEFI-network-protocols.patch 
+
+---
+Sun Sep  3 11:41:42 UTC 2017 - mch...@suse.com
+
+- grub2-s390x-04-grub2-install.patch : remove arybase dependency in
+  grub2-zipl-setup by not referencing to $[ (bsc#1055280) 
+
+---

New:

  0001-add-support-for-UEFI-network-protocols.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.YcVm4C/_old  2017-09-07 22:10:50.735004902 +0200
+++ /var/tmp/diff_new_pack.YcVm4C/_new  2017-09-07 22:10:50.739004337 +0200
@@ -267,6 +267,8 @@
 Patch409:   0010-tpm-Fix-boot-when-there-s-no-TPM.patch
 Patch410:   0011-tpm-Fix-build-error.patch
 Patch411:   0012-tpm-Build-tpm-as-module.patch
+# UEFI HTTP and related network protocol support (FATE#320130)
+Patch420:   0001-add-support-for-UEFI-network-protocols.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -526,6 +528,7 @@
 %patch409 -p1
 %patch410 -p1
 %patch411 -p1
+%patch420 -p1
 # patches above may update the timestamp of grub.texi
 # and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
 [ -z "$SOURCE_DATE_EPOCH" ] ||\

++ 0001-add-support-for-UEFI-network-protocols.patch ++
 4816 lines (skipped)


++ grub2-s390x-04-grub2-install.patch ++
--- /var/tmp/diff_new_pack.YcVm4C/_old  2017-09-07 22:10:51.134948532 +0200
+++ /var/tmp/diff_new_pack.YcVm4C/_new  2017-09-07 22:10:51.134948532 +0200
@@ -45,6 +45,8 @@
  * zipl2grub.conf: turn of zipl-prompt and quiescent plymouth.  [bsc#898198]
 V16:
  * dracut-grub2.sh: force read-only '/usr' for kexec.  [bsc#932951]
+V17:
+ * grub2-zipl-setup: remove arybase dependency by not referencing $[.  
[bsc#1055280]
 
 ---
  Makefile.util.def|   39 +++
@@ -62,10 +64,10 @@
  util/s390x/zipl2grub.pl.in   |  424 
+++
  13 files changed, 702 insertions(+), 4 deletions(-)
 
-Index: grub-2.02~rc1/Makefile.util.def
+Index: grub-2.02/Makefile.util.def
 ===
 grub-2.02~rc1.orig/Makefile.util.def
-+++ grub-2.02~rc1/Makefile.util.def
+--- grub-2.02.orig/Makefile.util.def
 grub-2.02/Makefile.util.def
 @@ -352,6 +352,7 @@ program = {
ldadd = grub-core/gnulib/libgnu.a;
ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) 
$(LIBGEOM)';
@@ -153,10 +155,10 @@
  };
  
  program = {
-Index: grub-2.02~rc1/configure.ac
+Index: grub-2.02/configure.ac
 ===
 grub-2.02~rc1.orig/configure.ac
-+++ grub-2.02~rc1/configure.ac
+--- grub-2.02.orig/configure.ac
 grub-2.02/configure.ac
 @@ -181,9 +181,9 @@ if test x$platform != xemu ; then
 esac
  fi
@@ -180,10 +182,10 @@
  
  AM_CONDITIONAL([COND_HOST_HURD], [test x$host_kernel = xhurd])
  AM_CONDITIONAL([COND_HOST_LINUX], [test x$host_kernel = xlinux])
-Index: grub-2.02~rc1/grub-core/Makefile.core.def
+Index: grub-2.02/grub-core/Makefile.core.def
 ===
 grub-2.02~rc1.orig/grub-core/Makefile.core.def
-+++ grub-2.02~rc1/grub-core/Makefile.core.def
+--- grub-2.02.orig/grub-core/Makefile.core.def
 grub-2.02/grub-core/Makefile.core.def
 @@ -1057,6 +1057,7 @@ module = {
  module = {
name = videotest;
@@ -238,10 +240,10 @@
  };
  
  module = {
-Index: grub-2.02~rc1/grub-core/osdep/basic/no_platform.c
+Index: grub-2.02/grub-core/osdep/basic/no_platform.c
 ===
 grub-2.02~rc1.orig/grub-core/osdep/basic/no_platform.c
-+++ grub-2.02~rc1/grub-core/osdep/basic/no_platform.c
+--- grub-2.02.orig/grub-core/osdep/basic/no_platform.c
 grub-2.02/grub-core/osdep/basic/no_platform.c
 @@ -44,3 +44,10 @@ grub_install_sgi_setup (const char *inst
  {
grub_util_error ("%s", _("no SGI routines are available for your 
platform"));
@@ -253,10 +255,10 @@
 +  grub_util_error 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-08-29 11:34:17

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Aug 29 11:34:17 2017 rev:166 rq:518462 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-08-08 
11:58:04.361884736 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-08-29 
11:34:18.758782723 +0200
@@ -1,0 +2,7 @@
+Wed Aug 23 17:52:32 UTC 2017 - r...@suse.com
+
+- Fix minor oversights in and the exit value of the grub2-install
+  helper on s390x.  (bsc#1055343, fate#323298)
+  * grub2-s390x-09-improve-zipl-setup.patch
+
+---

New:

  grub2-s390x-09-improve-zipl-setup.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.2D5X0l/_old  2017-08-29 11:34:21.994328109 +0200
+++ /var/tmp/diff_new_pack.2D5X0l/_new  2017-08-29 11:34:22.006326424 +0200
@@ -211,6 +211,7 @@
 Patch81:grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
 Patch82:grub2-diskfilter-support-pv-without-metadatacopies.patch
 Patch83:grub2-efi-uga-64bit-fb.patch
+Patch84:grub2-s390x-09-improve-zipl-setup.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -356,9 +357,9 @@
 %package %{grubefiarch}
 
 Summary:Bootloader with support for Linux, Multiboot and more
+Group:  System/Boot
 # Require efibootmgr
 # Without it grub-install is broken so break the package as well if unavailable
-Group:  System/Boot
 Requires:   efibootmgr
 Requires(post): efibootmgr
 Requires:   %{name} = %{version}-%{release}
@@ -478,6 +479,7 @@
 %patch81 -p1
 %patch82 -p1
 %patch83 -p1
+%patch84 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-s390x-09-improve-zipl-setup.patch ++
---
 util/s390x/zipl2grub.conf.in |2 +-
 util/s390x/zipl2grub.pl.in   |   19 +++
 2 files changed, 12 insertions(+), 9 deletions(-)

--- a/util/s390x/zipl2grub.conf.in
+++ b/util/s390x/zipl2grub.conf.in
@@ -8,7 +8,7 @@ defaultmenu = menu
 target = @zipldir@
 ramdisk = @zipldir@/initrd,0x200
 image = @zipldir@/image
-parameters = "root=@GRUB_DEVICE@ @GRUB_EMU_CONMODE@ @GRUB_CMDLINE_LINUX@ 
@GRUB_CMDLINE_LINUX_DEFAULT@ initgrub quiet splash=silent plymouth.enable=0 "
+parameters = "root=@GRUB_DEVICE@ @GRUB_EMU_CONMODE@ @GRUB_CMDLINE_LINUX@ 
@GRUB_CMDLINE_LINUX_DEFAULT@ initgrub quiet splash=silent plymouth.enable=0 
mem=1G "
 
 [skip-grub2]
 target = @zipldir@
--- a/util/s390x/zipl2grub.pl.in
+++ b/util/s390x/zipl2grub.pl.in
@@ -44,12 +44,12 @@ sub System(@) {
   return 0 if ($debug);
   system( @C);
   if ($? == -1) {
-Panic( $?, "$C[0]: Failed to execute: $!\n");
+Panic( 1, "$C[0]: Failed to execute: $!\n");
   } elsif ($? & 127) {
-Panic( $?, sprintf( "$C[0]: Died with signal %d with%s coredump\n",
+Panic( 1, sprintf( "$C[0]: Died with signal %d with%s coredump\n",
($? & 127),  ($? & 128) ? '' : 'out'));
   } elsif ( $? >> 8 != 0 ) {
-Panic( $?, "$C[0]: Failed\n");
+Panic( $? >> 8, "$C[0]: Failed\n");
   }
   return( 0);
 }
@@ -166,7 +166,9 @@ sub Usage($) {
"zIPL directory missing.",
"Configuration template missing.",
"Configuration template unreadable.",
-   "zIPL directory not accesible.",
+   "zIPL directory not accessible.",
+   "kernel image parameter missing.",
+   "kernel image unreadable.",
""
   );
   my $msg = "";
@@ -190,7 +192,8 @@ while ( $#ARGV >= 0 ) {
   (/^--?help/ || /^-h/)   && (Usage(0));
   (/^--zipldir$/ || /^-z$/)   && ($zipldir = shift || Usage(2), next);
   (/^--template$/ || /^-T$/)  && ($in = shift || Usage(3), next);
-  (/^--image$/ || /^-i$/) && ($Image = shift || Usage(5), $force = 1, 
next);
+  (/^--image$/ || /^-i$/) && ($Image = shift || Usage(6),
+ -r "$Image" || Usage(7), $force = 1, next);
   (/^-/)  && (Usage(1));
   Usage(1);
 }
@@ -403,15 +406,15 @@ if ( -l $Image ) {
   $Image = readlink( $Image);
 }
 my ($image, $version) = ($Image =~ m{^(?:/boot/)?([^-]+-(.+))$});
-my $initrd = "initrd-$version";
-
 if ( !defined($image) || !defined($version) || ! -r "/boot/$image" ) {
   Panic( 1, "$C: weird $Image. This should never happen!\n");
 }
+my $initrd = "initrd-$version";
 
 if ( ! -r $ziplimage || ! -r $ziplinitrd || $refresh ) {
   BootCopy( $image, $zipldir, "image");
-  BootCopy( $initrd, $zipldir, "initrd") if 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-08-08 11:58:03

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Aug  8 11:58:03 2017 rev:165 rq:512434 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-07-12 
19:30:23.815849008 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-08-08 
11:58:04.361884736 +0200
@@ -1,0 +2,5 @@
+Mon Jul 24 13:39:25 UTC 2017 - bwiedem...@suse.com
+
+- Make grub2.info build reproducible (boo#1047218)
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.BdfbS6/_old  2017-08-08 11:58:09.709131614 +0200
+++ /var/tmp/diff_new_pack.BdfbS6/_new  2017-08-08 11:58:09.729128797 +0200
@@ -524,6 +524,11 @@
 %patch409 -p1
 %patch410 -p1
 %patch411 -p1
+# patches above may update the timestamp of grub.texi
+# and via build-aux/mdate-sh they end up in grub2.info, breaking build-compare
+[ -z "$SOURCE_DATE_EPOCH" ] ||\
+  [ `stat -c %Y docs/grub.texi` -lt $SOURCE_DATE_EPOCH ] ||\
+  touch -d@$SOURCE_DATE_EPOCH docs/grub.texi
 
 # This simplifies patch handling without need to use git to create patch
 # that renames file

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-07-12 19:30:22

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Wed Jul 12 19:30:22 2017 rev:164 rq:508680 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-06-05 
18:49:54.344908418 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-07-12 
19:30:23.815849008 +0200
@@ -1,0 +2,6 @@
+Tue Jul  4 16:56:33 UTC 2017 - arvidj...@gmail.com
+
+- add grub2-fix-build-with-flex-2.6.4.patch - fix build with flex 2.6.4+
+  that removed explicit (void) cast from fprintf call in yy_fatal_error.
+
+---

New:

  grub2-fix-build-with-flex-2.6.4.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.G7IN9X/_old  2017-07-12 19:30:25.951547674 +0200
+++ /var/tmp/diff_new_pack.G7IN9X/_new  2017-07-12 19:30:25.955547109 +0200
@@ -169,6 +169,7 @@
 Patch8: grub2-ppc-terminfo.patch
 Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
 Patch10:grub2-fix-error-terminal-gfxterm-isn-t-found.patch
+Patch11:grub2-fix-build-with-flex-2.6.4.patch
 Patch12:grub2-fix-menu-in-xen-host-server.patch
 Patch15:not-display-menu-when-boot-once.patch
 Patch17:grub2-pass-corret-root-for-nfsroot.patch
@@ -435,6 +436,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch12 -p1
 %patch15 -p1
 %patch17 -p1


++ grub2-fix-build-with-flex-2.6.4.patch ++
From: Andrei Borzenkov 

Fix build with flex 2.6.4+. It no more casts fprintf() call to void, resulting 
in

[  108s] grub_script.yy.c: In function 'yy_fatal_error':
[  108s] grub_script.yy.c:18:22: error: statement with no effect 
[-Werror=unused-value]
[  108s]  

as grub2 defines fprintf as 0. Change it to explicitly define fprintf as 
(void)0.

flex commit: 
https://github.com/westes/flex/commit/a58086a269d3d7367530c1a178644a8e5f1a374f
Index: grub-2.02/grub-core/script/yylex.l
===
--- grub-2.02.orig/grub-core/script/yylex.l
+++ grub-2.02/grub-core/script/yylex.l
@@ -91,7 +91,7 @@ typedef size_t yy_size_t;
 #define stdin  0
 #define stdout 0
 
-#define fprintf(...) 0
+#define fprintf(...) (void)0
 #define exit(...) grub_fatal("fatal error in lexer")
 #endif
 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-06-05 18:49:53

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Jun  5 18:49:53 2017 rev:163 rq:500886 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-05-20 
14:29:00.395274446 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-06-05 
18:49:54.344908418 +0200
@@ -1,0 +2,10 @@
+Thu Jun  1 09:45:44 UTC 2017 - mch...@suse.com
+
+- Support LVM physical volume created without metadatacopies (bsc#1027526)
+  * grub2-diskfilter-support-pv-without-metadatacopies.patch 
+- Fix page fault exception when grub loads with Nvidia cards (bsc#1038533)
+  * grub2-efi-uga-64bit-fb.patch
+- Require 'kexec-tools' for System z. (bsc#944358)
+  * modified grub2.spec
+
+---

New:

  grub2-diskfilter-support-pv-without-metadatacopies.patch
  grub2-efi-uga-64bit-fb.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.LjKEAs/_old  2017-06-05 18:49:56.132656427 +0200
+++ /var/tmp/diff_new_pack.LjKEAs/_new  2017-06-05 18:49:56.136655863 +0200
@@ -208,6 +208,8 @@
 Patch79:grub2-efi-chainload-harder.patch
 Patch80:grub2-emu-4-all.patch
 Patch81:grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
+Patch82:grub2-diskfilter-support-pv-without-metadatacopies.patch
+Patch83:grub2-efi-uga-64bit-fb.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -332,6 +334,7 @@
 # required utilities by grub2-s390x-04-grub2-install.patch
 # use 'showconsole' to determine console device. (bnc#876743)
 Requires:   /sbin/showconsole
+Requires:   kexec-tools
 # for /sbin/zipl used by grub2-zipl-setup
 Requires:   s390-tools
 %endif
@@ -471,6 +474,8 @@
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
+%patch83 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-diskfilter-support-pv-without-metadatacopies.patch ++
>From a28bc19400b4e70725ce5532bc5e4c374c72d7a9 Mon Sep 17 00:00:00 2001
From: Lidong Zhong 
Date: Wed, 26 Apr 2017 15:52:40 +0800
Subject: [PATCH] diskfilter: implementation of processing no metadata recorded
 in PV

If one PV underlying the root LV is created with no metadata, such as

pvcreate --metadatacopies 0 /dev/sda

then we could get a lot of error messages when generating a new
configuration file.

Generating grub configuration file ...
error: unknown LVM metadata header.
error: unknown LVM metadata header.
/usr/sbin/grub2-probe: warning: Couldn't find physical volume `pv1'.
Some modules may be missing from core image..
(For details, please refer to
 https://bugzilla.suse.com/show_bug.cgi?id=1027526)

When one labelled PV which dose not have any metadata is found, we put
it into a global grub_detached_pv list. and we search all the PVs in the
current array list to check if it is a member of grub_detached_pv list.
So we can know if the PV is really missing or just without metadata.

Signed-off-by: Lidong Zhong 
---
 grub-core/disk/diskfilter.c | 112 +++-
 grub-core/disk/lvm.c|  15 --
 2 files changed, 121 insertions(+), 6 deletions(-)

Index: grub-2.02/grub-core/disk/diskfilter.c
===
--- grub-2.02.orig/grub-core/disk/diskfilter.c
+++ grub-2.02/grub-core/disk/diskfilter.c
@@ -28,6 +28,7 @@
 #include 
 #include 
 #endif
+#include 
 
 GRUB_MOD_LICENSE ("GPLv3+");
 
@@ -43,7 +44,17 @@ static struct grub_diskfilter_lv *
 find_lv (const char *name);
 static int is_lv_readable (struct grub_diskfilter_lv *lv, int easily);
 
-
+struct grub_detached_pv {
+  struct grub_detached_pv *next;
+  struct grub_detached_pv **prev;
+  struct grub_diskfilter_pv_id id;
+  grub_disk_t disk;
+  grub_diskfilter_t diskfilter;
+} ;
+
+static struct grub_detached_pv *detached_pv_list;
+
+#define FOR_DETACHED_PVS(var) for (var = detached_pv_list; var; var = 
var->next)
 
 static grub_err_t
 is_node_readable (const struct grub_diskfilter_node *node, int easily)
@@ -132,6 +143,7 @@ scan_disk_partition_iter (grub_disk_t di
   grub_disk_addr_t start_sector;
   struct grub_diskfilter_pv_id id;
   grub_diskfilter_t diskfilter;
+  struct grub_detached_pv *pv;
 
   grub_dprintf ("diskfilter", "Scanning for DISKFILTER devices on disk %s\n",
name);
@@ -168,6 +180,28 @@ scan_disk_partition_iter (grub_disk_t di
grub_free 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-05-20 14:28:59

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sat May 20 14:28:59 2017 rev:162 rq:494786 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-05-06 
20:45:24.786568924 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-05-20 
14:29:00.395274446 +0200
@@ -1,0 +2,9 @@
+Thu May 11 08:56:57 UTC 2017 - mch...@suse.com
+
+- grub2-xen-pv-firmware.cfg: insmod lvm module as it's not auto-loaded
+  to support booting from lvm volume (bsc#1004324)
+- Grub not working correctly with xen and btrfs snapshots (bsc#1026511)
+  * Add grub2-btrfs-09-get-default-subvolume.patch
+  * grub2-xen-pv-firmware.cfg : search path in default subvolume
+
+---

New:

  grub2-btrfs-09-get-default-subvolume.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.h3PFd5/_old  2017-05-20 14:29:02.710946816 +0200
+++ /var/tmp/diff_new_pack.h3PFd5/_new  2017-05-20 14:29:02.714946251 +0200
@@ -217,6 +217,7 @@
 Patch106:   grub2-btrfs-06-subvol-mount.patch
 Patch107:   grub2-btrfs-07-subvol-fallback.patch
 Patch108:   grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
+Patch109:   grub2-btrfs-09-get-default-subvolume.patch
 # Support EFI xen loader
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
@@ -478,6 +479,7 @@
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
+%patch109 -p1
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1


++ grub2-btrfs-09-get-default-subvolume.patch ++
Index: grub-2.02~beta2/grub-core/fs/btrfs.c
===
--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c
+++ grub-2.02~beta2/grub-core/fs/btrfs.c
@@ -2439,6 +2439,238 @@ out:
   return 0;
 }
 
+static grub_err_t
+grub_btrfs_get_parent_subvol_path (struct grub_btrfs_data *data,
+   grub_uint64_t child_id,
+   const char *child_path,
+   grub_uint64_t *parent_id,
+   char **path_out)
+{
+  grub_uint64_t fs_root = 0;
+  struct grub_btrfs_key key_in = {
+.object_id = child_id,
+.type = GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF,
+.offset = 0,
+  }, key_out;
+  struct grub_btrfs_root_ref *ref;
+  char *buf;
+  struct grub_btrfs_leaf_descriptor desc;
+  grub_size_t elemsize;
+  grub_disk_addr_t elemaddr;
+  grub_err_t err;
+  char *parent_path;
+
+  *parent_id = 0;
+  *path_out = 0;
+
+  err = lower_bound(data, _in, _out, data->sblock.root_tree,
+, , , 0);
+  if (err)
+return err;
+
+  if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF || elemaddr == 0)
+next(data, , , , _out);
+
+  if (key_out.type != GRUB_BTRFS_ITEM_TYPE_ROOT_BACKREF)
+{
+  free_iterator();
+  return grub_error(GRUB_ERR_FILE_NOT_FOUND, N_("can't find root 
backrefs"));
+}
+
+  buf = grub_malloc(elemsize + 1);
+  if (!buf)
+{
+  free_iterator();
+  return grub_errno;
+}
+
+  err = grub_btrfs_read_logical(data, elemaddr, buf, elemsize, 0);
+  if (err)
+{
+  grub_free(buf);
+  free_iterator();
+  return err;
+}
+
+  buf[elemsize] = 0;
+  ref = (struct grub_btrfs_root_ref *)buf;
+
+  err = get_fs_root(data, data->sblock.root_tree, grub_le_to_cpu64 
(key_out.offset),
+0, _root);
+  if (err)
+{
+  grub_free(buf);
+  free_iterator();
+  return err;
+}
+
+  find_pathname(data, grub_le_to_cpu64 (ref->dirid), fs_root, ref->name, 
_path);
+
+  if (child_path)
+{
+  *path_out = grub_xasprintf ("%s/%s", parent_path, child_path);
+  grub_free (parent_path);
+}
+  else
+*path_out = parent_path;
+
+  *parent_id = grub_le_to_cpu64 (key_out.offset);
+
+  grub_free(buf);
+  free_iterator();
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_btrfs_get_default_subvolume_id (struct grub_btrfs_data *data, 
grub_uint64_t *id)
+{
+  grub_err_t err;
+  grub_disk_addr_t elemaddr;
+  grub_size_t elemsize;
+  struct grub_btrfs_key key, key_out;
+  struct grub_btrfs_dir_item *direl = NULL;
+  const char *ctoken = "default";
+  grub_size_t ctokenlen = sizeof ("default") - 1;
+
+  *id = 0;
+  key.object_id = data->sblock.root_dir_objectid;
+  key.type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
+  key.offset = grub_cpu_to_le64 (~grub_getcrc32c (1, ctoken, ctokenlen));
+  err = lower_bound (data, , _out, data->sblock.root_tree, , 
,
+NULL, 0);
+  if (err)
+return err;
+
+  if (key_cmp (, _out) != 0)
+return grub_error 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-05-06 20:45:23

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sat May  6 20:45:23 2017 rev:161 rq:492386 version:2.02

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-04-24 
09:46:08.930318001 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-05-06 
20:45:24.786568924 +0200
@@ -1,0 +2,11 @@
+Thu Apr 27 18:39:21 UTC 2017 - arvidj...@gmail.com
+
+- new upstream version 2.02
+  * rediff
+- use-grub2-as-a-package-name.patch
+  * drop upstream patches
+- grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch
+- grub2-add-FALLTHROUGH-annotations.patch
+- update translations
+
+---

Old:

  grub-2.02~rc2.tar.xz
  grub2-add-FALLTHROUGH-annotations.patch
  grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch
  translations-20140921.tar.xz

New:

  grub-2.02.tar.xz
  translations-20170427.tar.xz



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.A9SByJ/_old  2017-05-06 20:45:27.234223637 +0200
+++ /var/tmp/diff_new_pack.A9SByJ/_new  2017-05-06 20:45:27.24509 +0200
@@ -136,7 +136,7 @@
 %define only_x86_64 %{nil}
 %endif
 
-Version:2.02~rc2
+Version:2.02
 Release:0
 Summary:Bootloader with support for Linux, Multiboot and more
 License:GPL-3.0+
@@ -148,7 +148,7 @@
 Source2:grub.default
 Source4:grub2.rpmlintrc
 # rsync -Lrtvz  translationproject.org::tp/latest/grub/ po
-Source5:translations-20140921.tar.xz
+Source5:translations-20170427.tar.xz
 Source6:grub2-once
 Source7:20_memtest86+
 Source8:README.ibm3215
@@ -208,8 +208,6 @@
 Patch79:grub2-efi-chainload-harder.patch
 Patch80:grub2-emu-4-all.patch
 Patch81:grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
-Patch82:grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch
-Patch83:grub2-add-FALLTHROUGH-annotations.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -472,8 +470,6 @@
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
-%patch82 -p1
-%patch83 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub-2.02~rc2.tar.xz -> grub-2.02.tar.xz ++
 25291 lines of diff (skipped)


++ translations-20140921.tar.xz -> translations-20170427.tar.xz ++
 91477 lines of diff (skipped)

++ use-grub2-as-a-package-name.patch ++
--- /var/tmp/diff_new_pack.A9SByJ/_old  2017-05-06 20:45:31.293650979 +0200
+++ /var/tmp/diff_new_pack.A9SByJ/_new  2017-05-06 20:45:31.297650415 +0200
@@ -12,16 +12,16 @@
  configure.ac |2 +-
  2 files changed, 13 insertions(+), 13 deletions(-)
 
-Index: grub-2.02~rc2/configure.ac
+Index: grub-2.02/configure.ac
 ===
 grub-2.02~rc2.orig/configure.ac
-+++ grub-2.02~rc2/configure.ac
+--- grub-2.02.orig/configure.ac
 grub-2.02/configure.ac
 @@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc
  dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
  dnl used for the target type. See INSTALL for full list of variables.
  
--AC_INIT([GRUB],[2.02~rc2],[bug-g...@gnu.org])
-+AC_INIT([GRUB2],[2.02~rc2],[bug-g...@gnu.org])
+-AC_INIT([GRUB],[2.02],[bug-g...@gnu.org])
++AC_INIT([GRUB2],[2.02],[bug-g...@gnu.org])
  
  AC_CONFIG_AUX_DIR([build-aux])
  

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-04-24 09:46:06

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Mon Apr 24 09:46:06 2017 rev:160 rq:485744 version:2.02~rc2

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-03-21 
22:47:24.360961291 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-04-24 
09:46:08.930318001 +0200
@@ -1,0 +2,13 @@
+Sun Mar 26 18:08:20 UTC 2017 - arvidj...@gmail.com
+
+- update grub2-btrfs-workaround-grub2-once.patch to also store saved_entry
+  in additional environment block (boo#1031025)
+
+---
+Wed Mar 22 17:39:52 UTC 2017 - arvidj...@gmail.com
+
+- fix building with GCC (bsc#1030247)
+  * add grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch
+  * grub2-add-FALLTHROUGH-annotations.patch
+
+---

New:

  grub2-add-FALLTHROUGH-annotations.patch
  grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.XxBmjc/_old  2017-04-24 09:46:12.029879605 +0200
+++ /var/tmp/diff_new_pack.XxBmjc/_new  2017-04-24 09:46:12.033879039 +0200
@@ -208,6 +208,8 @@
 Patch79:grub2-efi-chainload-harder.patch
 Patch80:grub2-emu-4-all.patch
 Patch81:grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
+Patch82:grub2-fix-uninitialized-variable-in-btrfs-with-GCC7.patch
+Patch83:grub2-add-FALLTHROUGH-annotations.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -470,6 +472,8 @@
 %patch79 -p1
 %patch80 -p1
 %patch81 -p1
+%patch82 -p1
+%patch83 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1


++ grub2-add-FALLTHROUGH-annotations.patch ++
From: Andrei Borzenkov 
Subject: [PATCH] i386, x86_64, ppc: fix switch fallthrough cases with GCC7

In util/getroot and efidisk slightly modify exitsing comment to mostly
retain it but still make GCC7 compliant with respect to fall through
annotation.

In grub-core/lib/xzembed/xz_dec_lzma2.c it adds same comments as
upstream (I plan to update after release).

In grub-core/tests/setjmp_tets.c declare functions as "noreturn" to
suppress GCC7 warning.

In grub-core/gnulib/regexec.c move FALLTHROUGH outside of #ifdef block,
otherwise it is not accepted by GCC7 parser (which requires that comment
immediately precedes case statement).

Otherwise add FALLTHROUGH comment.

Closes: 50598

---
 grub-core/commands/hdparm.c   | 1 +
 grub-core/commands/nativedisk.c   | 1 +
 grub-core/disk/cryptodisk.c   | 1 +
 grub-core/disk/efi/efidisk.c  | 2 +-
 grub-core/efiemu/mm.c | 1 +
 grub-core/gdb/cstub.c | 1 +
 grub-core/gnulib/regexec.c| 4 +++-
 grub-core/lib/xzembed/xz_dec_lzma2.c  | 4 
 grub-core/lib/xzembed/xz_dec_stream.c | 6 ++
 grub-core/loader/i386/linux.c | 3 +++
 grub-core/tests/setjmp_test.c | 5 -
 grub-core/video/ieee1275.c| 1 +
 grub-core/video/readers/jpeg.c| 1 +
 util/getroot.c| 2 +-
 util/grub-install.c   | 1 +
 util/grub-mkimagexx.c | 1 +
 util/grub-mount.c | 1 +
 17 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/grub-core/commands/hdparm.c b/grub-core/commands/hdparm.c
index f6b178e..d3fa966 100644
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@ -328,6 +328,7 @@ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char 
**args)
  ata = ((struct grub_scsi *) disk->data)->data;
  break;
}
+  /* FALLTHROUGH */
 default:
   grub_disk_close (disk);
   return grub_error (GRUB_ERR_IO, "not an ATA device");
diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
index 345f97c..2f56a87 100644
--- a/grub-core/commands/nativedisk.c
+++ b/grub-core/commands/nativedisk.c
@@ -79,6 +79,7 @@ get_uuid (const char *name, char **uuid, int getnative)
 case GRUB_DISK_DEVICE_XEN:
   if (getnative)
break;
+  /* FALLTHROUGH */
 
   /* Virtual disks.  */
   /* GRUB dynamically generated files.  */
diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 1e03a09..bd60a66 100644
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -282,6 +282,7 @@ grub_cryptodisk_endecrypt (struct grub_cryptodisk *dev,
   

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-03-21 22:46:44

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Mar 21 22:46:44 2017 rev:159 rq:481722 version:2.02~rc2

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-03-14 
09:54:36.845758487 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-03-21 
22:47:24.360961291 +0100
@@ -1,0 +2,54 @@
+Mon Mar 20 09:43:58 UTC 2017 - mch...@suse.com
+
+- Fix out of memory error on lvm detection (bsc#1016536) (bsc#1027401)
+  * grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch
+- Fix boot failure if /boot is separate btrfs partition (bsc#1023160)
+  * grub2-btrfs-06-subvol-mount.patch 
+
+---
+Fri Mar 17 06:22:42 UTC 2017 - mch...@suse.com
+
+- 0004-tpm-Rework-linux-command.patch : Fix out of bound memory copy
+  (bsc#1029187)  
+
+---
+Thu Mar 16 16:32:54 UTC 2017 - arvidj...@gmail.com
+
+- new upstream version 2.02~rc2
+  * rediff
+- use-grub2-as-a-package-name.patch
+- grub2-linguas.sh-no-rsync.patch
+  * drop upstream patches
+- 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch
+
+---
+Mon Mar  6 06:34:01 UTC 2017 - mch...@suse.com
+
+- TPM Support (FATE#315831)
+  * 0001-tpm-Core-TPM-support.patch
+  * 0002-tpm-Measure-kernel-initrd.patch
+  * 0003-tpm-Add-BIOS-boot-measurement.patch
+  * 0004-tpm-Rework-linux-command.patch
+  * 0005-tpm-Rework-linux16-command.patch
+  * 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
+  * 0007-tpm-Measure-the-kernel-commandline.patch
+  * 0008-tpm-Measure-commands.patch
+  * 0009-tpm-Measure-multiboot-images-and-modules.patch
+  * 0010-tpm-Fix-boot-when-there-s-no-TPM.patch
+  * 0011-tpm-Fix-build-error.patch
+  * 0012-tpm-Build-tpm-as-module.patch
+- grub2.spec : Add grub-tpm.efi for Secure Boot
+
+---
+Fri Mar  3 10:26:10 UTC 2017 - mch...@suse.com
+
+- Fix invalid Xen EFI config files if xen_args include GRUB2 quoting
+  (bsc#900418) (bsc#951748)
+  * grub2-efi-xen-cfg-unquote.patch
+- Fix linuxefi erroneously initialize linux's boot_params with non-zero
+  values. (bsc#1025563)
+  * grub2-linuxefi-fix-boot-params.patch
+- Removed grub2-fix-multi-device-root-kernel-argument.patch as it has
+  regression on how GRUB_DISABLE_LINUX_UUID=true interpreted (bsc#1015138)
+
+---

Old:

  0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch
  grub-2.02~rc1.tar.xz
  grub2-fix-multi-device-root-kernel-argument.patch

New:

  0001-tpm-Core-TPM-support.patch
  0002-tpm-Measure-kernel-initrd.patch
  0003-tpm-Add-BIOS-boot-measurement.patch
  0004-tpm-Rework-linux-command.patch
  0005-tpm-Rework-linux16-command.patch
  0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
  0007-tpm-Measure-the-kernel-commandline.patch
  0008-tpm-Measure-commands.patch
  0009-tpm-Measure-multiboot-images-and-modules.patch
  0010-tpm-Fix-boot-when-there-s-no-TPM.patch
  0011-tpm-Fix-build-error.patch
  0012-tpm-Build-tpm-as-module.patch
  grub-2.02~rc2.tar.xz
  grub2-efi-xen-cfg-unquote.patch
  grub2-linuxefi-fix-boot-params.patch
  grub2-lvm-allocate-metadata-buffer-from-raw-contents.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.avxWlX/_old  2017-03-21 22:47:26.312685367 +0100
+++ /var/tmp/diff_new_pack.avxWlX/_new  2017-03-21 22:47:26.312685367 +0100
@@ -136,7 +136,7 @@
 %define only_x86_64 %{nil}
 %endif
 
-Version:2.02~rc1
+Version:2.02~rc2
 Release:0
 Summary:Bootloader with support for Linux, Multiboot and more
 License:GPL-3.0+
@@ -178,8 +178,9 @@
 Patch22:grub2-secureboot-use-linuxefi-on-uefi.patch
 Patch23:grub2-secureboot-no-insmod-on-sb.patch
 Patch24:grub2-secureboot-provide-linuxefi-config.patch
-Patch29:grub2-secureboot-chainloader.patch
-Patch34:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+Patch25:grub2-secureboot-chainloader.patch
+Patch26:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+Patch27:grub2-linuxefi-fix-boot-params.patch
 Patch35:grub2-linguas.sh-no-rsync.patch
 Patch37:grub2-use-Unifont-for-starfield-theme-terminal.patch
 Patch38:
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
@@ -206,7 +207,7 @@
 Patch78:

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-03-14 09:54:35

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Tue Mar 14 09:54:35 2017 rev:158 rq: version:2.02~rc1

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-03-11 
15:18:49.514446142 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-03-14 
09:54:36.845758487 +0100
@@ -2,30 +1,0 @@
-Mon Mar  6 06:34:01 UTC 2017 - mch...@suse.com
-
-- TPM Support (FATE#315831)
-  * 0001-tpm-Core-TPM-support.patch
-  * 0002-tpm-Measure-kernel-initrd.patch
-  * 0003-tpm-Add-BIOS-boot-measurement.patch
-  * 0004-tpm-Rework-linux-command.patch
-  * 0005-tpm-Rework-linux16-command.patch
-  * 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
-  * 0007-tpm-Measure-the-kernel-commandline.patch
-  * 0008-tpm-Measure-commands.patch
-  * 0009-tpm-Measure-multiboot-images-and-modules.patch
-  * 0010-tpm-Fix-boot-when-there-s-no-TPM.patch
-  * 0011-tpm-Fix-build-error.patch
-  * 0012-tpm-Build-tpm-as-module.patch
-- grub2.spec : Add grub-tpm.efi for Secure Boot
-

-Fri Mar  3 10:26:10 UTC 2017 - mch...@suse.com
-
-- Fix invalid Xen EFI config files if xen_args include GRUB2 quoting
-  (bsc#900418) (bsc#951748)
-  * grub2-efi-xen-cfg-unquote.patch
-- Fix linuxefi erroneously initialize linux's boot_params with non-zero
-  values. (bsc#1025563)
-  * grub2-linuxefi-fix-boot-params.patch
-- Removed grub2-fix-multi-device-root-kernel-argument.patch as it has
-  regression on how GRUB_DISABLE_LINUX_UUID=true interpreted (bsc#1015138)
-


Old:

  0001-tpm-Core-TPM-support.patch
  0002-tpm-Measure-kernel-initrd.patch
  0003-tpm-Add-BIOS-boot-measurement.patch
  0004-tpm-Rework-linux-command.patch
  0005-tpm-Rework-linux16-command.patch
  0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
  0007-tpm-Measure-the-kernel-commandline.patch
  0008-tpm-Measure-commands.patch
  0009-tpm-Measure-multiboot-images-and-modules.patch
  0010-tpm-Fix-boot-when-there-s-no-TPM.patch
  0011-tpm-Fix-build-error.patch
  0012-tpm-Build-tpm-as-module.patch
  grub2-efi-xen-cfg-unquote.patch
  grub2-linuxefi-fix-boot-params.patch

New:

  grub2-fix-multi-device-root-kernel-argument.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.pjVSyf/_old  2017-03-14 09:54:38.877470802 +0100
+++ /var/tmp/diff_new_pack.pjVSyf/_new  2017-03-14 09:54:38.881470235 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -178,9 +178,8 @@
 Patch22:grub2-secureboot-use-linuxefi-on-uefi.patch
 Patch23:grub2-secureboot-no-insmod-on-sb.patch
 Patch24:grub2-secureboot-provide-linuxefi-config.patch
-Patch25:grub2-secureboot-chainloader.patch
-Patch26:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
-Patch27:grub2-linuxefi-fix-boot-params.patch
+Patch29:grub2-secureboot-chainloader.patch
+Patch34:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
 Patch35:grub2-linguas.sh-no-rsync.patch
 Patch37:grub2-use-Unifont-for-starfield-theme-terminal.patch
 Patch38:
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
@@ -221,13 +220,13 @@
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
 Patch122:   grub2-efi-xen-cmdline.patch
-Patch123:   grub2-efi-xen-cfg-unquote.patch
 # Hidden menu entry and hotkey "t" for text console
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
 # EFI free memory on exit fix (bsc#980739)
 Patch150:   grub2-efi-Free-malloc-regions-on-exit.patch
 # Linux root device related patches
+Patch162:   grub2-fix-multi-device-root-kernel-argument.patch
 Patch163:   grub2-zipl-setup-fix-btrfs-multipledev.patch
 Patch164:   grub2-suse-remove-linux-root-param.patch
 # PPC64 LE support
@@ -249,19 +248,6 @@
 Patch287:   0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
 # Fix GOP BLT support (FATE#322332)
 Patch311:   grub2-efi-gop-add-blt.patch
-# TPM Support (FATE#315831)
-Patch400:   0001-tpm-Core-TPM-support.patch
-Patch401:   0002-tpm-Measure-kernel-initrd.patch
-Patch402:   

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-03-11 15:18:48

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sat Mar 11 15:18:48 2017 rev:157 rq:477883 version:2.02~rc1

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-03-05 
17:59:08.125162773 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-03-11 
15:18:49.514446142 +0100
@@ -1,0 +2,30 @@
+Mon Mar  6 06:34:01 UTC 2017 - mch...@suse.com
+
+- TPM Support (FATE#315831)
+  * 0001-tpm-Core-TPM-support.patch
+  * 0002-tpm-Measure-kernel-initrd.patch
+  * 0003-tpm-Add-BIOS-boot-measurement.patch
+  * 0004-tpm-Rework-linux-command.patch
+  * 0005-tpm-Rework-linux16-command.patch
+  * 0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
+  * 0007-tpm-Measure-the-kernel-commandline.patch
+  * 0008-tpm-Measure-commands.patch
+  * 0009-tpm-Measure-multiboot-images-and-modules.patch
+  * 0010-tpm-Fix-boot-when-there-s-no-TPM.patch
+  * 0011-tpm-Fix-build-error.patch
+  * 0012-tpm-Build-tpm-as-module.patch
+- grub2.spec : Add grub-tpm.efi for Secure Boot
+
+---
+Fri Mar  3 10:26:10 UTC 2017 - mch...@suse.com
+
+- Fix invalid Xen EFI config files if xen_args include GRUB2 quoting
+  (bsc#900418) (bsc#951748)
+  * grub2-efi-xen-cfg-unquote.patch
+- Fix linuxefi erroneously initialize linux's boot_params with non-zero
+  values. (bsc#1025563)
+  * grub2-linuxefi-fix-boot-params.patch
+- Removed grub2-fix-multi-device-root-kernel-argument.patch as it has
+  regression on how GRUB_DISABLE_LINUX_UUID=true interpreted (bsc#1015138)
+
+---

Old:

  grub2-fix-multi-device-root-kernel-argument.patch

New:

  0001-tpm-Core-TPM-support.patch
  0002-tpm-Measure-kernel-initrd.patch
  0003-tpm-Add-BIOS-boot-measurement.patch
  0004-tpm-Rework-linux-command.patch
  0005-tpm-Rework-linux16-command.patch
  0006-tpm-Measure-kernel-and-initrd-on-BIOS-systems.patch
  0007-tpm-Measure-the-kernel-commandline.patch
  0008-tpm-Measure-commands.patch
  0009-tpm-Measure-multiboot-images-and-modules.patch
  0010-tpm-Fix-boot-when-there-s-no-TPM.patch
  0011-tpm-Fix-build-error.patch
  0012-tpm-Build-tpm-as-module.patch
  grub2-efi-xen-cfg-unquote.patch
  grub2-linuxefi-fix-boot-params.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.kvmm1K/_old  2017-03-11 15:18:51.926104864 +0100
+++ /var/tmp/diff_new_pack.kvmm1K/_new  2017-03-11 15:18:51.930104298 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -178,8 +178,9 @@
 Patch22:grub2-secureboot-use-linuxefi-on-uefi.patch
 Patch23:grub2-secureboot-no-insmod-on-sb.patch
 Patch24:grub2-secureboot-provide-linuxefi-config.patch
-Patch29:grub2-secureboot-chainloader.patch
-Patch34:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+Patch25:grub2-secureboot-chainloader.patch
+Patch26:grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
+Patch27:grub2-linuxefi-fix-boot-params.patch
 Patch35:grub2-linguas.sh-no-rsync.patch
 Patch37:grub2-use-Unifont-for-starfield-theme-terminal.patch
 Patch38:
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
@@ -220,13 +221,13 @@
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
 Patch122:   grub2-efi-xen-cmdline.patch
+Patch123:   grub2-efi-xen-cfg-unquote.patch
 # Hidden menu entry and hotkey "t" for text console
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
 # EFI free memory on exit fix (bsc#980739)
 Patch150:   grub2-efi-Free-malloc-regions-on-exit.patch
 # Linux root device related patches
-Patch162:   grub2-fix-multi-device-root-kernel-argument.patch
 Patch163:   grub2-zipl-setup-fix-btrfs-multipledev.patch
 Patch164:   grub2-suse-remove-linux-root-param.patch
 # PPC64 LE support
@@ -248,6 +249,19 @@
 Patch287:   0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
 # Fix GOP BLT support (FATE#322332)
 Patch311:   grub2-efi-gop-add-blt.patch
+# TPM Support (FATE#315831)
+Patch400:   0001-tpm-Core-TPM-support.patch
+Patch401:   0002-tpm-Measure-kernel-initrd.patch
+Patch402:   

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-03-05 17:58:46

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Sun Mar  5 17:58:46 2017 rev:156 rq:462013 version:2.02~rc1

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-24 
02:43:16.866985811 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-03-05 
17:59:08.125162773 +0100
@@ -1,0 +2,7 @@
+Wed Mar  1 10:29:46 UTC 2017 - mch...@suse.com
+
+- Fix for openQA UEFI USB Boot failure with upstream patch (bsc#1026344)
+  * added 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch
+  * removed 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch 
+
+---
@@ -10,0 +18,5 @@
+
+---
+Thu Feb 16 12:55:29 UTC 2017 - msucha...@suse.com
+
+- require efibootmgr in efi package (boo#1025520)

Old:

  0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch

New:

  0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.nsMYvQ/_old  2017-03-05 17:59:09.564958981 +0100
+++ /var/tmp/diff_new_pack.nsMYvQ/_new  2017-03-05 17:59:09.568958416 +0100
@@ -206,7 +206,7 @@
 Patch78:grub2-commands-introduce-read_file-subcommand.patch
 Patch79:grub2-efi-chainload-harder.patch
 Patch80:grub2-emu-4-all.patch
-Patch81:0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch
+Patch81:0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -337,19 +337,11 @@
 %package %{grubefiarch}
 
 Summary:Bootloader with support for Linux, Multiboot and more
+# Require efibootmgr
+# Without it grub-install is broken so break the package as well if unavailable
 Group:  System/Boot
-%ifarch ia64 x86_64 aarch64
-#Package is available on ia64, x86_64 and aarch64 only and not necessarily 
needed
 Requires:   efibootmgr
 Requires(post): efibootmgr
-%endif
-# Also require efibootmgr on i586 Tumbleweed where it is available
-%if 0%{?suse_version} > 1320
-%ifarch i586
-Requires:   efibootmgr
-Requires(post): efibootmgr
-%endif
-%endif
 Requires:   %{name} = %{version}-%{release}
 Requires(post):%{name} = %{version}-%{release}
 %if 0%{?update_bootloader_requires:1}

++ 0001-efi-strip-off-final-NULL-from-File-Path-in-grub_efi_.patch ++
>From 892dfbe113d08c18e51d7c27eee5094f3da530ec Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov 
Date: Sat, 25 Feb 2017 08:39:38 +0300
Subject: [PATCH] efi: strip off final NULL from File Path in
 grub_efi_get_filename

UEFI 2.6 9.3.6.4 File Path Media Device Path says that Path Name is
"A NULL-terminated Path string including directory and file names".

Strip final NULL from Path Name in each File Path node when constructing
full path. To be on safe side, strip all of them.

Fixes failure chainloading grub from grub, when loaded grub truncates
image path and does not find its grub.cfg.

https://bugzilla.opensuse.org/show_bug.cgi?id=1026344

This was triggered by commit ce95549cc54b5d6f494608a7c390dba3aab4fba7;
before it we built Path Name without trailing NULL, and apparently all
other bootloaders use single File Path node, thus not exposing this bug.
---
 grub-core/kern/efi/efi.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index caf9bcc..d467785 100644
--- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c
@@ -366,6 +366,9 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
  len = ((GRUB_EFI_DEVICE_PATH_LENGTH (dp) - 4)
 / sizeof (grub_efi_char16_t));
  fp = (grub_efi_file_path_device_path_t *) dp;
+ /* According to EFI spec Path Name is NULL terminated */
+ while (len > 0 && fp->path_name[len - 1] == 0)
+   len--;
 
  p = (char *) grub_utf16_to_utf8 ((unsigned char *) p, fp->path_name, 
len);
}
-- 
2.6.6

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-24 02:43:15

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-22 
13:58:50.535010879 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-24 
02:43:16.866985811 +0100
@@ -1,0 +2,43 @@
+Thu Feb 23 15:06:44 UTC 2017 - mch...@suse.com
+
+- Temporary fix for openQA UEFI USB Boot failure (bsc#1026344)
+  * 0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch 
+
+---
+Fri Feb 17 06:46:11 UTC 2017 - mch...@suse.com
+
+- grub2.spec: fix s390x file list.
+
+---
+Wed Feb 15 07:25:02 UTC 2017 - mch...@suse.com
+
+- Merge changes from SLE12
+- add grub2-emu-4-all.patch
+  * Build 'grub2-emu' wherever possible, to allow a better
+implementation of that feature.
+- add grub2-s390x-06-loadparm.patch,
+- add grub2-commands-introduce-read_file-subcommand.patch:
+  * allow s390x to telecontrol grub2.  (bsc#891946, bsc#892852)
+- add grub2-s390x-06-loadparm.patch:
+  * ignore case and fix transliteration of parameter.  (bsc#891946)
+- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
+  * Add --image switch to force zipl update to specific kernel
+(bsc#928131)
+- add grub2-s390x-08-workaround-part-to-disk.patch
+  * Ignore partition tables on s390x. (bsc#935127)
+- add grub2-efi-chainload-harder.patch:
+  * allow XEN to be chain-loaded despite firmware flaws.  (bnc#887793)
+  * Do not use shim lock protocol for reading pe header, it won't be
+  available when secure boot disabled (bsc#943380)
+  * Make firmware flaw condition be more precisely detected and add
+  debug message for the case
+  * Check msdos header to find PE file header (bsc#954126)
+- grub2-s390x-04-grub2-install.patch:
+  * streamline boot to grub menu.  (bsc#898198)
+  * Force '/usr' to read-only before calling kexec. (bsc#932951)
+- grub2-once:
+  * add '--enum' option to enumerate boot-entries in a way
+actually understood by 'grub2'.  (bsc#892852, bsc#892811)
+  * Examine variables from grub environment in 'grub2-once'. (fate#319632)
+
+---

New:

  0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch
  grub2-commands-introduce-read_file-subcommand.patch
  grub2-efi-chainload-harder.patch
  grub2-emu-4-all.patch
  grub2-s390x-06-loadparm.patch
  grub2-s390x-07-add-image-param-for-zipl-setup.patch
  grub2-s390x-08-workaround-part-to-disk.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.5g06DY/_old  2017-02-24 02:43:19.766575438 +0100
+++ /var/tmp/diff_new_pack.5g06DY/_new  2017-02-24 02:43:19.766575438 +0100
@@ -64,9 +64,14 @@
 # Modules code is dynamically loaded and collected from a _fixed_ path.
 %define _libdir %{_exec_prefix}/lib
 
+# Build grub2-emu everywhere (it may be "required" by 'grub2-once')
+%define emu 1
+
 %ifarch ppc ppc64 ppc64le
 %define grubcpu powerpc
 %define platform ieee1275
+# emu does not build here yet... :-(
+%define emu 0
 %endif
 
 %ifarch %{ix86} x86_64
@@ -84,15 +89,18 @@
 %define platform uboot
 %endif
 
+%ifarch aarch64
+%define grubcpu arm64
+%define platform efi
+%define only_efi 1
+%endif
+
 %define grubarch %{grubcpu}-%{platform}
 
 # build efi bootloader on some platforms only:
 %if ! 0%{?efi:1}
 %global efi %{ix86} x86_64 ia64 aarch64 %{arm}
 %endif
-%ifarch aarch64
-%define only_efi 1
-%endif
 
 %ifarch %{efi}
 %ifarch %{ix86}
@@ -118,6 +126,11 @@
 %define grubxenarch x86_64-xen
 %endif
 
+%if %{platform} == emu
+# force %{emu} to 1, e.g. for s390
+%define emu 1
+%endif
+
 %if 0%{?suse_version} == 1110
 %define only_efi %{nil}
 %define only_x86_64 %{nil}
@@ -187,6 +200,13 @@
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
 Patch74:grub2-accept-empty-module.patch
+Patch75:grub2-s390x-06-loadparm.patch
+Patch76:grub2-s390x-07-add-image-param-for-zipl-setup.patch
+Patch77:grub2-s390x-08-workaround-part-to-disk.patch
+Patch78:grub2-commands-introduce-read_file-subcommand.patch
+Patch79:grub2-efi-chainload-harder.patch
+Patch80:grub2-emu-4-all.patch
+Patch81:0001-Revert-efi-properly-terminate-filepath-with-NULL-in-.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -280,6 +300,7 @@
 %description 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-22 13:58:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-20 
14:28:17.625552693 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-22 
13:58:50.535010879 +0100
@@ -2,37 +1,0 @@
-Fri Feb 17 06:46:11 UTC 2017 - mch...@suse.com
-
-- grub2.spec: fix s390x file list.
-

-Wed Feb 15 07:25:02 UTC 2017 - mch...@suse.com
-
-- Merge changes from SLE12
-- add grub2-emu-4-all.patch
-  * Build 'grub2-emu' wherever possible, to allow a better
-implementation of that feature.
-- add grub2-s390x-06-loadparm.patch,
-- add grub2-commands-introduce-read_file-subcommand.patch:
-  * allow s390x to telecontrol grub2.  (bsc#891946, bsc#892852)
-- add grub2-s390x-06-loadparm.patch:
-  * ignore case and fix transliteration of parameter.  (bsc#891946)
-- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
-  * Add --image switch to force zipl update to specific kernel
-(bsc#928131)
-- add grub2-s390x-08-workaround-part-to-disk.patch
-  * Ignore partition tables on s390x. (bsc#935127)
-- add grub2-efi-chainload-harder.patch:
-  * allow XEN to be chain-loaded despite firmware flaws.  (bnc#887793)
-  * Do not use shim lock protocol for reading pe header, it won't be
-  available when secure boot disabled (bsc#943380)
-  * Make firmware flaw condition be more precisely detected and add
-  debug message for the case
-  * Check msdos header to find PE file header (bsc#954126)
-- grub2-s390x-04-grub2-install.patch:
-  * streamline boot to grub menu.  (bsc#898198)
-  * Force '/usr' to read-only before calling kexec. (bsc#932951)
-- grub2-once:
-  * add '--enum' option to enumerate boot-entries in a way
-actually understood by 'grub2'.  (bsc#892852, bsc#892811)
-  * Examine variables from grub environment in 'grub2-once'. (fate#319632)
-


Old:

  grub2-commands-introduce-read_file-subcommand.patch
  grub2-efi-chainload-harder.patch
  grub2-emu-4-all.patch
  grub2-s390x-06-loadparm.patch
  grub2-s390x-07-add-image-param-for-zipl-setup.patch
  grub2-s390x-08-workaround-part-to-disk.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.sjcI4X/_old  2017-02-22 13:58:52.954666733 +0100
+++ /var/tmp/diff_new_pack.sjcI4X/_new  2017-02-22 13:58:52.954666733 +0100
@@ -64,14 +64,9 @@
 # Modules code is dynamically loaded and collected from a _fixed_ path.
 %define _libdir %{_exec_prefix}/lib
 
-# Build grub2-emu everywhere (it may be "required" by 'grub2-once')
-%define emu 1
-
 %ifarch ppc ppc64 ppc64le
 %define grubcpu powerpc
 %define platform ieee1275
-# emu does not build here yet... :-(
-%define emu 0
 %endif
 
 %ifarch %{ix86} x86_64
@@ -89,18 +84,15 @@
 %define platform uboot
 %endif
 
-%ifarch aarch64
-%define grubcpu arm64
-%define platform efi
-%define only_efi 1
-%endif
-
 %define grubarch %{grubcpu}-%{platform}
 
 # build efi bootloader on some platforms only:
 %if ! 0%{?efi:1}
 %global efi %{ix86} x86_64 ia64 aarch64 %{arm}
 %endif
+%ifarch aarch64
+%define only_efi 1
+%endif
 
 %ifarch %{efi}
 %ifarch %{ix86}
@@ -126,11 +118,6 @@
 %define grubxenarch x86_64-xen
 %endif
 
-%if %{platform} == emu
-# force %{emu} to 1, e.g. for s390
-%define emu 1
-%endif
-
 %if 0%{?suse_version} == 1110
 %define only_efi %{nil}
 %define only_x86_64 %{nil}
@@ -200,12 +187,6 @@
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
 Patch74:grub2-accept-empty-module.patch
-Patch75:grub2-s390x-06-loadparm.patch
-Patch76:grub2-s390x-07-add-image-param-for-zipl-setup.patch
-Patch77:grub2-s390x-08-workaround-part-to-disk.patch
-Patch78:grub2-commands-introduce-read_file-subcommand.patch
-Patch79:grub2-efi-chainload-harder.patch
-Patch80:grub2-emu-4-all.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -299,7 +280,6 @@
 %description branding-upstream
 Upstream branding for GRUB2's graphical console
 
-%if ! 0%{?only_efi:1}
 %package %{grubarch}
 
 Summary:Bootloader with support for Linux, Multiboot and more
@@ -329,8 +309,6 @@
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for %{platform} systems.
 
-%endif
-
 %ifarch %{efi}
 
 %package %{grubefiarch}
@@ -455,12 +433,6 @@
 %patch71 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-20 14:28:16

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-14 
00:38:51.791028161 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-20 
14:28:17.625552693 +0100
@@ -1,0 +2,37 @@
+Fri Feb 17 06:46:11 UTC 2017 - mch...@suse.com
+
+- grub2.spec: fix s390x file list.
+
+---
+Wed Feb 15 07:25:02 UTC 2017 - mch...@suse.com
+
+- Merge changes from SLE12
+- add grub2-emu-4-all.patch
+  * Build 'grub2-emu' wherever possible, to allow a better
+implementation of that feature.
+- add grub2-s390x-06-loadparm.patch,
+- add grub2-commands-introduce-read_file-subcommand.patch:
+  * allow s390x to telecontrol grub2.  (bsc#891946, bsc#892852)
+- add grub2-s390x-06-loadparm.patch:
+  * ignore case and fix transliteration of parameter.  (bsc#891946)
+- add grub2-s390x-07-add-image-param-for-zipl-setup.patch
+  * Add --image switch to force zipl update to specific kernel
+(bsc#928131)
+- add grub2-s390x-08-workaround-part-to-disk.patch
+  * Ignore partition tables on s390x. (bsc#935127)
+- add grub2-efi-chainload-harder.patch:
+  * allow XEN to be chain-loaded despite firmware flaws.  (bnc#887793)
+  * Do not use shim lock protocol for reading pe header, it won't be
+  available when secure boot disabled (bsc#943380)
+  * Make firmware flaw condition be more precisely detected and add
+  debug message for the case
+  * Check msdos header to find PE file header (bsc#954126)
+- grub2-s390x-04-grub2-install.patch:
+  * streamline boot to grub menu.  (bsc#898198)
+  * Force '/usr' to read-only before calling kexec. (bsc#932951)
+- grub2-once:
+  * add '--enum' option to enumerate boot-entries in a way
+actually understood by 'grub2'.  (bsc#892852, bsc#892811)
+  * Examine variables from grub environment in 'grub2-once'. (fate#319632)
+
+---

New:

  grub2-commands-introduce-read_file-subcommand.patch
  grub2-efi-chainload-harder.patch
  grub2-emu-4-all.patch
  grub2-s390x-06-loadparm.patch
  grub2-s390x-07-add-image-param-for-zipl-setup.patch
  grub2-s390x-08-workaround-part-to-disk.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Vkz1sZ/_old  2017-02-20 14:28:19.665264871 +0100
+++ /var/tmp/diff_new_pack.Vkz1sZ/_new  2017-02-20 14:28:19.669264307 +0100
@@ -64,9 +64,14 @@
 # Modules code is dynamically loaded and collected from a _fixed_ path.
 %define _libdir %{_exec_prefix}/lib
 
+# Build grub2-emu everywhere (it may be "required" by 'grub2-once')
+%define emu 1
+
 %ifarch ppc ppc64 ppc64le
 %define grubcpu powerpc
 %define platform ieee1275
+# emu does not build here yet... :-(
+%define emu 0
 %endif
 
 %ifarch %{ix86} x86_64
@@ -84,15 +89,18 @@
 %define platform uboot
 %endif
 
+%ifarch aarch64
+%define grubcpu arm64
+%define platform efi
+%define only_efi 1
+%endif
+
 %define grubarch %{grubcpu}-%{platform}
 
 # build efi bootloader on some platforms only:
 %if ! 0%{?efi:1}
 %global efi %{ix86} x86_64 ia64 aarch64 %{arm}
 %endif
-%ifarch aarch64
-%define only_efi 1
-%endif
 
 %ifarch %{efi}
 %ifarch %{ix86}
@@ -118,6 +126,11 @@
 %define grubxenarch x86_64-xen
 %endif
 
+%if %{platform} == emu
+# force %{emu} to 1, e.g. for s390
+%define emu 1
+%endif
+
 %if 0%{?suse_version} == 1110
 %define only_efi %{nil}
 %define only_x86_64 %{nil}
@@ -187,6 +200,12 @@
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
 Patch74:grub2-accept-empty-module.patch
+Patch75:grub2-s390x-06-loadparm.patch
+Patch76:grub2-s390x-07-add-image-param-for-zipl-setup.patch
+Patch77:grub2-s390x-08-workaround-part-to-disk.patch
+Patch78:grub2-commands-introduce-read_file-subcommand.patch
+Patch79:grub2-efi-chainload-harder.patch
+Patch80:grub2-emu-4-all.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -280,6 +299,7 @@
 %description branding-upstream
 Upstream branding for GRUB2's graphical console
 
+%if ! 0%{?only_efi:1}
 %package %{grubarch}
 
 Summary:Bootloader with support for Linux, Multiboot and more
@@ -309,6 +329,8 @@
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for %{platform} systems.
 
+%endif
+
 %ifarch %{efi}
 
 %package %{grubefiarch}
@@ -433,6 +455,12 @@
 %patch71 

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-14 00:38:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-07 
11:58:00.572008842 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-14 
00:38:51.791028161 +0100
@@ -1,0 +2,44 @@
+Fri Feb 10 17:58:22 UTC 2017 - arvidj...@gmail.com
+
+- new upstream version 2.02~rc1
+  * rediff
+- use-grub2-as-a-package-name.patch
+- grub2-s390x-04-grub2-install.patch
+- grub2-accept-empty-module.patch
+- grub2-btrfs-04-grub2-install.patch
+- grub2-btrfs-06-subvol-mount.patch
+  * drop upstream patches
+- 0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
+- 0001-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch
+- 0002-configure-fix-check-for-sys-sysmacros.h-under-glibc-.patch
+- 0001-Fix-fwpath-in-efi-netboot.patch
+- 0001-arm64-Move-firmware-fdt-search-into-global-function.patch
+- 0002-arm-efi-Use-fdt-from-firmware-when-available.patch
+- grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch
+- 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
+- 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
+- 0001-xen-make-xen-loader-callable-multiple-times.patch
+- 0002-xen-avoid-memleaks-on-error.patch
+- 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch
+- 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch
+- 0005-xen-synchronize-xen-header.patch
+- 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch
+- 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch
+- 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch
+- 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
+- 0010-xen-modify-page-table-construction.patch
+- 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch
+  * add
+- 
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
+  fix compilation with new glibc
+
+---
+Thu Feb  9 03:45:16 UTC 2017 - mch...@suse.com
+
+- Fix build error on glibc-2.25
+  * 0001-build-Use-AC_HEADER_MAJOR-to-find-device-macros.patch
+  * 0002-configure-fix-check-for-sys-sysmacros.h-under-glibc-.patch
+- Fix fwpath in efi netboot (fate#321993) (bsc#1022294)
+  * 0001-Fix-fwpath-in-efi-netboot.patch
+
+---

Old:

  0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
  0001-arm64-Move-firmware-fdt-search-into-global-function.patch
  0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
  0001-xen-make-xen-loader-callable-multiple-times.patch
  0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
  0002-arm-efi-Use-fdt-from-firmware-when-available.patch
  0002-xen-avoid-memleaks-on-error.patch
  0003-xen-reduce-number-of-global-variables-in-xen-loader.patch
  0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch
  0005-xen-synchronize-xen-header.patch
  0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch
  0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch
  0008-xen-factor-out-allocation-of-page-tables-into-separa.patch
  0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
  0010-xen-modify-page-table-construction.patch
  0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch
  grub-2.02~beta3.tar.xz
  grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch

New:

  
fix-grub2-use-stat-instead-of-udevadm-for-partition-lookup-with-new-glibc.patch
  grub-2.02~rc1.tar.xz



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.82a0Wj/_old  2017-02-14 00:38:58.010150144 +0100
+++ /var/tmp/diff_new_pack.82a0Wj/_new  2017-02-14 00:38:58.014149579 +0100
@@ -123,7 +123,7 @@
 %define only_x86_64 %{nil}
 %endif
 
-Version:2.02~beta3
+Version:2.02~rc1
 Release:0
 Summary:Bootloader with support for Linux, Multiboot and more
 License:GPL-3.0+
@@ -186,7 +186,6 @@
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
-Patch73:0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
 Patch74:grub2-accept-empty-module.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
@@ -201,18 +200,12 @@
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-07 11:57:59

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-02-03 
17:41:37.271410264 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-07 
11:58:00.572008842 +0100
@@ -1,0 +2,12 @@
+Fri Feb  3 08:18:30 UTC 2017 - mch...@suse.com
+
+- grub2-systemd-sleep.sh: Fix prematurely abort by commands error return code
+  and skip the offending menu entry (bsc#1022880)
+
+---
+Wed Feb  1 21:42:49 UTC 2017 - ag...@suse.com
+
+- Add support for BLT only EFI GOP adapters (FATE#322332)
+  * grub2-efi-gop-add-blt.patch
+
+---

New:

  grub2-efi-gop-add-blt.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.YB27By/_old  2017-02-07 11:58:03.947530288 +0100
+++ /var/tmp/diff_new_pack.YB27By/_new  2017-02-07 11:58:03.947530288 +0100
@@ -244,6 +244,8 @@
 Patch308:   0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
 Patch309:   0010-xen-modify-page-table-construction.patch
 Patch310:   0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch
+# Fix GOP BLT support (FATE#322332)
+Patch311:   grub2-efi-gop-add-blt.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -497,6 +499,7 @@
 %patch308 -p1
 %patch309 -p1
 %patch310 -p1
+%patch311 -p1
 
 # This simplifies patch handling without need to use git to create patch
 # that renames file


++ grub2-efi-gop-add-blt.patch ++
>From dc56925653819582777ddc5c761a56f528f1 Mon Sep 17 00:00:00 2001
From: Alexander Graf 
Date: Wed, 1 Feb 2017 23:10:45 +0100
Subject: [PATCH] grub-core/video/efi_gop.c: Add support for BLT_ONLY adapters

EFI GOP has support for multiple different bitness types of frame buffers
and for a special "BLT only" type which is always defined to be RGBx.

Because grub2 doesn't ever directly access the frame buffer but instead
only renders graphics via the BLT interface anyway, we can easily support
these adapters.

The reason this has come up now is the emerging support for virtio-gpu
in OVMF. That adapter does not have the notion of a memory mapped frame
buffer and thus is BLT only.

Signed-off-by: Alexander Graf 
---
 grub-core/video/efi_gop.c  | 2 ++
 include/grub/efi/graphics_output.h | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
index 7f9d1c2..c9e40e8 100644
--- a/grub-core/video/efi_gop.c
+++ b/grub-core/video/efi_gop.c
@@ -121,6 +121,7 @@ grub_video_gop_get_bpp (struct grub_efi_gop_mode_info *in)
 {
 case GRUB_EFI_GOT_BGRA8:
 case GRUB_EFI_GOT_RGBA8:
+case GRUB_EFI_GOT_BLT_ONLY:
   return 32;
 
 case GRUB_EFI_GOT_BITMASK:
@@ -187,6 +188,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,
   switch (in->pixel_format)
 {
 case GRUB_EFI_GOT_RGBA8:
+case GRUB_EFI_GOT_BLT_ONLY:
   out->red_mask_size = 8;
   out->red_field_pos = 0;
   out->green_mask_size = 8;
diff --git a/include/grub/efi/graphics_output.h 
b/include/grub/efi/graphics_output.h
index 1297774..e438812 100644
--- a/include/grub/efi/graphics_output.h
+++ b/include/grub/efi/graphics_output.h
@@ -28,7 +28,8 @@ typedef enum
   {
 GRUB_EFI_GOT_RGBA8,
 GRUB_EFI_GOT_BGRA8,
-GRUB_EFI_GOT_BITMASK
+GRUB_EFI_GOT_BITMASK,
+GRUB_EFI_GOT_BLT_ONLY,
   }
   grub_efi_gop_pixel_format_t;
 
-- 
1.8.5.6

++ grub2-systemd-sleep.sh ++
--- /var/tmp/diff_new_pack.YB27By/_old  2017-02-07 11:58:04.391467350 +0100
+++ /var/tmp/diff_new_pack.YB27By/_new  2017-02-07 11:58:04.395466783 +0100
@@ -18,7 +18,7 @@
 
 check-system()
 {
-   [ -x "${GRUB_ONCE}" ] || error_quit "ERROR: cannot find or execute 
${GRUB_EDITENV}"  
+   [ -x "${GRUB_ONCE}" ] || error_quit "ERROR: cannot find or execute 
${GRUB_ONCE}"  
[ -x "${GRUB_EDITENV}" ] || error_quit "ERROR: cannot find or execute 
${GRUB_EDITENV}"
[ -x "${BLKID}" ] || error_quit "ERROR: cannot find or execute ${BLKID}"
[ -r "${GRUB_CONF}" ] || error_quit "ERROR: cannot find or read 
${GRUB_CONF}"
@@ -60,7 +60,7 @@
 
 ;;
linux*noresume*|module*xen*noresume*)
-   echo "  Skipping grub entry #${J}, because it has the noresume 
option" >&2
+   echo "  Skipping ${MENU_ENTRIES[$I]}, because it has the 
noresume option" >&2
;;

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-02-01 09:49:54

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-01-19 
10:38:18.691957412 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-02-03 
17:41:37.271410264 +0100
@@ -1,0 +2,5 @@
+Wed Jan 25 09:58:20 UTC 2017 - sch...@linux-m68k.org
+
+- info-dir-entry.patch: Update info dir entry to follow renaming to grub2
+
+---

New:

  info-dir-entry.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Xc2R3L/_old  2017-02-03 17:41:38.951172508 +0100
+++ /var/tmp/diff_new_pack.Xc2R3L/_new  2017-02-03 17:41:38.955171942 +0100
@@ -151,6 +151,7 @@
 Patch1: rename-grub-info-file-to-grub2.patch
 Patch2: grub2-linux.patch
 Patch3: use-grub2-as-a-package-name.patch
+Patch4: info-dir-entry.patch
 Patch6: grub2-iterate-and-hook-for-extended-partition.patch
 Patch8: grub2-ppc-terminfo.patch
 Patch9: grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
@@ -412,6 +413,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 %patch6 -p1
 %patch8 -p1
 %patch9 -p1


++ info-dir-entry.patch ++
Index: grub-2.02~beta3/docs/grub.texi
===
--- grub-2.02~beta3.orig/docs/grub.texi
+++ grub-2.02~beta3/docs/grub.texi
@@ -32,15 +32,15 @@ Invariant Sections.
 
 @dircategory Kernel
 @direntry
-* GRUB: (grub). The GRand Unified Bootloader
-* grub-install: (grub)Invoking grub-install.Install GRUB on your drive
-* grub-mkconfig: (grub)Invoking grub-mkconfig.  Generate GRUB configuration
-* grub-mkpasswd-pbkdf2: (grub)Invoking grub-mkpasswd-pbkdf2.
-* grub-mkrelpath: (grub)Invoking grub-mkrelpath.
-* grub-mkrescue: (grub)Invoking grub-mkrescue.  Make a GRUB rescue image
-* grub-mount: (grub)Invoking grub-mount.Mount a file system using GRUB
-* grub-probe: (grub)Invoking grub-probe.Probe device information
-* grub-script-check: (grub)Invoking grub-script-check.
+* GRUB2: (grub2). The GRand Unified Bootloader
+* grub2-install: (grub2)Invoking grub-install.Install GRUB on your drive
+* grub2-mkconfig: (grub2)Invoking grub-mkconfig.  Generate GRUB configuration
+* grub2-mkpasswd-pbkdf2: (grub2)Invoking grub-mkpasswd-pbkdf2.
+* grub2-mkrelpath: (grub2)Invoking grub-mkrelpath.
+* grub2-mkrescue: (grub2)Invoking grub-mkrescue.  Make a GRUB rescue image
+* grub2-mount: (grub2)Invoking grub-mount.Mount a file system using 
GRUB
+* grub2-probe: (grub2)Invoking grub-probe.Probe device information
+* grub2-script-check: (grub2)Invoking grub-script-check.
 @end direntry
 
 @setchapternewpage odd

commit grub2 for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2017-01-19 10:38:17

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2017-01-09 
11:52:41.544002808 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2017-01-19 
10:38:18.691957412 +0100
@@ -1,0 +2,12 @@
+Mon Jan 16 10:15:52 UTC 2017 - matwey.korni...@gmail.com
+
+- Add serial module to efi image.
+  Serial terminal is still useful even with EFI Secure Boot
+
+---
+Wed Jan 11 06:58:56 UTC 2017 - mch...@suse.com
+
+- Support %posttrans with marcos provided by update-bootloader-rpm-macros
+  package (bsc#997317)
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.GY3lj3/_old  2017-01-19 10:38:21.163608779 +0100
+++ /var/tmp/diff_new_pack.GY3lj3/_new  2017-01-19 10:38:21.167608215 +0100
@@ -57,6 +57,9 @@
 BuildRequires:  systemd-rpm-macros
 %define has_systemd 1
 %endif
+%if 0%{?suse_version} > 1320
+BuildRequires:  update-bootloader-rpm-macros
+%endif
 
 # Modules code is dynamically loaded and collected from a _fixed_ path.
 %define _libdir %{_exec_prefix}/lib
@@ -298,8 +301,12 @@
 Group:  System/Boot
 Requires:   %{name} = %{version}-%{release}
 Requires(post):%{name} = %{version}-%{release}
+%if 0%{?update_bootloader_requires:1}
+%update_bootloader_requires
+%else
 Requires:   perl-Bootloader
 Requires(post): perl-Bootloader
+%endif
 %ifarch s390x
 # required utilities by grub2-s390x-04-grub2-install.patch
 # use 'showconsole' to determine console device. (bnc#876743)
@@ -337,8 +344,12 @@
 %endif
 Requires:   %{name} = %{version}-%{release}
 Requires(post):%{name} = %{version}-%{release}
+%if 0%{?update_bootloader_requires:1}
+%update_bootloader_requires
+%else
 Requires:   perl-Bootloader >= 0.706
 Requires(post): perl-Bootloader >= 0.706
+%endif
 Provides:   %{name}-efi = %{version}-%{release}
 Obsoletes:  %{name}-efi < %{version}-%{release}
 
@@ -566,7 +577,7 @@
 CD_MODULES="${CD_MODULES} linux" 
 %endif
 
-GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} 
mdraid09 mdraid1x lvm"
+GRUB_MODULES="${CD_MODULES} ${FS_MODULES} ${PXE_MODULES} ${CRYPTO_MODULES} 
mdraid09 mdraid1x lvm serial"
 ./grub-mkimage -O %{grubefiarch} -o grub.efi --prefix= \
-d grub-core ${GRUB_MODULES}
 #./grub-mkimage -O %{grubefiarch} -o grub.efi -d grub-core part_gpt hfsplus 
fat \
@@ -765,6 +776,9 @@
 %if ! 0%{?only_efi:1}
 
 %post %{grubarch}
+%if 0%{?update_bootloader_check_type_reinit_post:1} 
+%update_bootloader_check_type_reinit_post grub2
+%else
 # To check by current loader settings
 if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
   . %{_sysconfdir}/sysconfig/bootloader
@@ -808,10 +822,17 @@
 fi
 %endif
 
+%posttrans %{grubarch}
+%{?update_bootloader_posttrans}
+
+%endif
+
 %ifarch %{efi}
 
 %post %{grubefiarch}
-
+%if 0%{?update_bootloader_check_type_reinit_post:1} 
+%update_bootloader_check_type_reinit_post grub2-efi
+%else
 # To check by current loader settings
 if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
   . %{_sysconfdir}/sysconfig/bootloader
@@ -842,13 +863,21 @@
 exit 0
 %endif
 
+%posttrans %{grubefiarch}
+%{?update_bootloader_posttrans}
+
+%endif
+
 %preun
 %service_del_preun grub2-once.service
 if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/grub-dev.info %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 
-%if ! 0%{?only_efi:1}
+# We did not add core.img to grub1 menu.lst in new update-bootloader macro as 
what
+# the old %post ever did, then the %preun counterpart which removed the added 
core.img
+# entry from old %post can be skipped entirely if having new macro in use.
+%if ! 0%{?update_bootloader_posttrans:1}%{?only_efi:1}
   # To check by current loader settings
   if [ -f %{_sysconfdir}/sysconfig/bootloader ]; then
 . %{_sysconfdir}/sysconfig/bootloader

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-11-03 11:12:13

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-10-26 
13:27:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-11-03 
11:12:14.0 +0100
@@ -1,0 +2,6 @@
+Fri Oct 28 04:08:19 UTC 2016 - mch...@suse.com
+
+- Fix new line character in distributor (bsc#1007212) 
+  * modified grub2-default-distributor.patch 
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.00z898/_old  2016-11-03 11:12:18.0 +0100
+++ /var/tmp/diff_new_pack.00z898/_new  2016-11-03 11:12:18.0 +0100
@@ -14,10 +14,9 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-
-
 # needssslcertforbuild
 
+
 Name:   grub2
 %ifarch x86_64 ppc64
 BuildRequires:  gcc-32bit

++ grub2-default-distributor.patch ++
--- /var/tmp/diff_new_pack.00z898/_old  2016-11-03 11:12:18.0 +0100
+++ /var/tmp/diff_new_pack.00z898/_new  2016-11-03 11:12:18.0 +0100
@@ -2,7 +2,7 @@
 ===
 --- grub-2.02~beta3.orig/grub-core/osdep/unix/config.c
 +++ grub-2.02~beta3/grub-core/osdep/unix/config.c
-@@ -61,6 +61,140 @@ grub_util_get_localedir (void)
+@@ -61,6 +61,143 @@ grub_util_get_localedir (void)
return LOCALEDIR;
  }
  
@@ -94,6 +94,9 @@
 +
 +  while (fgets (buf, sizeof (buf), fp))
 +{
++  if (buf[grub_strlen(buf) - 1] == '\n')
++  buf[grub_strlen(buf) - 1] = '\0';
++
 +  if (!os_pretty_name
 +&& (os_pretty_name = os_release_get_val (buf, "PRETTY_NAME")))
 +  continue;
@@ -143,7 +146,7 @@
  void
  grub_util_load_config (struct grub_util_config *cfg)
  {
-@@ -125,7 +259,17 @@ grub_util_load_config (struct grub_util_
+@@ -125,7 +262,17 @@ grub_util_load_config (struct grub_util_
waitpid (pid, NULL, 0);
  }
if (f)
@@ -162,7 +165,7 @@
  
f = grub_util_fopen (cfgfile, "r");
if (f)
-@@ -136,4 +280,13 @@ grub_util_load_config (struct grub_util_
+@@ -136,4 +283,13 @@ grub_util_load_config (struct grub_util_
else
  grub_util_warn (_("cannot open configuration file `%s': %s"),
cfgfile, strerror (errno));

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-10-26 13:27:22

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-10-18 
10:37:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-10-26 
13:27:23.0 +0200
@@ -1,0 +2,17 @@
+Fri Oct 21 09:34:58 UTC 2016 - mch...@suse.com
+
+- From Juergen Gross : grub-xen: support booting huge
+  pv-domains (bsc#1004398) (bsc#899465)
+  * 0001-xen-make-xen-loader-callable-multiple-times.patch
+  * 0002-xen-avoid-memleaks-on-error.patch
+  * 0003-xen-reduce-number-of-global-variables-in-xen-loader.patch
+  * 0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch
+  * 0005-xen-synchronize-xen-header.patch
+  * 0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch
+  * 0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch
+  * 0008-xen-factor-out-allocation-of-page-tables-into-separa.patch
+  * 0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
+  * 0010-xen-modify-page-table-construction.patch
+  * 0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch
+
+---

New:

  0001-xen-make-xen-loader-callable-multiple-times.patch
  0002-xen-avoid-memleaks-on-error.patch
  0003-xen-reduce-number-of-global-variables-in-xen-loader.patch
  0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch
  0005-xen-synchronize-xen-header.patch
  0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch
  0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch
  0008-xen-factor-out-allocation-of-page-tables-into-separa.patch
  0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
  0010-xen-modify-page-table-construction.patch
  0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.Y5Fpht/_old  2016-10-26 13:27:25.0 +0200
+++ /var/tmp/diff_new_pack.Y5Fpht/_new  2016-10-26 13:27:25.0 +0200
@@ -230,6 +230,18 @@
 Patch285:   0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
 Patch286:   0007-efinet-Setting-network-from-UEFI-device-path.patch
 Patch287:   0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+# Support booting huge xen pv-domains (bsc#1004398) (bsc#899465)
+Patch300:   0001-xen-make-xen-loader-callable-multiple-times.patch
+Patch301:   0002-xen-avoid-memleaks-on-error.patch
+Patch302:   0003-xen-reduce-number-of-global-variables-in-xen-loader.patch
+Patch303:   0004-xen-add-elfnote.h-to-avoid-using-numbers-instead-of-.patch
+Patch304:   0005-xen-synchronize-xen-header.patch
+Patch305:   0006-xen-factor-out-p2m-list-allocation-into-separate-fun.patch
+Patch306:   0007-xen-factor-out-allocation-of-special-pages-into-sepa.patch
+Patch307:   0008-xen-factor-out-allocation-of-page-tables-into-separa.patch
+Patch308:   0009-xen-add-capability-to-load-initrd-outside-of-initial.patch
+Patch309:   0010-xen-modify-page-table-construction.patch
+Patch310:   0011-xen-add-capability-to-load-p2m-list-outside-of-kerne.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -463,6 +475,17 @@
 %patch285 -p1
 %patch286 -p1
 %patch287 -p1
+%patch300 -p1
+%patch301 -p1
+%patch302 -p1
+%patch303 -p1
+%patch304 -p1
+%patch305 -p1
+%patch306 -p1
+%patch307 -p1
+%patch308 -p1
+%patch309 -p1
+%patch310 -p1
 
 # This simplifies patch handling without need to use git to create patch
 # that renames file

++ 0001-xen-make-xen-loader-callable-multiple-times.patch ++
>From 3fcf47254678ddd9387b8ee80f21ad5f163cb7a9 Mon Sep 17 00:00:00 2001
From: Juergen Gross 
Date: Thu, 3 Mar 2016 10:38:06 +0100
Subject: [PATCH 01/11] xen: make xen loader callable multiple times

The loader for xen paravirtualized environment isn't callable multiple
times as it won't free any memory in case of failure.

Call grub_relocator_unload() as other modules do it before allocating
a new relocator or when unloading the module.

Signed-off-by: Juergen Gross 
Reviewed-by: Daniel Kiper 
---
 grub-core/loader/i386/xen.c | 27 +++
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index c4d9689..179e89c 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -316,11 +316,23 @@ grub_xen_boot (void)
  

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-10-18 10:37:31

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-10-10 
17:33:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-10-18 
10:37:31.0 +0200
@@ -1,0 +2,6 @@
+Tue Oct 11 20:59:40 UTC 2016 - dmuel...@suse.com
+
+- add support for netboot on arm64-efi platforms (bsc#998097)
+  * grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch
+
+---

New:

  grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.JtMbrS/_old  2016-10-18 10:37:34.0 +0200
+++ /var/tmp/diff_new_pack.JtMbrS/_new  2016-10-18 10:37:34.0 +0200
@@ -202,6 +202,7 @@
 # 32bit ARM EFI FDT table pass-through support
 Patch130:   0001-arm64-Move-firmware-fdt-search-into-global-function.patch
 Patch131:   0002-arm-efi-Use-fdt-from-firmware-when-available.patch
+Patch132:   grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch
 # Hidden menu entry and hotkey "t" for text console
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
@@ -439,6 +440,7 @@
 %patch122 -p1
 %patch130 -p1
 %patch131 -p1
+%patch132 -p1
 %patch140 -p1
 %patch141 -p1
 %patch150 -p1

++ grub2-arm64-mknetdir-add-suport-for-arm64-efi.patch ++
>From 9243e32707c4b76d4b7ebbc0b4952135d159799d Mon Sep 17 00:00:00 2001
From: Dirk Mueller 
Date: Tue, 11 Oct 2016 22:19:02 +0200
Subject: [PATCH] grub-mknetdir: Add support for ARM64 EFI

---
 util/grub-mknetdir.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/grub-mknetdir.c b/util/grub-mknetdir.c
index 3813e8b..82073d5 100644
--- a/util/grub-mknetdir.c
+++ b/util/grub-mknetdir.c
@@ -106,7 +106,8 @@ static const struct
 [GRUB_INSTALL_PLATFORM_I386_EFI] = { "i386-efi", "efinet", ".efi" },
 [GRUB_INSTALL_PLATFORM_X86_64_EFI] = { "x86_64-efi", "efinet", ".efi" },
 [GRUB_INSTALL_PLATFORM_IA64_EFI] = { "ia64-efi", "efinet", ".efi" },
-[GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm-efi", "efinet", ".efi" }
+[GRUB_INSTALL_PLATFORM_ARM_EFI] = { "arm-efi", "efinet", ".efi" },
+[GRUB_INSTALL_PLATFORM_ARM64_EFI] = { "arm64-efi", "efinet", ".efi" }
   };
 
 static void
-- 
2.10.0

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-10-10 17:33:06

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-09-01 
14:01:23.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-10-10 
17:33:07.0 +0200
@@ -1,0 +2,8 @@
+Fri Sep  2 03:24:19 UTC 2016 - mch...@suse.com
+
+- use $PRETTY_NAME instead of $NAME $VERSION for $GRUB_DISTRIBUTOR
+  in openSUSE Tumbleweed (bsc#995549)
+  * modified grub2-default-distributor.patch 
+- grub2.spec: add http module to grub.efi (fate#320129)
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.WWMa2v/_old  2016-10-10 17:33:09.0 +0200
+++ /var/tmp/diff_new_pack.WWMa2v/_new  2016-10-10 17:33:09.0 +0200
@@ -536,7 +536,7 @@
jpeg minicmd normal part_apple part_msdos part_gpt \
password_pbkdf2 png reboot search search_fs_uuid \
search_fs_file search_label sleep test video fat loadenv"
-PXE_MODULES="efinet tftp"
+PXE_MODULES="efinet tftp http"
 CRYPTO_MODULES="luks gcry_rijndael gcry_sha1 gcry_sha256"
 
 %ifarch x86_64

++ grub2-default-distributor.patch ++
--- /var/tmp/diff_new_pack.WWMa2v/_old  2016-10-10 17:33:09.0 +0200
+++ /var/tmp/diff_new_pack.WWMa2v/_new  2016-10-10 17:33:09.0 +0200
@@ -1,23 +1,77 @@
-Index: grub-2.02~beta2/grub-core/osdep/unix/config.c
+Index: grub-2.02~beta3/grub-core/osdep/unix/config.c
 ===
 grub-2.02~beta2.orig/grub-core/osdep/unix/config.c
-+++ grub-2.02~beta2/grub-core/osdep/unix/config.c
-@@ -61,6 +61,124 @@ grub_util_get_localedir (void)
+--- grub-2.02~beta3.orig/grub-core/osdep/unix/config.c
 grub-2.02~beta3/grub-core/osdep/unix/config.c
+@@ -61,6 +61,140 @@ grub_util_get_localedir (void)
return LOCALEDIR;
  }
  
 +#ifdef __linux__
++static char *
++os_release_get_val (const char *buf, const char *key)
++{
++  const char *ptr = buf;
++  char *ret;
++
++  while (*ptr && grub_isspace(*ptr))
++ptr++;
++
++  if (*ptr == '#')
++return NULL;
++
++  if (grub_strncmp (ptr, key, grub_strlen (key)) != 0)
++return NULL;
++
++  ptr += grub_strlen (key);
++  if (*ptr++ != '=' || *ptr == '\0')
++return NULL;
++
++  if (*ptr == '"' || *ptr == '\'')
++{
++  char c = *ptr;
++  int i = 0;
++  char *tmp, *ptmp;
++
++  if (*++ptr == '\0')
++  return NULL;
++
++  tmp = grub_strdup (ptr);
++  if ((ptmp = grub_strrchr (tmp, c)))
++  *ptmp = '\0';
++
++  ret = malloc (grub_strlen (tmp) + 1);
++  ptmp = tmp;
++  while (*ptmp)
++  {
++if (*ptmp != '\\' || *(ptmp + 1) != c)
++  ret[i++] = *ptmp;
++++ptmp;
++  }
++
++  grub_free (tmp);
++  ret[i] = '\0';
++}
++  else
++{
++  char *pret;
++
++  ret = grub_strdup (ptr);
++  if ((pret = grub_strchr (ret, ' ')))
++  *pret = '\0';
++}
++
++  return ret;
++}
 +
 +static char*
 +grub_util_default_distributor (void)
 +{
-+  pid_t pid;
-+  const char *argv[4];
-+  char *script, *ptr;
-+  char *cfgfile, *iptr;
-+  FILE *f = NULL;
-+  int fd;
-+  char *def_dist = NULL;
++  char *cfgfile;
++  char buf[1024];
++  FILE *fp = NULL;
++  char *os_pretty_name = NULL;
++  char *os_name = NULL;
++  char *os_version = NULL;
 +
 +  cfgfile = grub_util_path_concat (2, GRUB_SYSCONFDIR, "os-release");
 +  if (!grub_util_is_regular (cfgfile))
@@ -26,108 +80,70 @@
 +  return NULL;
 +}
 +
-+  argv[0] = "sh";
-+  argv[1] = "-c";
++  fp = grub_util_fopen (cfgfile, "r");
 +
-+  script = xmalloc (4 * strlen (cfgfile) + 300);
-+
-+  ptr = script;
-+  memcpy (ptr, ". '", 3);
-+  ptr += 3;
-+  for (iptr = cfgfile; *iptr; iptr++)
++  if (!fp)
 +{
-+  if (*iptr == '\\')
-+  {
-+memcpy (ptr, "'\\''", 4);
-+ptr += 4;
-+continue;
-+  }
-+  *ptr++ = *iptr;
++  grub_util_warn (_("cannot open configuration file `%s': %s"),
++cfgfile, strerror (errno));
++  grub_free (cfgfile);
++  return NULL;
 +}
 +
-+  strcpy (ptr, "'; printf \"OS_RELEASE_NAME=%s\\nOS_RELEASE_VERSION=%s\\n\" "
-+"\"$NAME\" \"$VERSION\"");
-+
-+  argv[2] = script;
-+  argv[3] = '\0';
-+
-+  pid = grub_util_exec_pipe (argv, );
-+
-+  if (pid)
-+f = fdopen (fd, "r");
++  grub_free (cfgfile);
 +
-+  if (f)
++  while (fgets (buf, sizeof (buf), fp))
 +{
-+  char *buffer = NULL;
-+  size_t sz = 0;
-+  char *name, *ver;
-+
-+  

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-09-01 14:01:21

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-08-26 
23:15:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-09-01 
14:01:23.0 +0200
@@ -1,0 +2,6 @@
+Wed Aug 31 15:40:28 UTC 2016 - m...@suse.com
+
+- binutils 2.27 creates empty modules without a symtab.
+  Add patch grub2-accept-empty-module.patch to not reject them.
+
+---

New:

  grub2-accept-empty-module.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.hRyyhw/_old  2016-09-01 14:01:25.0 +0200
+++ /var/tmp/diff_new_pack.hRyyhw/_new  2016-09-01 14:01:25.0 +0200
@@ -185,6 +185,7 @@
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
 Patch73:0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
+Patch74:grub2-accept-empty-module.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -424,6 +425,7 @@
 %patch71 -p1
 %patch72 -p1
 %patch73 -p1
+%patch74 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++ grub2-accept-empty-module.patch ++
Accept empty modules

For the Xen platform the all_video.mod module is empty.
With old binutils the .symtab section remained (containing
only section symbols), so the check didn't trigger, but starting
with binutils 2.27 not even a .symtab remains.  As there are
also no relocations that's no problem (and that is checked
independendly).
--- grub-2.02~beta3/util/grub-module-verifierXX.c.mm2016-02-11 
10:57:41.0 +
+++ grub-2.02~beta3/util/grub-module-verifierXX.c   2016-08-31 
15:26:36.0 +
@@ -199,7 +199,8 @@ check_symbols (const struct grub_module_
   Elf_Shdr *s = find_section (arch, e, ".moddeps");
 
   if (!s)
-   grub_util_error ("no symbol table and no .moddeps section");
+   /*grub_util_error ("no symbol table and no .moddeps section");*/
+   return; /* An empty module happens for all_video.module for Xen */
 
   if (!s->sh_size)
grub_util_error ("no symbol table and empty .moddeps section");

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-08-26 23:15:13

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-08-18 
10:19:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-08-26 
23:15:15.0 +0200
@@ -1,0 +2,6 @@
+Sat Aug 20 05:42:12 UTC 2016 - arvidj...@gmail.com
+
+- since version 1.7 cryptsetup defaults to SHA256 for LUKS - include
+  gcry_sha256 in signed EFI image
+
+---



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.7t0Nsb/_old  2016-08-26 23:15:17.0 +0200
+++ /var/tmp/diff_new_pack.7t0Nsb/_new  2016-08-26 23:15:17.0 +0200
@@ -535,7 +535,7 @@
password_pbkdf2 png reboot search search_fs_uuid \
search_fs_file search_label sleep test video fat loadenv"
 PXE_MODULES="efinet tftp"
-CRYPTO_MODULES="luks gcry_rijndael gcry_sha1"
+CRYPTO_MODULES="luks gcry_rijndael gcry_sha1 gcry_sha256"
 
 %ifarch x86_64
 CD_MODULES="${CD_MODULES} linuxefi" 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-08-18 10:19:54

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-08-11 
18:53:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-08-18 
10:19:56.0 +0200
@@ -1,0 +2,7 @@
+Fri Aug 12 08:32:05 UTC 2016 - mch...@suse.com
+
+- Workaround default entry in snapshot menu (bsc#956046)
+  * grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
+- grub2.spec: Add true command to grub.efi (bsc#993274)
+
+---

New:

  grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.h5auFo/_old  2016-08-18 10:19:58.0 +0200
+++ /var/tmp/diff_new_pack.h5auFo/_new  2016-08-18 10:19:58.0 +0200
@@ -193,6 +193,7 @@
 Patch105:   grub2-btrfs-05-grub2-mkconfig.patch
 Patch106:   grub2-btrfs-06-subvol-mount.patch
 Patch107:   grub2-btrfs-07-subvol-fallback.patch
+Patch108:   grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
 # Support EFI xen loader
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
@@ -430,6 +431,7 @@
 %patch105 -p1
 %patch106 -p1
 %patch107 -p1
+%patch108 -p1
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
@@ -527,7 +529,7 @@
 #TODO: add efifwsetup module
 
 FS_MODULES="ext2 btrfs ext2 xfs jfs reiserfs"
-CD_MODULES=" all_video boot cat chain configfile echo \
+CD_MODULES=" all_video boot cat chain configfile echo true \
efinet font gfxmenu gfxterm gzio halt iso9660 \
jpeg minicmd normal part_apple part_msdos part_gpt \
password_pbkdf2 png reboot search search_fs_uuid \

++ grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch ++
Index: grub-2.02~beta2/grub-core/normal/menu.c
===
--- grub-2.02~beta2.orig/grub-core/normal/menu.c
+++ grub-2.02~beta2/grub-core/normal/menu.c
@@ -575,6 +575,44 @@ print_countdown (struct grub_term_coordi
   grub_refresh ();
 }
 
+/* bsc#956046 - The first entry titled 'Bootable snapshot #$NUM' is inserted on
+   top at runtime to display current snapshot information. If default entry is
+   using number as key to index the entry, the result will be shifted so here 
we
+   add specical handling to shift it back. We apply this workaround until a 
better
+   solution can be found. */
+static void
+workaround_snapshot_menu_default_entry (grub_menu_t menu, const char *name, 
int *default_entry)
+{
+  grub_menu_entry_t entry;
+
+  if ((entry = grub_menu_get_entry (menu, 0))
+  && entry->submenu
+  && grub_strncmp (entry->title, "Bootable snapshot", sizeof("Bootable 
snapshot") - 1) == 0)
+{
+  const char *val;
+
+  if (*default_entry == -1 && menu->size > 1)
+   {
+ *default_entry = 1;
+ return;
+   }
+
+  val = grub_env_get (name);
+
+  grub_error_push ();
+
+  if (val)
+   grub_strtoul (val, 0, 0);
+
+  if (*default_entry < (menu->size - 1) && grub_errno == GRUB_ERR_NONE)
+   ++(*default_entry);
+
+  grub_error_pop ();
+}
+
+  return;
+}
+
 #define GRUB_MENU_PAGE_SIZE 10
 
 /* Show the menu and handle menu entry selection.  Returns the menu entry
@@ -593,6 +631,8 @@ run_menu (grub_menu_t menu, int nested,
 
   default_entry = get_entry_number (menu, "default");
 
+  workaround_snapshot_menu_default_entry (menu, "default", _entry);
+
   /* If DEFAULT_ENTRY is not within the menu entries, fall back to
  the first entry.  */
   if (default_entry < 0 || default_entry >= menu->size)

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-08-11 18:53:05

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-07-01 
09:54:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-08-11 
18:53:07.0 +0200
@@ -1,0 +2,38 @@
+Wed Aug  3 04:45:51 UTC 2016 - mch...@suse.com
+
+- grub.default: Empty GRUB_CMDLINE_LINUX_DEFAULT, the value will be fully
+  taken from YaST settings. (bsc#989803)
+
+---
+Wed Aug  3 04:45:34 UTC 2016 - mch...@suse.com
+
+- Add patches from Roberto Sassu 
+- Fix grub2-10_linux-avoid-multi-device-root-kernel-argument.patch,
+  device path is not tested if GRUB_DISABLE_LINUX_UUID="true"
+  - added grub2-fix-multi-device-root-kernel-argument.patch
+  (bsc#960776)
+- grub2-zipl-setup: avoid multi-device root= kernel argument
+  * added grub2-zipl-setup-fix-btrfs-multipledev.patch
+  (bsc#960776)
+- Add SUSE_REMOVE_LINUX_ROOT_PARAM configuration option
+  to /etc/default/grub, to remove root= and rootflags= from the
+  kernel command line in /boot/grub2/grub.cfg and /boot/zipl/config
+  - added grub2-suse-remove-linux-root-param.patch
+  (bsc#962585)
+
+---
+Tue Aug  2 09:05:11 UTC 2016 - mch...@suse.com
+
+- Support HTTP Boot IPv4 and IPv6 (fate#320129)
+  * 0001-misc-fix-invalid-character-recongition-in-strto-l.patch
+  * 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+  * 0003-bootp-New-net_bootp6-command.patch
+  * 0004-efinet-UEFI-IPv6-PXE-support.patch
+  * 0005-grub.texi-Add-net_bootp6-doument.patch
+  * 0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
+  * 0007-efinet-Setting-network-from-UEFI-device-path.patch
+  * 0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
+- Fix heap corruption after dns lookup
+  * 0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
+
+---

New:

  0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
  0001-misc-fix-invalid-character-recongition-in-strto-l.patch
  0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
  0003-bootp-New-net_bootp6-command.patch
  0004-efinet-UEFI-IPv6-PXE-support.patch
  0005-grub.texi-Add-net_bootp6-doument.patch
  0006-bootp-Add-processing-DHCPACK-packet-from-HTTP-Boot.patch
  0007-efinet-Setting-network-from-UEFI-device-path.patch
  0008-efinet-Setting-DNS-server-from-UEFI-protocol.patch
  grub2-fix-multi-device-root-kernel-argument.patch
  grub2-suse-remove-linux-root-param.patch
  grub2-zipl-setup-fix-btrfs-multipledev.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.rsNj0l/_old  2016-08-11 18:53:09.0 +0200
+++ /var/tmp/diff_new_pack.rsNj0l/_new  2016-08-11 18:53:09.0 +0200
@@ -184,8 +184,7 @@
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
-Patch73:0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
-Patch74:0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
+Patch73:0001-dns-fix-buffer-overflow-for-data-addresses-in-recv_h.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -206,6 +205,12 @@
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
 # EFI free memory on exit fix (bsc#980739)
 Patch150:   grub2-efi-Free-malloc-regions-on-exit.patch
+# Linux root device related patches
+Patch160:   0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
+Patch161:   0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
+Patch162:   grub2-fix-multi-device-root-kernel-argument.patch
+Patch163:   grub2-zipl-setup-fix-btrfs-multipledev.patch
+Patch164:   grub2-suse-remove-linux-root-param.patch
 # PPC64 LE support
 Patch205:   grub2-ppc64le-disable-video.patch
 Patch207:   grub2-ppc64le-memory-map.patch
@@ -213,6 +218,15 @@
 Patch235:   0002-Add-Virtual-LAN-support.patch 
 Patch236:   grub2-efi_gop-avoid-low-resolution.patch
 Patch277:   grub2-ppc64-cas-reboot-support.patch
+# Support HTTP Boot IPv4 and IPv6 (fate#320129)
+Patch280:   0001-misc-fix-invalid-character-recongition-in-strto-l.patch
+Patch281:   0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
+Patch282:   0003-bootp-New-net_bootp6-command.patch
+Patch283:   

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-07-01 09:53:59

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-06-13 
21:51:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-07-01 
09:54:00.0 +0200
@@ -1,0 +2,17 @@
+Tue Jun 28 00:31:47 CEST 2016 - r...@suse.de
+
+- fix filelist for s390x 
+
+---
+Tue Jun 21 06:19:27 UTC 2016 - mch...@suse.com
+
+- Fix grub2-editenv error on encrypted lvm installation (bsc#981621) 
+  * modified grub2-btrfs-workaround-grub2-once.patch
+- Add missing closing bracket in 'grub2-snapper-plugin.sh'.
+- Fix snapshot booting on s390x (bsc#955115)
+  * modified grub2-snapper-plugin.sh 
+- Fallback to old subvol name scheme to support old snapshot config
+  (bsc#953538)
+  * added grub2-btrfs-07-subvol-fallback.patch
+
+---

New:

  grub2-btrfs-07-subvol-fallback.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.sWUY48/_old  2016-07-01 09:54:02.0 +0200
+++ /var/tmp/diff_new_pack.sWUY48/_new  2016-07-01 09:54:02.0 +0200
@@ -193,6 +193,7 @@
 Patch104:   grub2-btrfs-04-grub2-install.patch
 Patch105:   grub2-btrfs-05-grub2-mkconfig.patch
 Patch106:   grub2-btrfs-06-subvol-mount.patch
+Patch107:   grub2-btrfs-07-subvol-fallback.patch
 # Support EFI xen loader
 Patch120:   grub2-efi-xen-chainload.patch
 Patch121:   grub2-efi-chainloader-root.patch
@@ -421,6 +422,7 @@
 %patch104 -p1
 %patch105 -p1
 %patch106 -p1
+%patch107 -p1
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
@@ -864,6 +866,7 @@
 %{_bindir}/%{name}-editenv
 %{_bindir}/%{name}-file
 %{_bindir}/%{name}-fstest
+%{_bindir}/%{name}-glue-efi
 %{_bindir}/%{name}-kbdcomp
 %{_bindir}/%{name}-menulst2cfg
 %{_bindir}/%{name}-mkfont
@@ -876,7 +879,6 @@
 %{_bindir}/%{name}-mkstandalone
 %{_bindir}/%{name}-render-label
 %{_bindir}/%{name}-script-check
-%{_bindir}/%{name}-syslinux2cfg
 %if 0%{?has_systemd:1}
 %{_unitdir}/grub2-once.service
 %endif
@@ -892,6 +894,7 @@
 %{_mandir}/man1/%{name}-editenv.1.*
 %{_mandir}/man1/%{name}-file.1.*
 %{_mandir}/man1/%{name}-fstest.1.*
+%{_mandir}/man1/%{name}-glue-efi.1.*
 %{_mandir}/man1/%{name}-kbdcomp.1.*
 %{_mandir}/man1/%{name}-menulst2cfg.1.*
 %{_mandir}/man1/%{name}-mkfont.1.*
@@ -904,7 +907,6 @@
 %{_mandir}/man1/%{name}-mkstandalone.1.*
 %{_mandir}/man1/%{name}-render-label.1.*
 %{_mandir}/man1/%{name}-script-check.1.*
-%{_mandir}/man1/%{name}-syslinux2cfg.1.*
 %{_mandir}/man8/%{name}-install.8.*
 %{_mandir}/man8/%{name}-mkconfig.8.*
 %{_mandir}/man8/%{name}-probe.8.*
@@ -916,18 +918,18 @@
 %{_mandir}/man1/%{name}-emu.1.*
 %else
 %config %{_sysconfdir}/grub.d/30_os-prober
-%{_bindir}/%{name}-glue-efi
 %{_bindir}/%{name}-mount
+%{_bindir}/%{name}-syslinux2cfg
 %{_sbindir}/%{name}-bios-setup
 %{_sbindir}/%{name}-macbless
 %{_sbindir}/%{name}-ofpathname
 %{_sbindir}/%{name}-sparc64-setup
-%{_mandir}/man1/%{name}-glue-efi.1.*
 %{_mandir}/man1/%{name}-mount.1.*
 %{_mandir}/man8/%{name}-bios-setup.8.*
 %{_mandir}/man8/%{name}-macbless.8.*
 %{_mandir}/man8/%{name}-ofpathname.8.*
 %{_mandir}/man8/%{name}-sparc64-setup.8.*
+%{_mandir}/man1/%{name}-syslinux2cfg.1.*
 %endif
 
 %files branding-upstream

++ grub2-btrfs-07-subvol-fallback.patch ++
Index: grub-2.02~beta3/grub-core/fs/btrfs.c
===
--- grub-2.02~beta3.orig/grub-core/fs/btrfs.c
+++ grub-2.02~beta3/grub-core/fs/btrfs.c
@@ -925,10 +925,40 @@ lookup_root_by_name(struct grub_btrfs_da
 }
 
 static grub_err_t
+lookup_root_by_name_fallback(struct grub_btrfs_data *data, const char *path)
+{
+  grub_err_t err;
+  grub_uint64_t tree = 0;
+  grub_uint8_t type;
+  struct grub_btrfs_key key;
+
+  err = find_path (data, path, , , );
+  if (err)
+  return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
+
+  if (key.object_id != grub_cpu_to_le64_compile_time 
(GRUB_BTRFS_OBJECT_ID_CHUNK) || tree == 0)
+return grub_error(GRUB_ERR_BAD_FILE_TYPE, "%s: not a subvolume\n", path);
+
+  data->fs_tree = tree;
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
 btrfs_handle_subvol(struct grub_btrfs_data *data __attribute__ ((unused)))
 {
   if (btrfs_default_subvol)
-return lookup_root_by_name(data, btrfs_default_subvol);
+{
+  grub_err_t err;
+  err = lookup_root_by_name(data, btrfs_default_subvol);
+
+  /* Fallback to old schemes */
+  if (err == GRUB_ERR_FILE_NOT_FOUND)
+  

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-06-13 21:51:24

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-05-25 
21:22:01.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-06-13 
21:51:25.0 +0200
@@ -1,0 +2,6 @@
+Thu Jun  2 19:25:58 UTC 2016 - arvidj...@gmail.com
+
+- update grub2-once with patch from Björn Voigt - skip comments in
+  /etc/sysconfig/bootloader (boo#963610)
+
+---



Other differences:
--
++ grub2-once ++
--- /var/tmp/diff_new_pack.o8E6I1/_old  2016-06-13 21:51:29.0 +0200
+++ /var/tmp/diff_new_pack.o8E6I1/_new  2016-06-13 21:51:29.0 +0200
@@ -59,6 +59,9 @@
 
 $grub2_dir = "";
 while () {
+if (/^#/) {
+   next
+};
 if (/LOADER_TYPE="(.*)"/) {
 my $bl = $1; 
 if ($bl eq "grub2" || $bl eq "grub2-efi") {

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-05-23 16:37:12

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-05-05 
08:12:18.0 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-05-23 
16:37:13.0 +0200
@@ -1,0 +2,6 @@
+Thu May 19 14:56:53 UTC 2016 - ag...@suse.com
+
+- Add patch to free memory on exit in efi environments (bsc#980739)
+  * grub2-efi-Free-malloc-regions-on-exit.patch
+
+---

New:

  grub2-efi-Free-malloc-regions-on-exit.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.WbDT7i/_old  2016-05-23 16:37:15.0 +0200
+++ /var/tmp/diff_new_pack.WbDT7i/_new  2016-05-23 16:37:15.0 +0200
@@ -203,6 +203,8 @@
 # Hidden menu entry and hotkey "t" for text console
 Patch140:   grub2-Add-hidden-menu-entries.patch
 Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
+# EFI free memory on exit fix (bsc#980739)
+Patch150:   grub2-efi-Free-malloc-regions-on-exit.patch
 # PPC64 LE support
 Patch205:   grub2-ppc64le-disable-video.patch
 Patch207:   grub2-ppc64le-memory-map.patch
@@ -426,6 +428,7 @@
 %patch131 -p1
 %patch140 -p1
 %patch141 -p1
+%patch150 -p1
 %patch205 -p1
 %patch207 -p1
 %patch233 -p1

++ grub2-efi-Free-malloc-regions-on-exit.patch ++
>From 0c5fbc745846a53cc04ac1052cfbd35c699394c5 Mon Sep 17 00:00:00 2001
From: Alexander Graf 
Date: Thu, 19 May 2016 15:01:06 +0200
Subject: [PATCH] efi: Free malloc regions on exit

When we exit grub, we don't free all the memory that we allocated earlier
for our heap region. This can cause problems with setups where you try
to descend the boot order using "exit" entries, such as PXE -> HD boot
scenarios.

Signed-off-by: Alexander Graf 
---
 grub-core/kern/efi/init.c |  1 +
 grub-core/kern/efi/mm.c   | 24 
 include/grub/efi/efi.h|  1 +
 3 files changed, 26 insertions(+)

Index: grub-2.02~beta3/grub-core/kern/efi/init.c
===
--- grub-2.02~beta3.orig/grub-core/kern/efi/init.c
+++ grub-2.02~beta3/grub-core/kern/efi/init.c
@@ -167,4 +167,5 @@ grub_efi_fini (void)
 {
   grub_efidisk_fini ();
   grub_console_fini ();
+  grub_efi_memory_fini ();
 }
Index: grub-2.02~beta3/grub-core/kern/efi/mm.c
===
--- grub-2.02~beta3.orig/grub-core/kern/efi/mm.c
+++ grub-2.02~beta3/grub-core/kern/efi/mm.c
@@ -49,6 +49,12 @@ static grub_efi_uintn_t finish_desc_size
 static grub_efi_uint32_t finish_desc_version;
 int grub_efi_is_finished = 0;
 
+struct efi_allocation {
+   grub_uint64_t start_addr;
+   grub_uint64_t pages;
+} efi_allocated_memory[16];
+unsigned int efi_allocated_memory_idx = 0;
+
 /* Allocate pages below a specified address */
 void *
 grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
@@ -440,6 +446,13 @@ add_memory_regions (grub_efi_memory_desc
(void *) ((grub_addr_t) start),
(unsigned) pages);
 
+  /* Track up to 16 regions that we allocate from */
+  if (efi_allocated_memory_idx < ARRAY_SIZE(efi_allocated_memory)) {
+efi_allocated_memory[efi_allocated_memory_idx].start_addr = start;
+efi_allocated_memory[efi_allocated_memory_idx].pages = pages;
+efi_allocated_memory_idx++;
+  }
+
   grub_mm_init_region (addr, PAGES_TO_BYTES (pages));
 
   required_pages -= pages;
@@ -451,6 +464,17 @@ add_memory_regions (grub_efi_memory_desc
 grub_fatal ("too little memory");
 }
 
+void
+grub_efi_memory_fini (void)
+{
+  unsigned int i;
+
+  for (i = 0; i < efi_allocated_memory_idx; i++) {
+grub_efi_free_pages (efi_allocated_memory[i].start_addr,
+ efi_allocated_memory[i].pages);
+  }
+}
+
 #if 0
 /* Print the memory map.  */
 static void
Index: grub-2.02~beta3/include/grub/efi/efi.h
===
--- grub-2.02~beta3.orig/include/grub/efi/efi.h
+++ grub-2.02~beta3/include/grub/efi/efi.h
@@ -51,6 +51,7 @@ EXPORT_FUNC(grub_efi_get_memory_map) (gr
  grub_efi_uintn_t *map_key,
  grub_efi_uintn_t *descriptor_size,
  grub_efi_uint32_t *descriptor_version);
+void grub_efi_memory_fini (void);
 grub_efi_loaded_image_t *EXPORT_FUNC(grub_efi_get_loaded_image) 
(grub_efi_handle_t image_handle);
 void 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-05-05 08:12:17

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-03-26 
15:21:08.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-05-05 
08:12:18.0 +0200
@@ -1,0 +2,20 @@
+Mon May  2 13:25:02 UTC 2016 - o...@aepfle.de
+
+- Remove xen-devel from BuildRequires
+  required headers are included in grub-2.0.2
+
+---
+Thu Apr 28 09:06:11 UTC 2016 - ag...@suse.com
+
+- Add support for "t" hotkey to switch to text mode (bsc#976836)
+  * added grub2-SUSE-Add-the-t-hotkey.patch
+- Add support for hidden menu entries (bsc#976836)
+  * added grub2-Add-hidden-menu-entries.patch
+
+---
+Tue Apr 19 08:21:24 UTC 2016 - mch...@suse.com
+
+- Correct show user defined comments in menu for snapshots (bsc#956698) 
+  * modified grub2-snapper-plugin.sh
+
+---

New:

  grub2-Add-hidden-menu-entries.patch
  grub2-SUSE-Add-the-t-hotkey.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.yYQQHb/_old  2016-05-05 08:12:20.0 +0200
+++ /var/tmp/diff_new_pack.yYQQHb/_new  2016-05-05 08:12:20.0 +0200
@@ -53,9 +53,6 @@
 BuildRequires:  pesign-obs-integration
 %endif
 %endif
-%ifarch %{ix86} x86_64
-BuildRequires:  xen-devel
-%endif
 %if 0%{?suse_version} >= 1210
 # Package systemd services files grub2-once.service
 BuildRequires:  systemd-rpm-macros
@@ -203,6 +200,9 @@
 # 32bit ARM EFI FDT table pass-through support
 Patch130:   0001-arm64-Move-firmware-fdt-search-into-global-function.patch
 Patch131:   0002-arm-efi-Use-fdt-from-firmware-when-available.patch
+# Hidden menu entry and hotkey "t" for text console
+Patch140:   grub2-Add-hidden-menu-entries.patch
+Patch141:   grub2-SUSE-Add-the-t-hotkey.patch
 # PPC64 LE support
 Patch205:   grub2-ppc64le-disable-video.patch
 Patch207:   grub2-ppc64le-memory-map.patch
@@ -424,6 +424,8 @@
 %patch122 -p1
 %patch130 -p1
 %patch131 -p1
+%patch140 -p1
+%patch141 -p1
 %patch205 -p1
 %patch207 -p1
 %patch233 -p1
@@ -841,6 +843,7 @@
 %config %{_sysconfdir}/grub.d/40_custom
 %config %{_sysconfdir}/grub.d/41_custom
 %config %{_sysconfdir}/grub.d/90_persistent
+%config %{_sysconfdir}/grub.d/95_textmode
 %{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-mkconfig
 %{_sbindir}/%{name}-once

++ grub2-Add-hidden-menu-entries.patch ++
>From a06004f4c668abd7c760a2818d0a8205da7568e7 Mon Sep 17 00:00:00 2001
From: Alexander Graf 
Date: Tue, 26 Apr 2016 15:29:25 +0200
Subject: [PATCH v3] Add hidden menu entries

The menu infrastructure is quite powerful. It allows you to define menu
entries that can contain arbitrary grub commands that can do a lot more
than just boot kernel entries.

For some of these it makes sense to hide them inside the normal menu
though and instead have them available through hotkeys that get advertised
differently. My main use case is to switch to the serial console when
gfxterm is loaded.

So this patch adds support for hidden menu entries that are accessible
using hotkeys, but are not accessible in the grub menu.

Signed-off-by: Alexander Graf 

---

v1 -> v2:

  - fix default entry selection

v2 -> v3:

  - replace "--hidden" parameter with new command "hiddenentry"

diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
index dd9d9f1..b282c4f 100644
--- a/grub-core/commands/legacycfg.c
+++ b/grub-core/commands/legacycfg.c
@@ -133,7 +133,7 @@ legacy_file (const char *filename)
args[0] = oldname;
grub_normal_add_menu_entry (1, args, NULL, NULL, "legacy",
NULL, NULL,
-   entrysrc, 0);
+   entrysrc, 0, 0);
grub_free (args);
entrysrc[0] = 0;
grub_free (oldname);
@@ -186,7 +186,7 @@ legacy_file (const char *filename)
}
   args[0] = entryname;
   grub_normal_add_menu_entry (1, args, NULL, NULL, NULL,
- NULL, NULL, entrysrc, 0);
+ NULL, NULL, entrysrc, 0, 0);
   grub_free (args);
 }
 
diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
index 58d4dad..b4d6c31 100644
--- a/grub-core/commands/menuentry.c
+++ b/grub-core/commands/menuentry.c
@@ -78,7 +78,7 @@ 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-03-26 15:21:06

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-03-07 
13:26:27.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-03-26 
15:21:08.0 +0100
@@ -1,0 +2,8 @@
+Mon Mar 21 11:27:54 UTC 2016 - mch...@suse.com
+
+- Fix GRUB_DISABLE_LINUX_UUID to be ignore and also fallback kernel device
+  won't be used if fs uuid not detected (bsc#971867)
+  * added 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
+  * added 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
+
+---

New:

  0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
  0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.6frRSN/_old  2016-03-26 15:21:10.0 +0100
+++ /var/tmp/diff_new_pack.6frRSN/_new  2016-03-26 15:21:10.0 +0100
@@ -187,6 +187,8 @@
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch
 Patch72:grub2-mkconfig-arm.patch
+Patch73:0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch
+Patch74:0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -409,6 +411,8 @@
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
+%patch74 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++ 0001-10_linux-Fix-grouping-of-tests-for-GRUB_DEVICE.patch ++
>From 082bc9f77b200eb48a5f1147163dea9c9d02d44c Mon Sep 17 00:00:00 2001
From: Mike Gilbert 
Date: Sat, 5 Mar 2016 17:30:48 -0500
Subject: [PATCH 1/2] 10_linux: Fix grouping of tests for GRUB_DEVICE

Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
mixing of || and && operators. Add some parens to help with that.
---
 util/grub.d/10_linux.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: grub-2.02~beta2/util/grub.d/10_linux.in
===
--- grub-2.02~beta2.orig/util/grub.d/10_linux.in
+++ grub-2.02~beta2/util/grub.d/10_linux.in
@@ -47,7 +47,7 @@ esac
 # and mounting btrfs requires user space scanning, so force UUID in this case.
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = 
"xtrue" ] \
 || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-|| test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+|| ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); 
then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
++ 0002-20_linux_xen-fix-test-for-GRUB_DEVICE.patch ++
>From 9545a8fd04ca33bcecc1907fec4d2354b02992ba Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov 
Date: Sun, 6 Mar 2016 08:54:19 +0300
Subject: [PATCH 2/2] 20_linux_xen: fix test for GRUB_DEVICE

Same fix as in 082bc9f.
---
 util/grub.d/20_linux_xen.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
===
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
@@ -53,7 +53,7 @@ esac
 # and mounting btrfs requires user space scanning, so force UUID in this case.
 if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = 
"xtrue" ] \
 || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-|| test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
+|| ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); 
then
   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
 else
   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-03-07 13:26:18

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-02-09 
13:31:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-03-07 
13:26:27.0 +0100
@@ -1,0 +2,101 @@
+Tue Mar  1 18:53:17 UTC 2016 - arvidj...@gmail.com
+
+- new upstream version 2.02~beta3
+  * highlights of user visible changes not yet present in openSUSE package
+- arm-uboot now generates position independent self relocating image, so
+  single binary should run on all supported systems
+- loader for Xen on aarch64. grub-mkconfig support was not in time for
+  beta3 yet.
+- improved ZFS support (extensible_dataset, large_blocks, embedded_data,
+  hole_birth features)
+- support for IPv6 Router Advertisements
+- support for persistent memory (we do not overwrite it and pass correct
+  information to OS)
+- try to display more specific icons for os-prober generated menu entries
+- grub-install detects EFI bit size and selects correct platform 
(x86_64-efi
+  or i386-efi) independent of OS bit size; needs kernel 4.0 or higher.
+- LVM RAID1 support
+- xnu loader fixes which should make OS X menu entry generated by os-prober
+  work again
+- key modifiers (Ctrl-X etc) should work on EFI too
+- ... and lot of fixes over entire tree
+  * rediff
+- rename-grub-info-file-to-grub2.patch
+- use-grub2-as-a-package-name.patch
+- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
+- grub2-fix-menu-in-xen-host-server.patch
+- grub2-efi-HP-workaround.patch
+- grub2-secureboot-chainloader.patch
+- grub2-s390x-02-kexec-module-added-to-emu.patch
+- grub2-s390x-04-grub2-install.patch
+- grub2-s390x-05-grub2-mkconfig.patch
+- grub2-efi-xen-chainload.patch
+- grub2-mkconfig-aarch64.patch
+- grub2-btrfs-04-grub2-install.patch
+- grub2-ppc64-cas-reboot-support.patch
+- 0002-Add-Virtual-LAN-support.patch
+  * fix grub2-secureboot-add-linuxefi.patch - use grub_memset and
+grub_memcpy instead of memset and memcpy (caused errors due to
+compiler warning)
+  * drop upstream patches
+- 0001-grub-core-kern-efi-efi.c-Ensure-that-the-result-star.patch
+- 0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
+- 0001-efidisk-move-device-path-helpers-in-core-for-efinet.patch
+- 0002-efinet-skip-virtual-IPv4-and-IPv6-devices-when-enume.patch
+- 0003-efinet-open-Simple-Network-Protocol-exclusively.patch
+- 0001-efinet-Check-for-immediate-completition.patch
+- 0001-efinet-enable-hardware-filters-when-opening-interfac.patch
+- grub2-xen-legacy-config-device-name.patch
+- grub2-getroot-support-NVMe-device-names.patch
+- grub2-netboot-hang.patch
+- grub2-btrfs-fix-incorrect-address-reference.patch
+- aarch64-reloc.patch
+- grub2-glibc-2.20.patch (related code dropped upstream)
+- grub2-Initialized-initrd_ctx-so-we-don-t-free-a-random-poi.patch
+- grub2-btrfs-fix-get_root-key-comparison-failures-due-to-en.patch
+- grub2-getroot-fix-get-btrfs-fs-prefix-big-endian.patch
+- grub2-ppc64-qemu.patch
+- grub2-xfs-Add-helper-for-inode-size.patch
+- grub2-xfs-Fix-termination-loop-for-directory-iteration.patch
+- grub2-xfs-Convert-inode-numbers-to-cpu-endianity-immediate.patch
+- grub2-xfs-V5-filesystem-format-support.patch
+- 0001-Add-bootargs-parser-for-open-firmware.patch
+- grub2-arm64-set-correct-length.patch
+- grub2-arm64-setjmp-Add-missing-license-macro.patch
+- grub2-arm64-efinet-handle-get_status-on-buggy-firmware-properly.patch
+- 0001-unix-password-Fix-file-descriptor-leak.patch
+- 0002-linux-getroot-fix-descriptor-leak.patch
+- 0003-util-grub-mount-fix-descriptor-leak.patch
+- 0004-linux-ofpath-fix-descriptor-leak.patch
+- 0005-grub-fstest-fix-descriptor-leak.patch
+- ppc64le.patch
+- libgcc-prereq.patch
+- libgcc.patch
+- 0001-Fix-security-issue-when-reading-username-and-passwor.patch
+- 0001-menu-fix-line-count-calculation-for-long-lines.patch
+- grub2-arm64-Reduce-timer-event-frequency-by-10.patch
+- 0001-unix-do-not-close-stdin-in-grub_passwd_get.patch
+- 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch
+- 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch
+- 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch
+- 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch
+- 0005-i386-fix-TSC-calibration-using-PIT.patch
+- biendian.patch
+- ppc64_opt.patch
+  * drop workarounds for 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-02-09 13:31:01

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-01-28 
17:18:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-02-09 
13:31:03.0 +0100
@@ -1,0 +2,44 @@
+Fri Jan 29 03:54:15 UTC 2016 - mch...@suse.com
+
+- Add config option to set efi xen loader command line option (bsc#957383)
+  * added grub2-efi-xen-cmdline.patch 
+
+---
+Thu Jan 28 12:27:27 UTC 2016 - dval...@suse.com
+
+- Drop ppc64le patches. Build stage1 as BE for Power
+  Droped patches:
+  - grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch
+  - grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch
+  - grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch
+  - grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch
+  - grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch
+  - grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch
+  - grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch
+  - grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch
+  - grub2-ppc64le-09-Add-powerpc64-types.patch
+  - grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch
+  - grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch
+  - grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch
+  - grub2-ppc64le-13-Fix-powerpc-setjmp-longjmp-64bit-issues.patch
+  - grub2-ppc64le-14-Add-powerpc64-ieee1275-trampoline.patch
+  - grub2-ppc64le-15-Add-64bit-support-to-powerpc-startup-code.patch
+  - grub2-ppc64le-16-Add-grub_dl_find_section_addr.patch
+  - grub2-ppc64le-17-Add-ppc64-relocations.patch
+  - grub2-ppc64le-18-ppc64-doesn-t-need-libgcc-routines.patch
+  - grub2-ppc64le-19-Use-FUNC_START-FUNC_END-for-powerpc-function-definit.patch
+  - grub2-ppc64le-20-.TOC.-symbol-is-special-in-ppc64le-.-It-maps-to-the-.patch
+  - grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch
+  - grub2-ppc64le-22-all-parameter-to-firmware-calls-should-to-be-BigEndi.patch
+  - grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch
+  - grub2-ppc64le-timeout.patch
+  - grub2-ppc64-build-ppc64-32bit.patch
+- Added patches:
+  -  biendian.patch
+  -  grub2-ppc64-cas-reboot-support.patch
+  -  libgcc-prereq.patch
+  -  libgcc.patch
+  -  ppc64_opt.patch
+  -  ppc64le.patch
+
+---

Old:

  grub2-ppc64-build-ppc64-32bit.patch
  grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch
  grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch
  grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch
  grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch
  grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch
  grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch
  grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch
  grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch
  grub2-ppc64le-09-Add-powerpc64-types.patch
  grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch
  grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch
  grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch
  grub2-ppc64le-13-Fix-powerpc-setjmp-longjmp-64bit-issues.patch
  grub2-ppc64le-14-Add-powerpc64-ieee1275-trampoline.patch
  grub2-ppc64le-15-Add-64bit-support-to-powerpc-startup-code.patch
  grub2-ppc64le-16-Add-grub_dl_find_section_addr.patch
  grub2-ppc64le-17-Add-ppc64-relocations.patch
  grub2-ppc64le-18-ppc64-doesn-t-need-libgcc-routines.patch
  grub2-ppc64le-19-Use-FUNC_START-FUNC_END-for-powerpc-function-definit.patch
  grub2-ppc64le-20-.TOC.-symbol-is-special-in-ppc64le-.-It-maps-to-the-.patch
  grub2-ppc64le-21-the-.toc-section-in-powerpc64le-modules-are-sometime.patch
  grub2-ppc64le-22-all-parameter-to-firmware-calls-should-to-be-BigEndi.patch
  grub2-ppc64le-fix-64bit-trampoline-in-dyn-linker.patch
  grub2-ppc64le-timeout.patch

New:

  biendian.patch
  grub2-efi-xen-cmdline.patch
  grub2-ppc64-cas-reboot-support.patch
  libgcc-prereq.patch
  libgcc.patch
  ppc64_opt.patch
  ppc64le.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.9iDptR/_old  2016-02-09 13:31:05.0 +0100
+++ /var/tmp/diff_new_pack.9iDptR/_new  

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-01-28 17:18:40

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2016-01-15 
10:38:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-01-28 
17:18:45.0 +0100
@@ -2 +2,12 @@
-Wed Mon 28 16:53:54 UTC 2015 - arvidj...@gmail.com
+Wed Jan 20 11:44:27 UTC 2016 - mch...@suse.com
+
+- Backport upstream patches for HyperV gen2 TSC timer calbration without
+  RTC (bsc#904647)
+  * added 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch
+  * added 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch
+  * added 0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch
+  * added 0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch
+  * added 0005-i386-fix-TSC-calibration-using-PIT.patch
+
+---
+Wed Dec 28 16:53:54 UTC 2015 - arvidj...@gmail.com

New:

  0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch
  0002-i386-tsc-Fix-unused-function-warning-on-xen.patch
  0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch
  0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch
  0005-i386-fix-TSC-calibration-using-PIT.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.rcY3Xn/_old  2016-01-28 17:18:47.0 +0100
+++ /var/tmp/diff_new_pack.rcY3Xn/_new  2016-01-28 17:18:47.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -263,6 +263,12 @@
 Patch264:   0005-grub-fstest-fix-descriptor-leak.patch
 # Upstream patch to fix patch 0001-unix-password-Fix-file-descriptor-leak.patch
 Patch265:   0001-unix-do-not-close-stdin-in-grub_passwd_get.patch
+# Backport upstream patches for HyperV gen2 TSC timer calbration without RTC 
(bsc#904647)
+Patch270:   0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch
+Patch271:   0002-i386-tsc-Fix-unused-function-warning-on-xen.patch
+Patch272:   0003-acpi-do-not-skip-BIOS-scan-if-EBDA-length-is-zero.patch
+Patch273:   0004-tsc-Use-alternative-delay-sources-whenever-appropria.patch
+Patch274:   0005-i386-fix-TSC-calibration-using-PIT.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -535,6 +541,11 @@
 %patch263 -p1
 %patch264 -p1
 %patch265 -p1
+%patch270 -p1
+%patch271 -p1
+%patch272 -p1
+%patch273 -p1
+%patch274 -p1
 
 # Generate po/LINGUAS for message catalogs ...
 ./linguas.sh

++ 0001-grub-core-kern-i386-tsc.c-calibrate_tsc-Ensure-that.patch ++
>From 2e62352bc28bd5d3efafc1b5cbe211ff9e9987fd Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko 
Date: Tue, 20 Jan 2015 21:07:08 +0100
Subject: [PATCH]* grub-core/kern/i386/tsc.c (calibrate_tsc): Ensure
 that   no division by 0 occurs.

---
 ChangeLog | 5 +
 grub-core/kern/i386/tsc.c | 6 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: grub-2.02~beta2/grub-core/kern/i386/tsc.c
===
--- grub-2.02~beta2.orig/grub-core/kern/i386/tsc.c
+++ grub-2.02~beta2/grub-core/kern/i386/tsc.c
@@ -122,7 +122,11 @@ calibrate_tsc (void)
   grub_pit_wait (0x);
   end_tsc = grub_get_tsc ();
 
-  grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0);
+  grub_tsc_rate = 0;
+  if (end_tsc > tsc_boot_time)
+grub_tsc_rate = grub_divmod64 ((55ULL << 32), end_tsc - tsc_boot_time, 0);
+  if (grub_tsc_rate == 0)
+grub_tsc_rate = 5368;/* 800 MHz */
 }
 #endif
 
++ 0002-i386-tsc-Fix-unused-function-warning-on-xen.patch ++
>From 50ebc8f5f35a322b3736c03e16de7108932126b0 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko 
Date: Sun, 22 Feb 2015 13:12:44 +0100
Subject: [PATCH] i386/tsc: Fix unused function warning on xen.

---
 grub-core/kern/i386/tsc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: grub-2.02~beta2/grub-core/kern/i386/tsc.c
===
--- grub-2.02~beta2.orig/grub-core/kern/i386/tsc.c
+++ grub-2.02~beta2/grub-core/kern/i386/tsc.c
@@ -57,6 +57,8 @@ grub_get_tsc (void)
   return (((grub_uint64_t) hi) << 32) | lo;
 }
 
+#ifndef GRUB_MACHINE_XEN
+
 static __inline int
 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2016-01-15 10:38:49

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2015-12-20 
10:51:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2016-01-15 
10:38:51.0 +0100
@@ -1,0 +2,5 @@
+Wed Mon 28 16:53:54 UTC 2015 - arvidj...@gmail.com
+
+- Add 0001-menu-fix-line-count-calculation-for-long-lines.patch (bsc#943585)
+
+---

New:

  0001-menu-fix-line-count-calculation-for-long-lines.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.o8X6gB/_old  2016-01-15 10:38:53.0 +0100
+++ /var/tmp/diff_new_pack.o8X6gB/_new  2016-01-15 10:38:53.0 +0100
@@ -206,6 +206,7 @@
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch
 Patch72:0001-Fix-security-issue-when-reading-username-and-passwor.patch
+Patch73:0001-menu-fix-line-count-calculation-for-long-lines.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -481,6 +482,7 @@
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1
+%patch73 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++ 0001-menu-fix-line-count-calculation-for-long-lines.patch ++
>From 7c1f98869a1aedc2210c4d9e5ad9828eeb2dda72 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov 
Date: Mon, 28 Dec 2015 19:48:44 +0300
Subject: [PATCH] menu: fix line count calculation for long lines

It gave one extra screen line if length was exactly equal to screen
width.

Reported by Michael Chang.
Also-By: Michael Chang 
---
 grub-core/normal/menu_entry.c | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
index 62c7e16..2b73225 100644
--- a/grub-core/normal/menu_entry.c
+++ b/grub-core/normal/menu_entry.c
@@ -126,9 +126,13 @@ ensure_space (struct line *linep, int extra)
 static int
 get_logical_num_lines (struct line *linep, struct per_term_screen *term_screen)
 {
-  return (grub_getstringwidth (linep->buf, linep->buf + linep->len,
-  term_screen->term)
- / (unsigned) term_screen->geo.entry_width) + 1;
+  grub_size_t width = grub_getstringwidth (linep->buf, linep->buf + linep->len,
+  term_screen->term);
+
+  /* Empty line still consumes space on screen */
+  return width ? (width + (unsigned) term_screen->geo.entry_width - 1) /
+(unsigned) term_screen->geo.entry_width
+  : 1;
 }
 
 static void
-- 
1.9.1

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2015-12-20 10:51:36

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2015-12-17 
15:53:42.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-12-20 
10:51:38.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 17 11:04:06 UTC 2015 - o...@aepfle.de
+
+- grub2-xen-pv-firmware.cfg: fix hd boot (boo#926795)
+
+---



Other differences:
--
++ grub2-xen-pv-firmware.cfg ++
--- /var/tmp/diff_new_pack.6q2MhE/_old  2015-12-20 10:51:41.0 +0100
+++ /var/tmp/diff_new_pack.6q2MhE/_new  2015-12-20 10:51:41.0 +0100
@@ -41,20 +41,25 @@
 set suse_cddev="${suse_cddev_content}"
 fi
 
-hdcfg_list="/boot/grub2/grub.cfg \
+set hdcfg_list="\
+/boot/grub2/grub.cfg \
 /@/boot/grub2/grub.cfg \
 /@/.snapshots/1/snapshot/boot/grub2/grub.cfg \
 /.snapshots/1/snapshot/boot/grub2/grub.cfg \
-/grub2/grub.cfg"
+/grub2/grub.cfg\
+"
 
-hdlst_list="/boot/grub/menu.lst \
-/grub/menu.lst"
+set hdlst_list="\
+/boot/grub/menu.lst \
+/grub/menu.lst\
+"
 
 for c in ${hdcfg_list}; do
 if search -s hddev -f "${c}"; then
-menuentry "${hddev} Boot From Hard Disk ($c)" {
-set root="${hddev}"
-configfile "${c}"
+menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
+set root="${2}"
+set cfg="${3}"
+configfile "${cfg}"
 }
 break
 fi
@@ -62,9 +67,10 @@
 
 for c in ${hdlst_list}; do
 if search -s hddev -f "${c}"; then
-menuentry "${hddev} Boot From Hard Disk (${c})" {
-set root="${hddev}"
-legacy_configfile "${c}"
+menuentry "${hddev} Boot From Hard Disk (${c})" "${hddev}" "${c}" {
+set root="${2}"
+set cfg="${3}"
+legacy_configfile "${cfg}"
 }
 break
 fi

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2015-12-17 15:53:41

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2015-11-24 
22:30:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-12-17 
15:53:42.0 +0100
@@ -1,0 +2,30 @@
+Wed Dec 16 05:04:37 UTC 2015 - arvidj...@gmail.com
+
+- Add 0001-Fix-security-issue-when-reading-username-and-passwor.patch
+  Fix for CVE-2015-8370 [boo#956631]
+
+---
+Wed Dec  9 18:13:27 UTC 2015 - arvidj...@gmail.com
+
+- Update grub2-efi-xen-chainload.patch - fix copying of Linux kernel
+  and initrd to ESP (boo#958193)
+
+---
+Mon Dec  7 08:03:41 UTC 2015 - o...@aepfle.de
+
+- Rename grub2-xen.cfg to grub2-xen-pv-firmware.cfg (boo#926795)
+
+---
+Fri Dec  4 17:06:17 UTC 2015 - o...@aepfle.de
+
+- grub2-xen.cfg: to handle grub1 menu.lst in PV guest (boo#926795)
+
+---
+Thu Nov 26 10:22:28 UTC 2015 - mch...@suse.com
+
+- Expand list of grub.cfg search path in PV Xen guest for systems
+  installed to btrfs snapshot. (bsc#946148) (bsc#952539) 
+  * modified grub2-xen.cfg
+- drop grub2-fix-Grub2-with-SUSE-Xen-package-install.patch (bsc#774666)
+
+---

Old:

  grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
  grub2-xen.cfg

New:

  0001-Fix-security-issue-when-reading-username-and-passwor.patch
  grub2-xen-pv-firmware.cfg



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.tYXzp3/_old  2015-12-17 15:53:45.0 +0100
+++ /var/tmp/diff_new_pack.tYXzp3/_new  2015-12-17 15:53:45.0 +0100
@@ -146,7 +146,7 @@
 Source12:   grub2-snapper-plugin.sh
 Source14:   80_suse_btrfs_snapshot
 Source15:   grub2-once.service
-Source16:   grub2-xen.cfg
+Source16:   grub2-xen-pv-firmware.cfg
 # required hook for systemd-sleep (bsc#941758)
 Source17:   grub2-systemd-sleep.sh
 Source1000: PATCH_POLICY
@@ -160,7 +160,6 @@
 Patch10:grub2-fix-error-terminal-gfxterm-isn-t-found.patch
 Patch12:grub2-fix-menu-in-xen-host-server.patch
 Patch15:not-display-menu-when-boot-once.patch
-Patch16:grub2-fix-Grub2-with-SUSE-Xen-package-install.patch
 Patch17:grub2-pass-corret-root-for-nfsroot.patch
 Patch18:grub2-fix-locale-en.mo.gz-not-found-error-message.patch
 Patch19:grub2-efi-HP-workaround.patch
@@ -206,6 +205,7 @@
 Patch69:grub2-getroot-fix-get-btrfs-fs-prefix-big-endian.patch
 Patch70:grub2-default-distributor.patch
 Patch71:grub2-menu-unrestricted.patch
+Patch72:0001-Fix-security-issue-when-reading-username-and-passwor.patch
 # Btrfs snapshot booting related patches
 Patch101:   grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
 Patch102:   grub2-btrfs-02-export-subvolume-envvars.patch
@@ -436,7 +436,6 @@
 %patch10 -p1
 %patch12 -p1
 %patch15 -p1
-%patch16 -p1
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
@@ -481,6 +480,7 @@
 %patch69 -p1
 %patch70 -p1
 %patch71 -p1
+%patch72 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++ 0001-Fix-security-issue-when-reading-username-and-passwor.patch ++
>From 451d80e52d851432e109771bb8febafca7a5f1f2 Mon Sep 17 00:00:00 2001
From: Hector Marco-Gisbert 
Date: Wed, 16 Dec 2015 07:57:18 +0300
Subject: [PATCH] Fix security issue when reading username and password

This patch fixes two integer underflows at:
  * grub-core/lib/crypto.c
  * grub-core/normal/auth.c

CVE-2015-8370

Signed-off-by: Hector Marco-Gisbert 
Signed-off-by: Ismael Ripoll-Ripoll 
Also-By: Andrey Borzenkov 
---
 grub-core/lib/crypto.c  | 3 ++-
 grub-core/normal/auth.c | 7 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/grub-core/lib/crypto.c b/grub-core/lib/crypto.c
index 010e550..683a8aa 100644
--- a/grub-core/lib/crypto.c
+++ b/grub-core/lib/crypto.c
@@ -470,7 +470,8 @@ grub_password_get (char buf[], unsigned buf_size)
 
   if (key == '\b')
{
- cur_len--;
+ if (cur_len)
+   cur_len--;
  continue;
}
 
diff --git a/grub-core/normal/auth.c b/grub-core/normal/auth.c
index c6bd96e..8615c48 100644
--- a/grub-core/normal/auth.c
+++ b/grub-core/normal/auth.c
@@ -174,8 +174,11 @@ grub_username_get (char 

commit grub2 for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2015-11-24 22:30:32

Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and  /work/SRC/openSUSE:Factory/.grub2.new (New)


Package is "grub2"

Changes:

--- /work/SRC/openSUSE:Factory/grub2/grub2.changes  2015-11-04 
15:31:41.0 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-11-24 
22:30:33.0 +0100
@@ -1,0 +2,7 @@
+Wed Nov 18 19:33:42 UTC 2015 - arvidj...@gmail.com
+
+- Add 0001-unix-do-not-close-stdin-in-grub_passwd_get.patch
+  Fix reading password by grub2-mkpasswd-pbdk2 without controlling
+  tty, e.g. when called from Xfce menu (boo#954519)
+
+---

New:

  0001-unix-do-not-close-stdin-in-grub_passwd_get.patch



Other differences:
--
++ grub2.spec ++
--- /var/tmp/diff_new_pack.89HWLZ/_old  2015-11-24 22:30:35.0 +0100
+++ /var/tmp/diff_new_pack.89HWLZ/_new  2015-11-24 22:30:35.0 +0100
@@ -260,6 +260,8 @@
 Patch262:   0003-util-grub-mount-fix-descriptor-leak.patch
 Patch263:   0004-linux-ofpath-fix-descriptor-leak.patch
 Patch264:   0005-grub-fstest-fix-descriptor-leak.patch
+# Upstream patch to fix patch 0001-unix-password-Fix-file-descriptor-leak.patch
+Patch265:   0001-unix-do-not-close-stdin-in-grub_passwd_get.patch
 
 Requires:   gettext-runtime
 %if 0%{?suse_version} >= 1140
@@ -530,6 +532,7 @@
 %patch262 -p1
 %patch263 -p1
 %patch264 -p1
+%patch265 -p1
 
 # Generate po/LINGUAS for message catalogs ...
 ./linguas.sh

++ 0001-unix-do-not-close-stdin-in-grub_passwd_get.patch ++
>From 6a46cbcc5c1c746562fd7181bf0f2337db065201 Mon Sep 17 00:00:00 2001
From: Andrei Borzenkov 
Date: Wed, 18 Nov 2015 22:23:58 +0300
Subject: [PATCH] unix: do not close stdin in grub_passwd_get

This makes it impossible to read from stdin without controlling tty:

10:/mnt # echo -e passwd\\npasswd | setsid ./grub-mkpasswd-pbkdf2
Enter password:
Reenter password: ./grub-mkpasswd-pbkdf2: error: failure to read password.
10:/mnt
---
 grub-core/osdep/unix/password.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/grub-core/osdep/unix/password.c b/grub-core/osdep/unix/password.c
index 4b9507b..9996b24 100644
--- a/grub-core/osdep/unix/password.c
+++ b/grub-core/osdep/unix/password.c
@@ -54,7 +54,8 @@ grub_password_get (char buf[], unsigned buf_size)
   grub_memset (buf, 0, buf_size);
   if (!fgets (buf, buf_size, stdin))
 {
-  fclose (in);
+  if (in != stdin)
+   fclose (in);
   return 0;
 }
   ptr = buf + strlen (buf) - 1;
@@ -67,7 +68,8 @@ grub_password_get (char buf[], unsigned buf_size)
   grub_xputs ("\n");
   grub_refresh ();
 
-  fclose (in);
+  if (in != stdin)
+fclose (in);
 
   return 1;
 }
-- 
1.9.1