From a6c44482a8e9fc801164e9be72a509af09da7f1fdde36dc33a904a8c0e7e9d7e Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Sun, 3 Sep 2017 12:03:53 +0000 Subject: [PATCH] Accepting request 520488 from home:michael-chang:bsc:1055280 - grub2-s390x-04-grub2-install.patch : remove arybase dependency in grub2-zipl-setup by not referencing to $[ (bsc#1055280) OBS-URL: https://build.opensuse.org/request/show/520488 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=275 --- grub2-s390x-04-grub2-install.patch | 77 +++++++++++++++--------------- grub2.changes | 6 +++ 2 files changed, 45 insertions(+), 38 deletions(-) diff --git a/grub2-s390x-04-grub2-install.patch b/grub2-s390x-04-grub2-install.patch index 80408fa..857fe90 100644 --- 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 /^$/; diff --git a/grub2.changes b/grub2.changes index 04b8aa4..2cbfb19 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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