Accepting request 477066 from home:michael-chang:branches:Base:System

- 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)

OBS-URL: https://build.opensuse.org/request/show/477066
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=262

grub2.spec

@@ -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 @@ Patch21:        grub2-secureboot-add-linuxefi.patch
 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 @@ Patch108:       grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
 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
@@ -337,9 +338,9 @@ provides support for %{platform} systems.
 %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}
@@ -426,8 +427,9 @@ swap partition while in resuming
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch29 -p1
-%patch34 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
 %patch35 -p1
 %patch37 -p1
 %patch38 -p1
@@ -466,10 +468,10 @@ swap partition while in resuming
 %patch120 -p1
 %patch121 -p1
 %patch122 -p1
+%patch123 -p1
 %patch140 -p1
 %patch141 -p1
 %patch150 -p1
-%patch162 -p1
 %patch163 -p1
 %patch164 -p1
 %patch205 -p1