packages (LINUX_2_6_27): kernel/kernel-small_fixes.patch, kernel/kernel.spe...

glen glen at pld-linux.org
Wed Mar 14 23:06:08 CET 2012


Author: glen                         Date: Wed Mar 14 22:06:08 2012 GMT
Module: packages                      Tag: LINUX_2_6_27
---- Log message:
- up to 2.6.27.61, almost builds without grsecurity and apparmor

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.1.2.15.2.11 -> 1.1.2.15.2.12) , kernel.spec (1.441.2.2036.2.66 -> 1.441.2.2036.2.67) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.11 packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.12
--- packages/kernel/kernel-small_fixes.patch:1.1.2.15.2.11	Fri Aug 27 21:57:03 2010
+++ packages/kernel/kernel-small_fixes.patch	Wed Mar 14 23:06:02 2012
@@ -401,19 +401,6 @@
 Acked-by: Serge E. Hallyn <serge at xxxxxxxxxx>
 -----------------
 
---- kernel-2.6.27.46/arch/sparc/mm/init.c~	2010-05-08 23:56:23.015019695 +0000
-+++ kernel-2.6.27.46/arch/sparc/mm/init.c	2010-05-08 23:55:50.187439000 +0000
-@@ -312,8 +312,10 @@
- pgprot_t PAGE_SHARED __read_mostly;
- EXPORT_SYMBOL(PAGE_SHARED);
- 
-+#ifdef CONFIG_PAX_PAGEEXEC
- pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
- EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
-+#endif
- 
- void __init paging_init(void)
- {
 Subject: [PATCH] Disallow 32bit project quota id.
 
 Currently on-disk structure is able to keep only 16bit project quota id,
@@ -456,3 +443,17 @@
 1.7.2.2
 
 
+gcc-6:4.6.2-6.x86_64 thinks there is duplicate padding:
+include/linux/kvm.h:240:9: error: duplicate member 'padding'
+upstream: https://github.com/torvalds/linux/commit/2f8b9ee14eb439008e0c5131116ea6baa40dba50
+--- linux-2.6.27/include/linux/kvm.h~	2008-10-10 01:13:53.000000000 +0300
++++ linux-2.6.27/include/linux/kvm.h	2012-03-14 23:08:25.445571026 +0200
+@@ -237,7 +237,7 @@
+ 	__u32 padding;
+ 	union {
+ 		void __user *dirty_bitmap; /* one bit per page */
+-		__u64 padding;
++		__u64 padding2;
+ 	};
+ };
+ 

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.441.2.2036.2.66 packages/kernel/kernel.spec:1.441.2.2036.2.67
--- packages/kernel/kernel.spec:1.441.2.2036.2.66	Sun May 22 15:07:41 2011
+++ packages/kernel/kernel.spec	Wed Mar 14 23:06:02 2012
@@ -106,8 +106,8 @@
 %endif
 
 %define		basever		2.6.27
-%define		postver		.59
-%define		rel			1
+%define		postver		.61
+%define		rel			0.1
 
 %define		_enable_debug_packages			0
 
@@ -151,7 +151,7 @@
 # Source0-md5:	b3e78977aa79d3754cb7f8143d7ddabd
 %if "%{postver}" != "%{nil}"
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v%{basever}/patch-%{version}.bz2
-# Source1-md5:	9ee74e15079815bb1520c9183fcede50
+# Source1-md5:	410c150064d02bd298704c68ef0f0581
 %endif
 
 Source3:	kernel-autoconf.h
@@ -843,7 +843,7 @@
 %patch85 -p1
 
 # LSI MPT Fusion driver update
-%patch90 -p1
+#%patch90 -p1 does not apply, can't find any patch update
 
 %patch95 -p1
 
@@ -1697,6 +1697,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2036.2.67  2012/03/14 22:06:02  glen
+- up to 2.6.27.61, almost builds without grsecurity and apparmor
+
 Revision 1.441.2.2036.2.66  2011/05/22 13:07:41  glen
 - 2.6.27.59 tarball
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.1.2.15.2.11&r2=1.1.2.15.2.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.441.2.2036.2.66&r2=1.441.2.2036.2.67&f=u



More information about the pld-cvs-commit mailing list