[packages/grub2] - ignore vmlinuz/vmlinuz.old/etc symlinks

baggins baggins at pld-linux.org
Mon Apr 15 00:58:54 CEST 2013


commit b78e362f0654dd77b5a28085516d32c80b955d86
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 15 00:56:03 2013 +0200

    - ignore vmlinuz/vmlinuz.old/etc symlinks
    
    We can safely skip vmlinuz, vmlinuz.old and all other symlinks when
    creating boot menu to avoid random, unknown sets.
    grub2 doesn't need those symlinks, it always gets all kernels done.

 grub2.spec                   |  6 ++++--
 ignore-kernel-symlinks.patch | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index c6ad6cb..6ffbed4 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -52,7 +52,7 @@ Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
 Version:	2.00
-Release:	0.6
+Release:	0.7
 License:	GPL v2
 Group:		Base
 Source0:	http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
@@ -81,6 +81,7 @@ Patch16:	dhcp-client-id-and-uuid-options-added.patch
 Patch17:	fix-http-crash.patch
 Patch18:	Issue-separate-DNS-queries-for-ipv4-and-ipv6.patch
 Patch19:	search-for-specific-config-file-for-netboot.patch
+Patch20:	ignore-kernel-symlinks.patch
 URL:		http://www.gnu.org/software/grub/
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.11.1-1
@@ -133,7 +134,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # part of grub code is not relocable (these are not Linux libs)
 # stack protector also breaks non-Linux binaries
-%define 	filterout_c	-fPIC
+%define		filterout_c	-fPIC
 %undefine	_ssp_cflags
 
 %description
@@ -304,6 +305,7 @@ Motyw starfield dla GRUB-a.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 
 %if "%{cc_version}" < "3.4"
 grep -rl -- -Wno-missing-field-initializers . | xargs %{__sed} -i -e 's,-Wno-missing-field-initializers,,'
diff --git a/ignore-kernel-symlinks.patch b/ignore-kernel-symlinks.patch
new file mode 100644
index 0000000..f854139
--- /dev/null
+++ b/ignore-kernel-symlinks.patch
@@ -0,0 +1,12 @@
+--- grub-2.00/util/grub-mkconfig_lib.in~	2013-04-15 00:03:09.102253190 +0200
++++ grub-2.00/util/grub-mkconfig_lib.in	2013-04-15 00:54:39.189605003 +0200
+@@ -174,6 +174,9 @@
+ 
+ grub_file_is_not_garbage ()
+ {
++  if test -L "$1" ; then
++    return 1
++  fi
+   if test -f "$1" ; then
+     case "$1" in
+       *.dpkg-*) return 1 ;; # debian dpkg
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grub2.git/commitdiff/b78e362f0654dd77b5a28085516d32c80b955d86



More information about the pld-cvs-commit mailing list