commit: c6647c7fa1140556799804693b013900bb57a5e1 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Fri Feb 3 15:19:47 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 21:20:27 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6647c7f
sys-boot/grub: remove unused patches/file Closes: https://github.com/gentoo/gentoo/pull/3791 sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch | 24 ----------- sys-boot/grub/files/grub-2.02_beta2-libzfs.patch | 19 --------- sys-boot/grub/files/grub.default-2 | 46 ---------------------- 3 files changed, 89 deletions(-) diff --git a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch b/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch deleted file mode 100644 index 286830c..00000000 --- a/sys-boot/grub/files/grub-2.00-freetype-2.5.1.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit fd0df6d098b1e6a4f60275c48a3ec88d15ba1fbb -Author: Colin Watson <[email protected]> -Date: Fri Nov 29 12:19:36 2013 +0000 - - Fix build with FreeType 2.5.1 - - * util/grub-gen-asciih.c: Include FT_SYNTHESIS_H rather than - <freetype/ftsynth.h>, fixing build with FreeType 2.5.1. - * util/grub-gen-widthspec.c: Likewise. - * util/grub-mkfont.c: Likewise. - -diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c -index 0d8eb78..242dd01 100644 ---- a/util/grub-mkfont.c -+++ b/util/grub-mkfont.c -@@ -43,7 +43,7 @@ - #include FT_FREETYPE_H - #include FT_TRUETYPE_TAGS_H - #include FT_TRUETYPE_TABLES_H --#include <freetype/ftsynth.h> -+#include FT_SYNTHESIS_H - - #undef __FTERRORS_H__ - #define FT_ERROR_START_LIST const char *ft_errmsgs[] = { diff --git a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch b/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch deleted file mode 100644 index d76a903..00000000 --- a/sys-boot/grub/files/grub-2.02_beta2-libzfs.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6ba983559dcffa0fa69c7fc861b5a16b4877a92c -Author: Mike Gilbert <[email protected]> -Date: Sat Jan 18 19:41:15 2014 +0100 - - * Makefile.util.def: Link grub-ofpathname with zfs libs. - -diff --git a/Makefile.util.def b/Makefile.util.def -index 83df212..a286a89 100644 ---- a/Makefile.util.def -+++ b/Makefile.util.def -@@ -384,7 +384,7 @@ program = { - ldadd = libgrubgcry.a; - ldadd = libgrubkern.a; - ldadd = grub-core/gnulib/libgnu.a; -- ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBGEOM)'; -+ ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM)'; - }; - - program = { diff --git a/sys-boot/grub/files/grub.default-2 b/sys-boot/grub/files/grub.default-2 deleted file mode 100644 index 87594d2..00000000 --- a/sys-boot/grub/files/grub.default-2 +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ -# -# To populate all changes in this file you need to regenerate your -# grub configuration file afterwards: -# 'grub2-mkconfig -o /boot/grub/grub.cfg' -# -# See the grub info page for documentation on possible variables and -# their associated values. - -GRUB_DISTRIBUTOR="Gentoo" - -GRUB_DEFAULT=0 -GRUB_HIDDEN_TIMEOUT=0 -GRUB_HIDDEN_TIMEOUT_QUIET=true -GRUB_TIMEOUT=10 - -# Append parameters to the linux kernel command line -# GRUB_CMDLINE_LINUX="" - -# Append parameters to the linux kernel command line for non-recovery entries -#GRUB_CMDLINE_LINUX_DEFAULT="" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal. -# Note that you can use only modes which your graphic card supports via VBE. -# You can see them in real GRUB with the command `vbeinfo'. -#GRUB_GFXMODE=640x480 - -# Path to theme spec txt file. -# The starfield is by default provided with use truetype. -# NOTE: when enabling custom theme, ensure you have required font/etc. -#GRUB_THEME="/boot/grub/themes/starfield/theme.txt" - -# Background image used on graphical terminal. -# Can be in various bitmap formats. -#GRUB_BACKGROUND="/boot/grub/mybackground.png" - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to kernel -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY=true
