diff options
Diffstat (limited to 'libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch')
| -rw-r--r-- | libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch index b620a39d0..eac637d5b 100644 --- a/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch +++ b/libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-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-10-16 08:28:56.901970897 -0300 -+++ b/util/grub.d/10_linux.in 2015-10-16 08:30:45.112786124 -0300 -@@ -139,6 +139,25 @@ - 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:16:38.219592837 -0500 +@@ -155,6 +155,25 @@ + initrd $(echo $initrd_path) EOF fi + if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then @@ -27,8 +26,8 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in sed "s/^/$submenu_indentation/" << EOF } EOF -@@ -222,6 +241,16 @@ - linux_root_device_thisversion=${GRUB_DEVICE} +@@ -261,6 +280,16 @@ + fi fi + if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then @@ -41,14 +40,13 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in + fi + 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-10-16 08:28:56.901970897 -0300 -+++ b/util/grub.d/20_linux_xen.in 2015-10-16 08:31:03.152921373 -0300 -@@ -132,6 +132,25 @@ - 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:23:54.679591971 -0500 +@@ -172,6 +172,25 @@ + ${module_loader} ${rel_dirname}/${xenpolicy} EOF fi + if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then @@ -73,8 +71,8 @@ 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 +254,16 @@ - linux_root_device_thisversion=${GRUB_DEVICE} +@@ -316,6 +335,16 @@ + fi fi + if [ "$(cat /sys/devices/platform/bone_capemgr/baseboard/board-name)" = 'A335BONE' ]; then @@ -87,6 +85,6 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in + fi + 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', |