Accepting request 215036 from home:oertel:branches:Base:System

- Add changes to allow build for s390x arch: added
  grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch

- refresh 0002-script-create-menus-for-btrfs-snapshot.patch
* Fix bootable snapshots not found while root is on Btrfs subvolume
  (bnc#859587)
* Create missing slave config in /.snapshots/<num>/
* Prefix with SUSE_ for related options

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

grub2.spec

@@ -26,6 +26,9 @@ BuildRequires:  glibc-devel-32bit
 %else
 BuildRequires:  gcc
 BuildRequires:  glibc-devel
+%ifarch s390x
+BuildRequires:  glibc-static
+%endif
 %endif
 BuildRequires:  automake
 BuildRequires:  bison
@@ -67,6 +70,11 @@ BuildRequires:  pesign-obs-integration
 %define platform pc
 %endif
 
+%ifarch s390x
+%define grubcpu s390x
+%define platform emu
+%endif
+
 %define grubarch %{grubcpu}-%{platform}
 
 # build efi bootloader on some platforms only:
@@ -128,6 +136,7 @@ Patch34:        grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
 Patch35:        grub2-linguas.sh-no-rsync.patch
 Patch36:        0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
 Patch37:        grub2-use-DejaVuSansMono-for-starfield-theme.patch
+Patch38:        grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
 # Btrfs snapshot booting related patches
 Patch101:       0002-btrfs-add-ability-to-boot-from-subvolumes.patch
 Patch102:       0003-cmdline-add-envvar-loader_cmdline_append.patch
@@ -149,7 +158,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?only_x86_64:1}
 ExclusiveArch:  x86_64
 %else
-ExclusiveArch:  %{ix86} x86_64 ppc ppc64
+ExclusiveArch:  %{ix86} x86_64 ppc ppc64 s390x
 %endif
 
 %description
@@ -257,6 +266,7 @@ mv po/grub.pot po/%{name}.pot
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch38 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -362,6 +372,12 @@ cd build
 %define _target_platform i386-%{_vendor}-%{_target_os}%{?_gnu}
 %endif
 
+%ifarch s390x
+%define _devmapper --disable-device-mapper
+%else
+%define _devmapper --enable-device-mapper
+%endif
+
 # -static is needed so that autoconf script is able to link
 # test that looks for _start symbol on 64 bit platforms
 ../configure TARGET_LDFLAGS=-static     \
@@ -369,6 +385,7 @@ cd build
 	--sysconfdir=%{_sysconfdir}	\
         --target=%{_target_platform}    \
         --with-platform=%{platform}     \
+	%{_devmapper}                   \
         --program-transform-name=s,grub,%{name},
 make %{?_smp_mflags}
 %endif
@@ -574,7 +591,6 @@ fi
 %{_sysconfdir}/grub.d/README
 %config %{_sysconfdir}/grub.d/??_*
 %{_sbindir}/%{name}-bios-setup
-%{_sbindir}/%{name}-install
 %{_sbindir}/%{name}-macbless
 %{_sbindir}/%{name}-mkconfig
 %{_sbindir}/%{name}-once
@@ -601,6 +617,12 @@ fi
 %{_bindir}/%{name}-render-label
 %{_bindir}/%{name}-script-check
 %{_bindir}/%{name}-syslinux2cfg
+%ifarch s390x
+%{_bindir}/%{name}-emu
+%{_bindir}/%{name}-emu-lite
+%else
+%{_sbindir}/%{name}-install
+%endif
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/themes
@@ -630,13 +652,17 @@ fi
 %{_mandir}/man1/%{name}-script-check.1.*
 %{_mandir}/man1/%{name}-syslinux2cfg.1.*
 %{_mandir}/man8/%{name}-bios-setup.8.*
-%{_mandir}/man8/%{name}-install.8.*
 %{_mandir}/man8/%{name}-mkconfig.8.*
 %{_mandir}/man8/%{name}-ofpathname.8.*
 %{_mandir}/man8/%{name}-probe.8.*
 %{_mandir}/man8/%{name}-reboot.8.*
 %{_mandir}/man8/%{name}-set-default.8.*
 %{_mandir}/man8/%{name}-sparc64-setup.8.*
+%ifarch s390x
+%{_mandir}/man1/%{name}-emu.1.*
+%else
+%{_mandir}/man8/%{name}-install.8.*
+%endif
 
 %files branding-upstream
 %{_datadir}/%{name}/themes/starfield
@@ -650,7 +676,7 @@ fi
 %{_libdir}/%{name}/%{grubarch}/%{name}.chrp
 %{_libdir}/%{name}/%{grubarch}/bootinfo.txt
 %endif
-%ifnarch ppc ppc64
+%ifnarch ppc ppc64 s390x
 %{_libdir}/%{name}/%{grubarch}/*.image
 %endif
 %{_libdir}/%{name}/%{grubarch}/*.img