packages (LINUX_2_6_32): kernel/kernel.spec - does not compile with gcc 4.6

glen glen at pld-linux.org
Tue Oct 25 17:30:59 CEST 2011


Author: glen                         Date: Tue Oct 25 15:30:59 2011 GMT
Module: packages                      Tag: LINUX_2_6_32
---- Log message:
- does not compile with gcc 4.6

---- Files affected:
packages/kernel:
   kernel.spec (1.755.2.11 -> 1.755.2.12) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.755.2.11 packages/kernel/kernel.spec:1.755.2.12
--- packages/kernel/kernel.spec:1.755.2.11	Thu May 12 00:31:46 2011
+++ packages/kernel/kernel.spec	Tue Oct 25 17:30:54 2011
@@ -128,14 +128,14 @@
 %define		alt_kernel	myown
 %endif
 %else
-%if %{without rescuecd}
 %define		__alt_kernel	%{?with_pax:pax}%{!?with_grsec_full:nogrsecurity}%{!?with_apparmor:noaa}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
-%else
-%define		alt_kernel	rescuecd
 %endif
+
+%if %{with rescuecd}
+%define		alt_kernel	rescuecd
 %endif
 
 # kernel release (used in filesystem and eventually in uname -r)
@@ -340,6 +340,7 @@
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	/sbin/depmod
+BuildRequires:	gcc < 6:4.6
 BuildRequires:	gcc >= 5:3.2
 BuildRequires:	xz >= 1:4.999.7
 AutoReqProv:	no
@@ -357,8 +358,8 @@
 Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}(netfilter) = %{netfilter_snap}
 Provides:	%{name}(vermagic) = %{kernel_release}
-Obsoletes:	kernel-firmware
 Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
+Obsoletes:	kernel-firmware
 Obsoletes:	kernel-misc-acer_acpi
 Obsoletes:	kernel-misc-fuse
 Obsoletes:	kernel-misc-uvc
@@ -1584,6 +1585,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.755.2.12  2011/10/25 15:30:54  glen
+- does not compile with gcc 4.6
+
 Revision 1.755.2.11  2011/05/11 22:31:46  glen
 - 2.6.32.39 fetch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.755.2.11&r2=1.755.2.12&f=u



More information about the pld-cvs-commit mailing list