summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch (renamed from libre/grub/0004-add-GRUB_COLOR_variables.patch)17
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch38
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch38
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch38
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch38
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch62
-rw-r--r--libre/grub/0003-10_linux-20_linux_xen-detect-udoo-devicetree-file.patch38
-rw-r--r--libre/grub/PKGBUILD77
-rw-r--r--libre/grub/grub.default10
-rw-r--r--libre/grub/grub.install17
10 files changed, 190 insertions, 183 deletions
diff --git a/libre/grub/0004-add-GRUB_COLOR_variables.patch b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch
index c113a81d5..867e8feeb 100644
--- a/libre/grub/0004-add-GRUB_COLOR_variables.patch
+++ b/libre/grub/0001-00_header-add-GRUB_COLOR_-variables.patch
@@ -1,18 +1,27 @@
+From 21e5bcf22ab1a9f08c63e2a0212219d7482f77c1 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Wed, 10 Mar 2021 18:42:25 +0100
+Subject: [PATCH] 00_header: add GRUB_COLOR_* variables
+---
+ util/grub-mkconfig.in | 2 ++
+ util/grub.d/00_header.in | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 3390ba9..c416489 100644
+index f8cbb8d7a..1189d95f9 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
-@@ -218,6 +218,8 @@ export GRUB_DEFAULT \
+@@ -246,6 +246,8 @@ export GRUB_DEFAULT \
+ GRUB_BACKGROUND \
GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \
- GRUB_DISABLE_OS_PROBER \
+ GRUB_COLOR_NORMAL \
+ GRUB_COLOR_HIGHLIGHT \
GRUB_INIT_TUNE \
GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index d2e7252..8259f45 100644
+index 93a90233e..c5955df00 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF
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',
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
index 0e5bc382a..71d04cb4b 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle-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:35:47.579590557 -0500
+@@ -155,6 +155,14 @@
+ initrd $(echo $initrd_path)
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.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}/omap3-beagle.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.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:38:28.569590238 -0500
+@@ -172,6 +172,14 @@
+ ${module_loader} ${rel_dirname}/${xenpolicy}
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle.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}/omap3-beagle.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle.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',
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
index 387ebbcc5..3ba413c05 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm-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:45:30.129589402 -0500
+@@ -155,6 +155,14 @@
+ initrd $(echo $initrd_path)
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.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}/omap3-beagle-xm.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.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:46:39.199589265 -0500
+@@ -172,6 +172,14 @@
+ ${module_loader} ${rel_dirname}/${xenpolicy}
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm.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}/omap3-beagle-xm.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm.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',
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
index 31b59890e..f24eed1b6 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-devicetree-file.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-omap3_beagle_xm_ab-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:52:13.679588602 -0500
+@@ -155,6 +155,14 @@
+ initrd $(echo $initrd_path)
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.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}/omap3-beagle-xm-ab.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.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:53:25.419588460 -0500
+@@ -172,6 +172,14 @@
+ ${module_loader} ${rel_dirname}/${xenpolicy}
EOF
fi
+ if test -d "${rel_dirname}/dtbs/${version}/omap3-beagle-xm-ab.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}/omap3-beagle-xm-ab.dtb" ; then
+ gettext_printf "Found device tree directory: %s\n" "${dirname}/dtbs/${version}/omap3-beagle-xm-ab.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',
diff --git a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
index 8184871b5..3ae7d9546 100644
--- a/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
+++ b/libre/grub/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch
@@ -1,21 +1,23 @@
-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 15:34:19.822404966 -0300
-@@ -80,9 +80,11 @@
+--- a/util/grub.d/10_linux.in 2021-06-17 03:06:45.912081000 -0500
++++ b/util/grub.d/10_linux.in 2021-06-17 13:39:03.509682976 -0500
+@@ -91,10 +91,14 @@
+ fi
if [ x$type != xsimple ] ; then
case $type in
++ booster)
++ title="$(gettext_printf "%s, %s kernel (booster initramfs)" "${os}" "${version}")" ;;
++ fallback)
++ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;;
recovery)
- title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
+ title="$(gettext_printf "%s, %s kernel (recovery mode)" "${os}" "${version}")" ;;
-+ fallback)
-+ title="$(gettext_printf "%s, %s kernel (fallback initramfs)" "${os}" "${version}")" ;;
*)
- title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
+ title="$(gettext_printf "%s, %s kernel" "${os}" "${version}")" ;;
esac
if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
-@@ -94,7 +96,7 @@
+@@ -106,7 +110,7 @@
else
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -24,7 +26,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
save_default_entry | grub_add_tab
fi
-@@ -126,7 +128,7 @@
+@@ -138,7 +142,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
@@ -33,7 +35,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -182,7 +184,7 @@
+@@ -198,7 +202,7 @@
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -42,29 +44,39 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -238,6 +240,18 @@
+@@ -285,6 +289,29 @@
linux_entry "${OS}" "${version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-+
++
+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
-+ initrd="initramfs-${version}-fallback.img"
-+
++ initrd="${initrd_early} initramfs-${version}-fallback.img"
++
+ if test -n "${initrd}" ; then
+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2
+ fi
-+
++
+ linux_entry "${OS}" "${version}" fallback \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+ fi
-+
++
++ if test -e "${dirname}/booster-${version}.img" ; then
++ initrd="${initrd_early} booster-${version}.img"
++
++ if test -n "${initrd}" ; then
++ gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
++ fi
++
++ linux_entry "${OS}" "${version}" booster \
++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
++ fi
++
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" recovery \
"single ${GRUB_CMDLINE_LINUX}"
-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 15:35:00.589739244 -0300
-@@ -88,9 +88,11 @@
+--- 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-17 03:22:43.732079272 -0500
+@@ -117,9 +117,11 @@
fi
if [ x$type != xsimple ] ; then
if [ x$type = xrecovery ] ; then
@@ -78,7 +90,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
fi
replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-@@ -103,7 +105,7 @@
+@@ -132,7 +134,7 @@
title="$(gettext_printf "%s, with Xen hypervisor" "${os}")"
echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -87,7 +99,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
fi
-@@ -112,7 +114,7 @@
+@@ -141,7 +143,7 @@
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})"
@@ -96,7 +108,7 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$xmessage" | grub_quote)'
if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then
-@@ -210,7 +212,7 @@
+@@ -275,7 +277,7 @@
basename=`basename $linux`
dirname=`dirname $linux`
rel_dirname=`make_system_path_relative_to_its_root $dirname`
@@ -105,18 +117,18 @@ diff -Nur a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-@@ -252,6 +254,18 @@
+@@ -341,6 +343,18 @@
linux_entry "${OS}" "${version}" "${xen_version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+
+ if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
+ initrd="initramfs-${version}-fallback.img"
-+
++
+ if test -n "${initrd}" ; then
+ gettext_printf "Found fallback initramfs image: %s\n" "${dirname}/${initrd}" >&2
+ fi
-+
++
+ linux_entry "${OS}" "${version}" "${xen_version}" fallback \
+ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}"
+ fi
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',
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 4e90e1524..ea2764111 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -7,7 +7,7 @@
# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
## '1' to enable Xen support, '0' to disable
-_XEN='1'
+_XEN='0'
## '1' to enable IA32-EFI build in Arch x86_64, '0' to disable
_IA32_EFI_IN_ARCH_X64='1'
@@ -18,31 +18,30 @@ _IA32_XEN_IN_ARCH_X64='1'
## '1' to enable EMU build (x86_64 and i686 only), "0" to disable
_GRUB_EMU_BUILD='0'
-_GRUB_EXTRAS_COMMIT="136763a4cc9ca3a4f59d05b79eede2159d6f441e"
-_GNULIB_COMMIT="9ce9be2ef0cb1180e35dfe9dfbbe90d774b374bd"
-_UNIFONT_VER="12.1.02"
+[[ "${CARCH}" = 'armv7h' ]] && _EFI_ARCH='arm'
+[[ "${CARCH}" = 'x86_64' ]] && _EFI_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _EFI_ARCH='i386'
-[[ "${CARCH}" = "armv7h" ]] && _EFI_ARCH="arm"
-[[ "${CARCH}" = "x86_64" ]] && _EFI_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _EFI_ARCH="i386"
+[[ "${CARCH}" = 'x86_64' ]] && _XEN_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _XEN_ARCH='i386'
-[[ "${CARCH}" = "x86_64" ]] && _XEN_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _XEN_ARCH="i386"
-
-[[ "${CARCH}" = "armv7h" ]] && _EMU_ARCH="arm"
-[[ "${CARCH}" = "x86_64" ]] && _EMU_ARCH="x86_64"
-[[ "${CARCH}" = "i686" ]] && _EMU_ARCH="i386"
+[[ "${CARCH}" = 'armv7h' ]] && _EMU_ARCH='arm'
+[[ "${CARCH}" = 'x86_64' ]] && _EMU_ARCH='x86_64'
+[[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386'
pkgbase='grub'
pkgname=('grub')
[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle'
'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab')
pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)'
-_pkgver=2.04
-pkgver=${_pkgver/-/}
-pkgrel=2
-pkgrel+=.par1
epoch=2
+_tag='53c5000739db114c229fe69ec3d4b76b92441098' # git rev-parse grub-${_pkgver}
+_gnulib_commit='be584c56eb1311606e5ea1a36363b97bddb6eed3'
+_unifont_ver='13.0.06'
+_pkgver=2.06
+pkgver=${_pkgver/-/}
+pkgrel=1
+pkgrel+=.parabola1
url='https://www.gnu.org/software/grub/'
arch=('x86_64')
arch+=('i686' 'armv7h')
@@ -80,12 +79,11 @@ validpgpkeys=('E53D497F3FA42AD8C9B4D1E835A93B74E82E4209' # Vladimir 'phcoder' S
'BE5C23209ACDDACEB20DB0A28C8189F1988C2166' # Daniel Kiper <dkiper@net-space.pl>
'95D2E9AB8740D8046387FD151A09227B1F435A33') #Paul Hardy
-source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signed"
- "git+https://git.savannah.gnu.org/git/grub-extras.git#commit=${_GRUB_EXTRAS_COMMIT}"
- "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_GNULIB_COMMIT}"
- "https://ftp.gnu.org/gnu/unifont/unifont-${_UNIFONT_VER}/unifont-${_UNIFONT_VER}.bdf.gz"{,.sig}
+source=("git+https://git.savannah.gnu.org/git/grub.git#tag=${_tag}?signed"
+ "git+https://git.savannah.gnu.org/git/gnulib.git#commit=${_gnulib_commit}"
+ "https://ftp.gnu.org/gnu/unifont/unifont-${_unifont_ver}/unifont-${_unifont_ver}.bdf.gz"{,.sig}
'0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch'
- '0004-add-GRUB_COLOR_variables.patch'
+ '0001-00_header-add-GRUB_COLOR_-variables.patch'
'grub.default'
'0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch'
'0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch'
@@ -96,17 +94,16 @@ source=("git+https://git.savannah.gnu.org/git/grub.git#tag=grub-${_pkgver}?signe
sha256sums=('SKIP'
'SKIP'
+ 'b7668a5d498972dc4981250c49f83601babce797be19b4fdd0f2f1c6cfbd0fc5'
'SKIP'
- '04d652be1e28a6d464965c75c71ac84633085cd0960c2687466651c34c94bd89'
- 'SKIP'
- '3f68a78ecba0284b9d39af60431236cb2ebc8547d3dc1fb26a1ac7a6b9afbbc7'
- 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29'
- 'c700a3a2e0bdb47620a78b454aaa4bbf52989102eb47b08672240192e91b2a57'
- '9ece1db537a989ce4dc55ece471883e19b8ab16902f8c4feb68436c3b5700f71'
- 'de71452b9b0fbfb08ea742e9fa217ab34fddf6312452f155fb9d82ebf1c024a5'
- '222da944b4af43a1d86be0e3d91f2e1a82324fa51c7ad36cc25246ffa3739ab1'
- '9002c69e74143553ef8cdd32ca04e8bdcb7a1a0ba1c4564163bae061fe68d855'
- '6584a0dda9dbf6d70dbdfba619abbb628b1a092bd61d6d05e462d6771354223b'
+ 'b32a28cb5b97b0bb139c0ee2199b81a2aba124c2ead9b01cfd4485fd2551257f'
+ '5dee6628c48eef79812bb9e86ee772068d85e7fcebbd2b2b8d1e19d24eda9dab'
+ 'ed6cf7d8efc391b9331322e4502f7469473a8ed05599c36e2b18f167b3cb7879'
+ '0f2e9abaf872e1e18dfe0cd1da42bdc4f49d3956f97a01c39b82c0e3016c1a32'
+ 'c0d84384db273d9fd6ea2aab2a9d8ba36402daf8daf591dcba329cfa02253c87'
+ 'ef105dcc067c673e543d4d5384aa7bf6b93e9eca96fec4323ab69a91ec079f56'
+ 'f5fb1673536d56a88b3d1aaec75501e4d0acca081ac658d1059ec276f9e062c6'
+ 'd8911a513166d2db337b9449542e0ad0e91b114f92dc4b876d88d77d23829a1d'
'7374137d183957ec8834ce749163c9fa98ff8ee61bbb74b0b38e29daf93857a4')
_backports=(
@@ -144,12 +141,9 @@ prepare() {
git cherry-pick -n "${_c}"
done
- echo "Patch to detect of Parabola GNU/Linux-libre initramfs images by grub-mkconfig..."
- patch -Np1 -i "${srcdir}/0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch"
-
echo "Patch to enable GRUB_COLOR_* variables in grub-mkconfig..."
## Based on http://lists.gnu.org/archive/html/grub-devel/2012-02/msg00021.html
- patch -Np1 -i "${srcdir}/0004-add-GRUB_COLOR_variables.patch"
+ patch -Np1 -i "${srcdir}/0001-00_header-add-GRUB_COLOR_-variables.patch"
echo "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme..."
sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac"
@@ -163,18 +157,9 @@ prepare() {
echo "Pull in latest language files..."
./linguas.sh
- echo "Remove not working langs which need LC_ALL=C.UTF-8..."
- sed -e 's#en@cyrillic en@greek##g' -i "po/LINGUAS"
-
echo "Avoid problem with unifont during compile of grub..."
# http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847
- gzip -cd "${srcdir}/unifont-${_UNIFONT_VER}.bdf.gz" > "unifont.bdf"
-
- echo "Add the grub-extra sources for BIOS build..."
- install -d "grub-extras"
- cp -r "${srcdir}/grub-extras/915resolution" \
- "grub-extras/915resolution"
- export GRUB_CONTRIB="${srcdir}/grub/grub-extras/"
+ gzip -cd "${srcdir}/unifont-${_unifont_ver}.bdf.gz" > "unifont.bdf"
}
_build_grub-efi() {
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
index c3e010419..886146690 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -49,9 +49,9 @@ GRUB_COLOR_HIGHLIGHT="white/magenta"
# Uncomment to get a beep at GRUB start
#GRUB_INIT_TUNE="480 440 1"
-# Uncomment to make GRUB remember the last selection. This requires to
-# set 'GRUB_DEFAULT=saved' above.
-#GRUB_SAVEDEFAULT="true"
+# Uncomment to make GRUB remember the last selection. This requires
+# setting 'GRUB_DEFAULT=saved' above.
+#GRUB_SAVEDEFAULT=true
-# Disable advanced submenu
-GRUB_DISABLE_SUBMENU="y"
+# Uncomment to disable submenus in boot menu
+#GRUB_DISABLE_SUBMENU=y
diff --git a/libre/grub/grub.install b/libre/grub/grub.install
index c13ef99c7..c268996d1 100644
--- a/libre/grub/grub.install
+++ b/libre/grub/grub.install
@@ -6,12 +6,23 @@ post_upgrade() {
if [ ! -f /boot/grub/grub.cfg -a -f /boot/grub/grub.cfg.pacsave ]; then
mv /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg
fi
+
+ # return if old package version greater 2:2.06-0...
+ (( $(vercmp $2 '2:2.06-0') > 0 )) && return
+
+ if [[ -e /sys/firmware/efi/efivars ]]; then
+ cat <<EOM
+:: Grub does no longer support side-loading modules when secure boot is
+ enabled. Thus booting will fail, unless you have an efi executable
+ 'grubx64.efi' with bundled modules.
+EOM
+ fi
}
post_install() {
- cat << 'EOM'
-Generate your bootloader configuration with:
- grub-mkconfig -o /boot/grub/grub.cfg
+ cat <<EOM
+:: Generate your bootloader configuration with:
+ grub-mkconfig -o /boot/grub/grub.cfg
EOM
}
generated by cgit v1.2.2 (git 2.25.0) at 2024-05-08 23:56:35 +0000