From 856b2c7c881ecf9ef2607a9a4c4466635fea857f Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Fri, 18 Jun 2021 19:33:03 -0500
Subject: grub-2:2.06-1.parabola1: updating version

---
 ...-20_linux_xen-detect-udoo-devicetree-file.patch | 38 ++++++++++------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch')

diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
index 7cd6be6b4..692ac51f2 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch
@@ -1,8 +1,7 @@
-diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
---- a/util/grub.d/10_linux.in	2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/10_linux.in	2015-09-27 18:43:26.911364096 -0300
-@@ -139,6 +139,14 @@
- 	initrd	${rel_dirname}/${initrd}
+--- a/util/grub.d/10_linux.in	2021-06-17 03:06:45.912081000 -0500
++++ b/util/grub.d/10_linux.in	2021-06-18 02:58:17.879587880 -0500
+@@ -155,6 +155,14 @@
+ 	initrd	$(echo $initrd_path)
  EOF
    fi
 +  if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then
@@ -16,22 +15,21 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
    sed "s/^/$submenu_indentation/" << EOF
  }
  EOF
-@@ -222,6 +230,10 @@
-     linux_root_device_thisversion=${GRUB_DEVICE}
+@@ -261,6 +269,10 @@
+     fi
    fi
  
 +  if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then
 +    gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2
 +  fi
 +
-   if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
-     linux_entry "${OS}" "${version}" simple \
-     "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
---- a/util/grub.d/20_linux_xen.in	2015-09-27 14:14:45.544730230 -0300
-+++ b/util/grub.d/20_linux_xen.in	2015-09-27 18:47:34.953427471 -0300
-@@ -132,6 +132,14 @@
- 	module	--nounzip   ${rel_dirname}/${initrd}
+   # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+   # mentioned in the documentation that has to be set to 'y' instead of 'true' to
+   # enable it. This caused a lot of confusion to users that set the option to 'y',
+--- a/util/grub.d/20_linux_xen.in	2021-06-17 03:06:56.202081000 -0500
++++ b/util/grub.d/20_linux_xen.in	2021-06-18 02:59:12.559587771 -0500
+@@ -172,6 +172,14 @@
+ 	${module_loader}     ${rel_dirname}/${xenpolicy}
  EOF
    fi
 +  if test -d "${rel_dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then
@@ -45,14 +43,14 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
    sed "s/^/$submenu_indentation/" << EOF
  }
  EOF
-@@ -235,6 +243,10 @@
- 	    linux_root_device_thisversion=${GRUB_DEVICE}
+@@ -316,6 +324,10 @@
+ 	    fi
  	fi
  
 +  if test -d "${dirname}/dtbs/${version}/imx6q-udoo.dtb" ; then
 +    gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/imx6q-udoo.dtb" >&2
 +  fi
 +
- 	if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
- 	    linux_entry "${OS}" "${version}" "${xen_version}" simple \
- 		"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+ 	# The GRUB_DISABLE_SUBMENU option used to be different than others since it was
+ 	# mentioned in the documentation that has to be set to 'y' instead of 'true' to
+ 	# enable it. This caused a lot of confusion to users that set the option to 'y',
-- 
cgit v1.2.2