From 30690b0c8d95ec1c58e9b7209a6b4e0fdee5dea1 Mon Sep 17 00:00:00 2001
From: "coadde [Márcio Alexandre Silva Delgado]" <coadde@parabola.nu>
Date: Sat, 6 Aug 2016 05:29:10 -0300
Subject: update grub patches

---
 .../grub/0005-10_linux-fix-grouping-of-tests.patch | 22 ++++++++++++++++++++++
 libre/grub/grub-2.00-fix-docs.patch                | 21 ---------------------
 2 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 libre/grub/0005-10_linux-fix-grouping-of-tests.patch
 delete mode 100644 libre/grub/grub-2.00-fix-docs.patch

(limited to 'libre')

diff --git a/libre/grub/0005-10_linux-fix-grouping-of-tests.patch b/libre/grub/0005-10_linux-fix-grouping-of-tests.patch
new file mode 100644
index 000000000..a57b1ecf8
--- /dev/null
+++ b/libre/grub/0005-10_linux-fix-grouping-of-tests.patch
@@ -0,0 +1,22 @@
+commit 082bc9f77b200eb48a5f1147163dea9c9d02d44c
+Author: Mike Gilbert <floppym@gentoo.org>
+Date:   Sat Mar 5 17:30:48 2016 -0500
+
+    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.
+
+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}
diff --git a/libre/grub/grub-2.00-fix-docs.patch b/libre/grub/grub-2.00-fix-docs.patch
deleted file mode 100644
index 0aa481154..000000000
--- a/libre/grub/grub-2.00-fix-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 40d6b00fa48ae9c1cecf143da5c6061f6ffcb719 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com
-Date: Tue, 12 Mar 2013 15:23:02 -0400
-Subject: [PATCH] Fix docs
-
-I think the doc generation tools got stricter, so fix up the .texi file
-to work.
-
-diff --git a/docs/grub-dev.texi b/docs/grub-dev.texi
---- a/docs/grub-dev.texi
-+++ b/docs/grub-dev.texi
-@@ -1394,8 +1394,8 @@ grub_video_blit_glyph (&glyph, color, 0,
- 
- @node Bitmap API
- @section Bitmap API
--@itemize
- @subsection grub_video_bitmap_create
-+@itemize
- @item Prototype:
- @example
- grub_err_t grub_video_bitmap_create (struct grub_video_bitmap **bitmap, unsigned int width, unsigned int height, enum grub_video_blit_format blit_format)
-- 
cgit v1.2.3