Accepting request 520583 from Base:System

1 OBS-URL: https://build.opensuse.org/request/show/520583 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=167
2017-09-07 20:10:42 +00:00 · 2017-09-07 20:10:42 +00:00 · 9019d23b6e
commit 9019d23b6e
parent 4b4eca0350
4 changed files with 4871 additions and 38 deletions
--- a/0001-add-support-for-UEFI-network-protocols.patch
+++ b/0001-add-support-for-UEFI-network-protocols.patch
--- a/grub2-s390x-04-grub2-install.patch
+++ b/grub2-s390x-04-grub2-install.patch
@ -45,6 +45,8 @@ V15:
 * 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 @@ V16:
 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 @@ Index: grub-2.02~rc1/Makefile.util.def
 };
 
 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 @@ Index: grub-2.02~rc1/configure.ac
 
 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 @@ Index: grub-2.02~rc1/grub-core/Makefile.core.def
 };
 
 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 @@ Index: grub-2.02~rc1/grub-core/osdep/basic/no_platform.c
 +  grub_util_error ("%s", _("no zIPL routines are available for your platform"));
 +}
 +
-Index: grub-2.02~rc1/grub-core/osdep/unix/platform.c
+Index: grub-2.02/grub-core/osdep/unix/platform.c
 ===================================================================
--- grub-2.02~rc1.orig/grub-core/osdep/unix/platform.c
-+++ grub-2.02~rc1/grub-core/osdep/unix/platform.c
+--- grub-2.02.orig/grub-core/osdep/unix/platform.c
+++ grub-2.02/grub-core/osdep/unix/platform.c
@@ -233,3 +233,14 @@ grub_install_sgi_setup (const char *inst
 	imgfile, destname, NULL });
   grub_util_warn ("%s", _("You will have to set `SystemPartition' and `OSLoader' manually."));
@ -272,10 +274,10 @@ Index: grub-2.02~rc1/grub-core/osdep/unix/platform.c
 +	"-z", dest, NULL }))
 +    grub_util_error (_("`%s' failed.\n"), PACKAGE"-zipl-setup");
 +}
-Index: grub-2.02~rc1/grub-core/osdep/windows/platform.c
+Index: grub-2.02/grub-core/osdep/windows/platform.c
 ===================================================================
--- grub-2.02~rc1.orig/grub-core/osdep/windows/platform.c
-+++ grub-2.02~rc1/grub-core/osdep/windows/platform.c
+--- grub-2.02.orig/grub-core/osdep/windows/platform.c
+++ grub-2.02/grub-core/osdep/windows/platform.c
@@ -422,3 +422,9 @@ grub_install_sgi_setup (const char *inst
 {
   grub_util_error ("%s", _("no SGI routines are available for your platform"));
@ -286,10 +288,10 @@ Index: grub-2.02~rc1/grub-core/osdep/windows/platform.c
 +{
 +  grub_util_error ("%s", _("no zIPL routines are available for your platform"));
 +}
-Index: grub-2.02~rc1/include/grub/util/install.h
+Index: grub-2.02/include/grub/util/install.h
 ===================================================================
--- grub-2.02~rc1.orig/include/grub/util/install.h
-+++ grub-2.02~rc1/include/grub/util/install.h
+--- grub-2.02.orig/include/grub/util/install.h
+++ grub-2.02/include/grub/util/install.h
@@ -99,6 +99,7 @@ enum grub_install_plat
     GRUB_INSTALL_PLATFORM_I386_XEN,
     GRUB_INSTALL_PLATFORM_X86_64_XEN,
@ -308,10 +310,10 @@ Index: grub-2.02~rc1/include/grub/util/install.h
 int 
 grub_install_compress_gzip (const char *src, const char *dest);
 int 
-Index: grub-2.02~rc1/util/grub-install-common.c
+Index: grub-2.02/util/grub-install-common.c
 ===================================================================
--- grub-2.02~rc1.orig/util/grub-install-common.c
-+++ grub-2.02~rc1/util/grub-install-common.c
+--- grub-2.02.orig/util/grub-install-common.c
+++ grub-2.02/util/grub-install-common.c
@@ -666,6 +666,7 @@ static struct
     [GRUB_INSTALL_PLATFORM_ARM_EFI] =          { "arm",     "efi"       },
     [GRUB_INSTALL_PLATFORM_ARM64_EFI] =        { "arm64",   "efi"       },
@ -320,10 +322,10 @@ Index: grub-2.02~rc1/util/grub-install-common.c
   }; 
 
 char *
-Index: grub-2.02~rc1/util/grub-install.c
+Index: grub-2.02/util/grub-install.c
 ===================================================================
--- grub-2.02~rc1.orig/util/grub-install.c
-+++ grub-2.02~rc1/util/grub-install.c
+--- grub-2.02.orig/util/grub-install.c
+++ grub-2.02/util/grub-install.c
@@ -66,6 +66,7 @@ static int force_file_id = 0;
 static char *disk_module = NULL;
 static char *efidir = NULL;
@ -454,7 +456,7 @@ Index: grub-2.02~rc1/util/grub-install.c
     case GRUB_INSTALL_PLATFORM_ARM_EFI:
     case GRUB_INSTALL_PLATFORM_ARM64_EFI:
     case GRUB_INSTALL_PLATFORM_IA64_EFI:
-@@ -1884,6 +1923,10 @@ main (int argc, char *argv[])
+@@ -1885,6 +1924,10 @@ main (int argc, char *argv[])
 	}
       break;
 
@ -465,10 +467,10 @@ Index: grub-2.02~rc1/util/grub-install.c
     case GRUB_INSTALL_PLATFORM_MIPSEL_LOONGSON:
     case GRUB_INSTALL_PLATFORM_MIPSEL_QEMU_MIPS:
     case GRUB_INSTALL_PLATFORM_MIPS_QEMU_MIPS:
-Index: grub-2.02~rc1/util/s390x/dracut-grub2.sh.in
+Index: grub-2.02/util/s390x/dracut-grub2.sh.in
 ===================================================================
 --- /dev/null
-+++ grub-2.02~rc1/util/s390x/dracut-grub2.sh.in
+++ grub-2.02/util/s390x/dracut-grub2.sh.in
@@ -0,0 +1,110 @@
 +#!/bin/sh
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@ -580,10 +582,10 @@ Index: grub-2.02~rc1/util/s390x/dracut-grub2.sh.in
 +  fi
 +fi
 +
-Index: grub-2.02~rc1/util/s390x/dracut-module-setup.sh.in
+Index: grub-2.02/util/s390x/dracut-module-setup.sh.in
 ===================================================================
 --- /dev/null
-+++ grub-2.02~rc1/util/s390x/dracut-module-setup.sh.in
+++ grub-2.02/util/s390x/dracut-module-setup.sh.in
@@ -0,0 +1,19 @@
 +#!/bin/bash
 +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
@ -604,10 +606,10 @@ Index: grub-2.02~rc1/util/s390x/dracut-module-setup.sh.in
 +    #inst_multiple grub2-emu kexec
 +}
 +
-Index: grub-2.02~rc1/util/s390x/zipl2grub.conf.in
+Index: grub-2.02/util/s390x/zipl2grub.conf.in
 ===================================================================
 --- /dev/null
-+++ grub-2.02~rc1/util/s390x/zipl2grub.conf.in
+++ grub-2.02/util/s390x/zipl2grub.conf.in
@@ -0,0 +1,26 @@
 +## This is the template for '@zipldir@/config' and is subject to
 +## rpm's %config file handling in case of grub2-s390x-emu package update.
@ -635,11 +637,11 @@ Index: grub-2.02~rc1/util/s390x/zipl2grub.conf.in
 +    1 = grub2
 +    2 = skip-grub2
 +
-Index: grub-2.02~rc1/util/s390x/zipl2grub.pl.in
+Index: grub-2.02/util/s390x/zipl2grub.pl.in
 ===================================================================
 --- /dev/null
-+++ grub-2.02~rc1/util/s390x/zipl2grub.pl.in
-@@ -0,0 +1,424 @@
+++ grub-2.02/util/s390x/zipl2grub.pl.in
+@@ -0,0 +1,423 @@
 +#!/usr/bin/perl
 +use strict;
 +
@ -812,7 +814,6 @@ Index: grub-2.02~rc1/util/s390x/zipl2grub.pl.in
 +  Panic( $_[0], $msg . "\n");
 +}
 +
-+die if ($[ != 0);
 +while ( $#ARGV >= 0 ) {
 +  $_ = shift;
 +  next if /^$/;
--- a/grub2.changes
+++ b/grub2.changes
@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sun Sep  3 12:12:21 UTC 2017 - mchang@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 - mchang@suse.com
+
+- grub2-s390x-04-grub2-install.patch : remove arybase dependency in
+  grub2-zipl-setup by not referencing to $[ (bsc#1055280) 
+
 -------------------------------------------------------------------
 Wed Aug 23 17:52:32 UTC 2017 - rw@suse.com

--- a/grub2.spec
+++ b/grub2.spec
@ -267,6 +267,8 @@ Patch408:       0009-tpm-Measure-multiboot-images-and-modules.patch
 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 @@ swap partition while in resuming
 %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" ] ||\