commit 8f121fd69a4da3d83ef052f17ef3c889ab1ad2f5 Author: Matt Housh <jaeger@crux.nu> Date: Thu Jan 1 16:32:10 2015 -0600 grub2: added font path to 00_header, fixes FS#1068 diff --git a/grub2/.md5sum b/grub2/.md5sum index cc5992a..83bc889 100644 --- a/grub2/.md5sum +++ b/grub2/.md5sum @@ -1,4 +1,5 @@ a1043102fbc7bcedbf53e7ee3d17ab91 grub-2.00.tar.xz 8459e7425bf9eea9d482e53c5b5c91c9 grub.cfg.sample +3a03d3f53911ac1889e6e68c8429f700 grub2-00_header.diff 0d8c1aa18cbb52ac57c8414abb185e19 grub2-10_linux.diff 8c28087c5fcb3188f1244b390efffdbe unifont-5.1.20080820.pcf.gz diff --git a/grub2/Pkgfile b/grub2/Pkgfile index 1b49f87..f32e71e 100644 --- a/grub2/Pkgfile +++ b/grub2/Pkgfile @@ -5,10 +5,10 @@ name=grub2 version=2.00 -release=5 +release=6 source=(ftp://ftp.gnu.org/gnu/grub/grub-$version.tar.xz \ http://unifoundry.com/unifont-5.1.20080820.pcf.gz \ - $name-10_linux.diff grub.cfg.sample) + $name-00_header.diff $name-10_linux.diff grub.cfg.sample) build() { export CFLAGS="${CFLAGS} -Wno-error" @@ -20,6 +20,7 @@ build() { # fix for ftsynth.h path sed -i -e 's|freetype/ftsynth.h|freetype2/ftsynth.h|' util/grub-mkfont.c + patch -i $SRC/$name-00_header.diff util/grub.d/00_header.in patch -i $SRC/$name-10_linux.diff util/grub.d/10_linux.in ./configure --prefix=/usr \ diff --git a/grub2/grub2-00_header.diff b/grub2/grub2-00_header.diff new file mode 100644 index 0000000..3b8ebb8 --- /dev/null +++ b/grub2/grub2-00_header.diff @@ -0,0 +1,11 @@ +--- 00_header.in.orig 2015-01-01 16:27:17.433852566 -0600 ++++ 00_header.in 2015-01-01 16:27:28.603852605 -0600 +@@ -142,7 +142,7 @@ + if loadfont `make_system_path_relative_to_its_root "${GRUB_FONT}"` ; then + EOF + else +- for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do ++ for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub /usr/lib/grub/fonts ; do + for basename in unicode unifont ascii; do + path="${dir}/${basename}.pf2" + if is_path_readable_by_grub "${path}" > /dev/null ; then