From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 3 Aug 2017 11:47:30 +0000 (+0000)
Subject: grub: update to 2.02 final
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fgrub-2.02-final;p=people%2Farne_f%2Fipfire-3.x.git

grub: update to 2.02 final

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/grub/grub.nm b/grub/grub.nm
index 32dae0dd1..ccfe62160 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -5,10 +5,10 @@
 
 name       = grub
 version    = 2.02
-beta       = beta3
-release    = 0.%{beta}.3
+release    = 0.1
+
 sup_arches = aarch64 x86_64 i686
-thisapp    = %{name}-%{version}~%{beta}
+thisapp    = %{name}-%{version}
 
 groups     = System/Boot
 url        = http://www.gnu.org/software/grub/
diff --git a/grub/patches/2.02_beta3-10_linux-UUID.patch b/grub/patches/2.02_beta3-10_linux-UUID.patch
deleted file mode 100644
index 1dcf3b5b7..000000000
--- a/grub/patches/2.02_beta3-10_linux-UUID.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 5 Mar 2016 17:21:15 -0500
-Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
-
-Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
-mixing of || and && operators. Add some parens to help with that.
----
- util/grub.d/10_linux.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 5a78513..de9044c 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -47,7 +47,7 @@ esac
- # and mounting btrfs requires user space scanning, so force UUID in this case.
- if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-     || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
--    || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
-+    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
-   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
- else
-   LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
--- 
-2.7.2
-
diff --git a/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch b/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch
deleted file mode 100644
index 0d8141544..000000000
--- a/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-2016-05-21  Magnus Granberg  <zorry@gentoo.org>
-
-	#583042 sys-boot/grub-2.02_beta3-r1: building w/gcc-6[pie]: error:
-	x86_64-pc-linux-gnu/bin/ld: -r and -shared may not be used together
-
-	* acinclude.m4: Add -no-pie check.
-	* configure.ac: Add -no-pie to TARGET_LDFLAGS if needed.
-
---- a/acinclude.m4	2015-11-11 20:56:52.000000000 +0100
-+++ b/acinclude.m4	2016-05-17 00:08:22.000000000 +0200
-@@ -390,6 +390,24 @@ else
- [fi]
- ])
- 
-+dnl Check if the Linker supports `-no-pie'.
-+AC_DEFUN([grub_CHECK_NO_PIE],
-+[AC_MSG_CHECKING([whether linker accepts -no-pie])
-+AC_CACHE_VAL(grub_cv_cc_ld_nopie,
-+[save_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS -no-pie"
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
-+	       [grub_cv_cc_ld_no_pie=yes],
-+	       [grub_cv_cc_ld_no_pie=no])
-+LDFLAGS="$save_LDFLAGS"
-+])
-+AC_MSG_RESULT([$grub_cv_cc_ld_no_pie])
-+nopie_possible=no
-+if test "x$grub_cv_cc_ld_no_pie" = xyes ; then
-+  nopie_possible=yes
-+fi
-+])
-+
- dnl Check if the C compiler supports `-fPIC'.
- AC_DEFUN([grub_CHECK_PIC],[
- [# Position independent executable.
---- a/configure.ac	2016-02-27 13:40:56.000000000 +0100
-+++ b/configure.ac	2016-05-17 00:57:29.471000000 +0200
-@@ -1184,13 +1184,18 @@ CFLAGS="$TARGET_CFLAGS"
- 
- # Position independent executable.
- grub_CHECK_PIE
-+grub_CHECK_NO_PIE
- [# Need that, because some distributions ship compilers that include
--# `-fPIE' in the default specs.
-+# `-fPIE' and '-pie' in the default specs.
- if [ x"$pie_possible" = xyes ]; then
-   TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
-+fi
-+if [ x"$nopie_possible" = xyes ] &&  [ x"$pie_possible" = xyes ]; then
-+  TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie"
- fi]
- 
- CFLAGS="$TARGET_CFLAGS"
-+LDFLAGS="$TARGET_LDFLAGS"
- 
- # Position independent executable.
- grub_CHECK_PIC