Accepting request 449082 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/449082
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=148

20_memtest86+

@@ -23,6 +23,12 @@ set -e
 export TEXTDOMAIN=grub2
 export TEXTDOMAINDIR=/usr/share/locale
 
+# memset86+ requires the x86 real mode
+# which is not available with UEFI booting.
+if [ -d /sys/firmware/efi ]; then
+  exit 0
+fi
+
 CLASS="--class memtest86 --class gnu --class tools"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then

README.openSUSE

@@ -1,76 +0,0 @@
-Using GNU GRUB 2 in openSUSE
-============================
-
-Though GRUB 2 provides various feature enhancements over previous GRUB
-version (referred to as "GRUB", or "GRUB Legacy"), it did not reach its
-stability and feature completness yet, and thus is not ready to replace
-it for the whole user base. This package is primarily intended to
-encourage testing and accelerate distribution integration.
-
-It is generally safe to install the package. It is able to co-exist with
-existing GRUB installation and adds itself to the GRUB menu upon
-installation, so you'll able to select GRUB 2 from GRUB menu during
-the boot.
-
-Utilities
----------
-
-The GRUB 2 utilities are prefixed (or postfixed) with 'grub2':
-
-grub2-editenv
-grub2-mkimage
-grub2-mkelfimage
-grub2-mkrescue
-grub2-emu
-grub2-install
-grub2-mkdevicemap
-grub2-probe
-grub2-setup
-update-grub2
-
-Documentation
--------------
-
-The GRUB 2 lacks documentation. While you are encouraged to contribute
-the documentation, you can use the GRUB 2 Wiki [1] as primary source of
-information pertaining to this development snapshot.
-
-[1] http://grub.enbug.org/
-
-If you intend to install grub2 as your primary boot loader refer to
-the GRUB 2 Wiki for information on how to set it up.
-
-Support channels
-----------------
-
-If you find a bug in this package, report them to the openSUSE Bugzilla [2].
-
-[2] http://bugzilla.novell.com/
-
-Installation
-------------
-
-There is not yet any support in openSUSE to configure and install
-grub2. To install it for the first time, run (replace /dev/sdaX with
-your boot partition or use /dev/sda for the MBR):
-
-# grub2-install --no-floppy /dev/sdaX
-# grub2-mkconfig -o /boot/grub2/grub.cfg
-
-To just update the configuration after the kernel changes, run
-# grub2-mkconfig -o /boot/grub2/grub.cfg
-
-For testing, you might want to pass --grub-setup=/bin/true to
-grub2-install - this way, grub2 is not setup in the MBR and you can
-use grub to chainload a grub2 configuration.
-
-In the grub menu.lst, just add (after changing the hd0,1 parameter):
-title GNU GRUB 2 -- openSUSE 12.1 - GNU GRUB 2
-    kernel (hd0,1)/boot/grub2/core.img
-
-Warning
--------
-Currently, perl-Bootloader does not support grub2 as bootloader.
-
-Therefore you need to run the following after each kernel change:
-# grub2-mkconfig -o /boot/grub2/grub.cfg

grub2.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jan  4 08:48:56 UTC 2017 - mchang@suse.com
+
+- Remove outdated README.openSUSE (bsc#907693)
+
+-------------------------------------------------------------------
+Fri Dec 30 14:47:39 UTC 2016 - sor.alexei@meowr.ru
+
+- 20_memtest86+: avoid adding memtest86+ to the list with UEFI
+  booting.
+
 -------------------------------------------------------------------
 Fri Oct 28 04:08:19 UTC 2016 - mchang@suse.com
 

grub2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package grub2
 #
-# Copyright (c) 2016 SUSE LINUX 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
@@ -130,7 +130,6 @@ Url:            http://www.gnu.org/software/grub/
 Source0:        grub-%{version}.tar.xz
 Source1:        90_persistent
 Source2:        grub.default
-Source3:        README.openSUSE
 Source4:        grub2.rpmlintrc
 # rsync -Lrtvz  translationproject.org::tp/latest/grub/ po
 Source5:        translations-20140921.tar.xz
@@ -498,8 +497,6 @@ mv po/grub.pot po/%{name}.pot
 # ... and make sure new catalogs are actually created
 rm -f po/stamp-po
 
-# README.openSUSE
-cp %{SOURCE3} .
 cp %{SOURCE8} .
 mkdir build
 %ifarch %{efi}
@@ -894,7 +891,6 @@ fi
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
 %doc THANKS TODO ChangeLog
-%doc README.openSUSE
 %doc docs/autoiso.cfg docs/osdetect.cfg
 %ifarch s390x
 %doc README.ibm3215