diff options
| -rw-r--r-- | libre/grub/PKGBUILD | 5 | ||||
| -rw-r--r-- | libre/grub/parabola_grub_mkconfig_fixes.patch | 28 |
2 files changed, 21 insertions, 12 deletions
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 101aca8e9..7fe7bee54 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -2,6 +2,7 @@ # Maintainer : Ronald van Haren <ronald.archlinux.org> # Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@parabola.nu> +# Contributor (Parabola): Márcio Silva <coadde@parabola.nu> _pkgver="2.00" _GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953" @@ -14,7 +15,7 @@ _GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" pkgver=2.00.1282.g5ae5c54 -pkgrel=1.1 +pkgrel=1.2 epoch="1" url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') @@ -49,7 +50,7 @@ source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_C md5sums=('SKIP' '6b8263ceccef33bd633aa019d74b7943' 'f72e7b96f7b8aaf1730728724b0e32b9' - 'be55eabc102f2c60b38ed35c203686d6' + 'aec37e36ba7806217be33d12a7eed062' 'a9ef0067f6824944fa1ae22a5162d7d4' 'SKIP' 'SKIP' diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 0b3acf485..6e3a524f0 100644 --- a/libre/grub/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub/parabola_grub_mkconfig_fixes.patch @@ -31,10 +31,10 @@ index d2e7252..8259f45 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..2d60949 100644 +index e27d6f7..a946e71 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in -@@ -31,7 +31,17 @@ CLASS="--class gnu-linux --class gnu --class os" +@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else @@ -43,6 +43,14 @@ index e27d6f7..2d60949 100644 + OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" + elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then + OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then ++ OS="${GRUB_DISTRIBUTOR} Linux and GNU" ++ elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" ++ elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then ++ OS="${GRUB_DISTRIBUTOR} GNU+Linux" + elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then + OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" + elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then @@ -53,7 +61,7 @@ index e27d6f7..2d60949 100644 CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" fi -@@ -87,6 +97,8 @@ linux_entry () +@@ -87,6 +105,8 @@ linux_entry () case $type in recovery) title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; @@ -62,7 +70,7 @@ index e27d6f7..2d60949 100644 *) title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; esac -@@ -100,7 +112,7 @@ linux_entry () +@@ -100,7 +120,7 @@ linux_entry () else echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" fi @@ -71,7 +79,7 @@ index e27d6f7..2d60949 100644 save_default_entry | grub_add_tab fi -@@ -132,7 +144,8 @@ linux_entry () +@@ -132,7 +152,8 @@ linux_entry () fi printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" fi @@ -81,7 +89,7 @@ index e27d6f7..2d60949 100644 sed "s/^/$submenu_indentation/" << EOF echo '$(echo "$message" | grub_quote)' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -190,7 +203,22 @@ while [ "x$list" != "x" ] ; do +@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" @@ -104,7 +112,7 @@ index e27d6f7..2d60949 100644 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 +226,8 @@ while [ "x$list" != "x" ] ; do +@@ -198,7 +234,8 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${version}" \ "initramfs-genkernel-${alt_version}" \ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ @@ -114,7 +122,7 @@ index e27d6f7..2d60949 100644 if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -226,6 +255,22 @@ while [ "x$list" != "x" ] ; do +@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi @@ -137,7 +145,7 @@ index e27d6f7..2d60949 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 +285,11 @@ while [ "x$list" != "x" ] ; do +@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do is_top_level=false fi @@ -149,7 +157,7 @@ index e27d6f7..2d60949 100644 if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ "single ${GRUB_CMDLINE_LINUX}" -@@ -252,8 +300,10 @@ done +@@ -252,8 +308,10 @@ done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. |