diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/grub/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/grub/parabola_grub_mkconfig_fixes.patch | 34 |
2 files changed, 20 insertions, 16 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 57620a868..7b90f279d 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -49,7 +49,7 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_C md5sums=('SKIP' '6b8263ceccef33bd633aa019d74b7943' - '955301d5b43f525334fe6051281f5c6c' + '67a3edf42dfa463a56cccb5d91b0e993' 'be55eabc102f2c60b38ed35c203686d6' '52d374e0194e3f2e39ff7c92ecd58a6c' 'b166b025c1d674ccac83e1ad94deed05' diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 842fbdf2e..7cf1763a2 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -1,8 +1,8 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index db58ab9..e66e139 100644 +index 016ee82..2cdbdd8 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ +@@ -214,6 +214,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,7 +12,7 @@ index db58ab9..e66e139 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 9838720..dbb5dd2 100644 +index d2e7252..8259f45 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -125,6 +125,14 @@ cat <<EOF @@ -31,10 +31,10 @@ index 9838720..dbb5dd2 100644 gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index e27d6f7..0a255f5 100644 +index e27d6f7..2d60949 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in -@@ -31,7 +31,13 @@ CLASS="--class gnu-linux --class gnu --class os" +@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else @@ -43,13 +43,17 @@ index e27d6f7..0a255f5 100644 + OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" + elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then + OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" + else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}" + CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi -@@ -87,6 +93,8 @@ linux_entry () +@@ -87,6 +97,8 @@ linux_entry () case $type in recovery) title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; @@ -58,7 +62,7 @@ index e27d6f7..0a255f5 100644 *) title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; esac -@@ -100,7 +108,7 @@ linux_entry () +@@ -100,7 +112,7 @@ linux_entry () else echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -67,7 +71,7 @@ index e27d6f7..0a255f5 100644 save_default_entry | grub_add_tab fi -@@ -132,7 +140,8 @@ linux_entry () +@@ -132,7 +144,8 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi @@ -77,7 +81,7 @@ index e27d6f7..0a255f5 100644 sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do +@@ -190,7 +203,22 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" @@ -93,14 +97,14 @@ index e27d6f7..0a255f5 100644 + fi + fi + fi -+ ++ initrd= + initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ -@@ -198,7 +222,8 @@ while [ "x$list" != "x" ] ; do +@@ -198,7 +226,8 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${version}" \ "initramfs-genkernel-${alt_version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ @@ -110,7 +114,7 @@ index e27d6f7..0a255f5 100644 if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -226,6 +251,22 @@ while [ "x$list" != "x" ] ; do +@@ -226,6 +255,22 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi @@ -133,7 +137,7 @@ index e27d6f7..0a255f5 100644 if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -240,8 +281,11 @@ while [ "x$list" != "x" ] ; do +@@ -240,8 +285,11 @@ while [ "x$list" != "x" ] ; do is_top_level=false fi @@ -145,7 +149,7 @@ index e27d6f7..0a255f5 100644 if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ "single ${GRUB_CMDLINE_LINUX}" -@@ -252,8 +296,10 @@ done +@@ -252,8 +300,10 @@ done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. |