Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2013-04-07 14:22:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2", Maintainer is "mch...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2013-04-05
07:44:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2013-04-07
14:22:27.000000000 +0200
@@ -1,0 +2,14 @@
+Fri Apr 5 17:01:42 UTC 2013 - arvidj...@gmail.com
+
+- add grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch (bnc#810912)
+ * use linuxefi in 30_os-prober if secure boot is enabled
+
+-------------------------------------------------------------------
+Wed Apr 3 17:56:20 UTC 2013 - arvidj...@gmail.com
+
+- update rename-grub-info-file-to-grub2.patch
+ * do not rename docs/grub2.texi here, do it in %%prep (we do it there
+ conditionally already). It simplifies patch refreshing using quilt
+ which does not support file rename.
+
+-------------------------------------------------------------------
New:
----
grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.goMwzA/_old 2013-04-07 14:22:31.000000000 +0200
+++ /var/tmp/diff_new_pack.goMwzA/_new 2013-04-07 14:22:31.000000000 +0200
@@ -138,6 +138,7 @@
Patch31: efidisk-ahci-workaround
Patch32: grub2-grub-mount-return-failure-if-FUSE-failed.patch
Patch33: grub2-fix-tftp-endianness.patch
+Patch34: grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch
Requires: gettext-runtime
%if 0%{?suse_version} >= 1140
Requires: os-prober
@@ -221,10 +222,9 @@
(cd po && ls *.po | cut -d. -f1 | xargs) >po/LINGUAS
%patch0 -p1
%patch1 -p1
-# Workaround SLE11's patch utility did not rename the file for us
-%if 0%{?suse_version} == 1110
+# This simplifies patch handling without need to use git to create patch
+# that renames file
mv docs/grub.texi docs/grub2.texi
-%endif
%patch2 -p1
%patch3 -p1
%patch6 -p1
@@ -259,6 +259,7 @@
%patch31 -p1
%patch32 -p1
%patch33 -p1
+%patch34 -p1
# README.openSUSE
cp %{SOURCE3} .
++++++ grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch ++++++
From: Andrey Borzenkov <arvidj...@gmail.com>
Subject: use linuxefi/initrdefi for Linux in 30_os-prober if secure boot is
enabled
Reference: bnc#810912
Emit linuxefi/initrdefi for os-prober detected Linux installations if
secure boot is enabled.
Index: grub-2.00/util/grub.d/30_os-prober.in
===================================================================
--- grub-2.00.orig/util/grub.d/30_os-prober.in
+++ grub-2.00/util/grub.d/30_os-prober.in
@@ -41,6 +41,15 @@ if [ -z "${OSPROBED}" ] ; then
exit 0
fi
+# If secure boot is enabled, use linuxefi/initrdefi for Linux (bnc#810912)
+if [ -d /sys/firmware/efi ] && [ "x${GRUB_USE_LINUXEFI}" = "xtrue" ]; then
+ LINUX_LOADER_CMD=linuxefi
+ LINUX_INITRD_CMD=initrdefi
+else
+ LINUX_LOADER_CMD=linux
+ LINUX_INITRD_CMD=initrd
+fi
+
osx_entry() {
if [ x$2 = x32 ]; then
# TRANSLATORS: it refers to kernel architecture (32-bit)
@@ -207,11 +216,11 @@ EOF
save_default_entry | sed -e "s/^/\t/"
printf '%s\n' "${prepare_boot_cache}"
cat << EOF
- linux ${LKERNEL} ${LPARAMS}
+ ${LINUX_LOADER_CMD} ${LKERNEL} ${LPARAMS}
EOF
if [ -n "${LINITRD}" ] ; then
cat << EOF
- initrd ${LINITRD}
+ ${LINUX_INITRD_CMD} ${LINITRD}
EOF
fi
cat << EOF
@@ -227,11 +236,11 @@ EOF
save_default_entry | sed -e "s/^/\t\t/"
printf '%s\n' "${prepare_boot_cache}" | sed -e "s/^/\t/"
cat << EOF
- linux ${LKERNEL} ${LPARAMS}
+ ${LINUX_LOADER_CMD} ${LKERNEL} ${LPARAMS}
EOF
if [ -n "${LINITRD}" ] ; then
cat << EOF
- initrd ${LINITRD}
+ ${LINUX_INITRD_CMD} ${LINITRD}
EOF
fi
cat << EOF
++++++ rename-grub-info-file-to-grub2.patch ++++++
--- /var/tmp/diff_new_pack.goMwzA/_old 2013-04-07 14:22:31.000000000 +0200
+++ /var/tmp/diff_new_pack.goMwzA/_new 2013-04-07 14:22:31.000000000 +0200
@@ -4,6 +4,12 @@
Subject: [PATCH] rename grub info file to grub2
Signed-off-by: Jiri Slaby <jirisl...@gmail.com>
+
+From: Andrey Borzenkov <arvidj...@gmail.com>
+Do not rename file here. quilt does not support it and creates the
+whole file if patch needs refreshing. It means that to regenerate two
+files - Makefile.core.am and Makefile.util.am - it may be necessary to
+manually rename it.
---
docs/Makefile.am | 2 +-
docs/Makefile.in | 46 ++++++++++++++++++++--------------------
@@ -116,12 +122,9 @@
maintainer-clean-aminfo:
diff --git a/docs/grub.texi b/docs/grub2.texi
-similarity index 99%
-rename from docs/grub.texi
-rename to docs/grub2.texi
index 26944ac..fb7fb0e 100644
--- a/docs/grub.texi
-+++ b/docs/grub2.texi
++++ b/docs/grub.texi
@@ -1,7 +1,7 @@
\input texinfo
@c -*-texinfo-*-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
