diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | archlinux_grub_mkconfig_fixes.patch | 14 |
3 files changed, 23 insertions, 17 deletions
@@ -1,6 +1,6 @@ pkgbase = grub pkgdesc = GNU GRand Unified Bootloader (2) - pkgver = 2.00.963.g93c1207 + pkgver = 2.00.1282.g5ae5c54 pkgrel = 1 epoch = 1 url = https://www.gnu.org/software/grub/ @@ -13,7 +13,6 @@ pkgbase = grub makedepends = rsync makedepends = xz makedepends = freetype2 - makedepends = bdf-unifont makedepends = ttf-dejavu makedepends = python2 makedepends = autogen @@ -47,7 +46,8 @@ pkgbase = grub backup = boot/grub/grub.cfg backup = etc/default/grub backup = etc/grub.d/40_custom - source = grub-2.00::git+git://git.sv.gnu.org/grub.git#commit=93c120754a537a2f060b8e20eab620e714309b82 + source = grub-2.00::git+git://git.sv.gnu.org/grub.git#commit=5ae5c54c7e5cb048cdd78a53181cee0da698a953 + source = http://unifoundry.com/unifont-5.1.20080820.bdf.gz source = archlinux_grub_mkconfig_fixes.patch source = 60_memtest86+ source = grub.default @@ -56,7 +56,8 @@ pkgbase = grub source = grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision= source = grub-extras-ntldr-img::bzr+bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img/#revision= md5sums = SKIP - md5sums = ee1262cc4e20031df019779b1a4b1e39 + md5sums = 6b8263ceccef33bd633aa019d74b7943 + md5sums = b9cbff4a67e463722a113c66d57c4042 md5sums = be55eabc102f2c60b38ed35c203686d6 md5sums = a03ffd56324520393bf574cefccb893d md5sums = c8b9511586d57d6f2524ae7898397a46 @@ -1,9 +1,9 @@ # Maintainer : Tobias Powalowski <tpowa@archlinux.org> # Maintainer : Ronald van Haren <ronald.archlinux.org> -# Contributor: Keshav Padram Amburay (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> _pkgver="2.00" -_GRUB_GIT_COMMIT="93c120754a537a2f060b8e20eab620e714309b82" +_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953" ## grub-extras gpxe is not needed @@ -12,7 +12,7 @@ _GRUB_GIT_COMMIT="93c120754a537a2f060b8e20eab620e714309b82" pkgname="grub" pkgdesc="GNU GRand Unified Bootloader (2)" -pkgver=2.00.963.g93c1207 +pkgver=2.00.1282.g5ae5c54 pkgrel=1 epoch="1" url="https://www.gnu.org/software/grub/" @@ -26,8 +26,8 @@ conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy') replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") -makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'bdf-unifont' - 'ttf-dejavu' 'python2' 'autogen' 'texinfo' 'help2man' +makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu' + 'python2' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' @@ -40,13 +40,15 @@ optdepends=('freetype2: For grub-mkfont usage' # source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}" + 'http://unifoundry.com/unifont-5.1.20080820.bdf.gz' 'archlinux_grub_mkconfig_fixes.patch' '60_memtest86+' 'grub.default' 'grub.cfg') md5sums=('SKIP' - 'ee1262cc4e20031df019779b1a4b1e39' + '6b8263ceccef33bd633aa019d74b7943' + 'b9cbff4a67e463722a113c66d57c4042' 'be55eabc102f2c60b38ed35c203686d6' 'a03ffd56324520393bf574cefccb893d' 'c8b9511586d57d6f2524ae7898397a46' @@ -89,6 +91,9 @@ prepare() { msg "Remove non working langs which need LC_ALL=C.UTF-8" sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS" + msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847" + cp "${srcdir}/unifont-5.1.20080820.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf" + } _build_grub-common_and_bios() { diff --git a/archlinux_grub_mkconfig_fixes.patch b/archlinux_grub_mkconfig_fixes.patch index acbb9a7a813b..c87a42817d52 100644 --- a/archlinux_grub_mkconfig_fixes.patch +++ b/archlinux_grub_mkconfig_fixes.patch @@ -1,5 +1,5 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index 8decc1d..170047f 100644 +index db58ab9..e66e139 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -212,6 +212,8 @@ export GRUB_DEFAULT \ @@ -12,7 +12,7 @@ index 8decc1d..170047f 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 2c4bb0a..c7120d2 100644 +index 9838720..dbb5dd2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -125,6 +125,14 @@ cat <<EOF @@ -31,7 +31,7 @@ index 2c4bb0a..c7120d2 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 0724e16..a8119bd 100644 +index e27d6f7..0a255f5 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -87,6 +87,8 @@ linux_entry () @@ -115,11 +115,11 @@ index 0724e16..a8119bd 100644 + done + fi + - if [ "x$is_first_entry" = xtrue ]; then + if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" +@@ -240,8 +275,11 @@ while [ "x$list" != "x" ] ; do + is_top_level=false fi + if ! test -e "/etc/arch-release" ; then @@ -135,7 +135,7 @@ index 0724e16..a8119bd 100644 # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. +if ! test -e "/etc/arch-release" ; then - if [ x"$is_first_entry" != xtrue ]; then + if [ x"$is_top_level" != xtrue ]; then echo '}' fi +fi |