rpms/kernel/devel config-x86-generic, 1.68.6.23, 1.68.6.24 config-x86_64-generic, 1.68.2.20, 1.68.2.21 kernel.spec, 1.1294.2.92, 1.1294.2.93

[myoung]

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10688

Modified Files:
      Tag: private-myoung-dom0-branch
	config-x86-generic config-x86_64-generic kernel.spec 
Log Message:
try turning STACKPROTECTOR back on for pvops and add xen includes to -devel
package



Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.23
retrieving revision 1.68.6.24
diff -u -p -r1.68.6.23 -r1.68.6.24
--- config-x86-generic	15 Feb 2010 19:39:12 -0000	1.68.6.23
+++ config-x86-generic	28 Mar 2010 15:50:11 -0000	1.68.6.24
@@ -107,7 +107,7 @@ CONFIG_PCMCIA_FDOMAIN=m
 CONFIG_SCSI_FUTURE_DOMAIN=m
 CONFIG_SCSI_ADVANSYS=m
 
-CONFIG_CC_STACKPROTECTOR=n
+CONFIG_CC_STACKPROTECTOR=y
 
 CONFIG_SECCOMP=y
 


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.20
retrieving revision 1.68.2.21
diff -u -p -r1.68.2.20 -r1.68.2.21
--- config-x86_64-generic	15 Feb 2010 19:39:12 -0000	1.68.2.20
+++ config-x86_64-generic	28 Mar 2010 15:50:11 -0000	1.68.2.21
@@ -239,7 +239,7 @@ CONFIG_MEMORY_HOTREMOVE=y
 # CONFIG_BLK_DEV_CS5530 is not set
 # CONFIG_BLK_DEV_CS5535 is not set
 
-CONFIG_CC_STACKPROTECTOR=n
+CONFIG_CC_STACKPROTECTOR=y
 
 CONFIG_SGI_IOC4=m
 CONFIG_SGI_XP=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.92
retrieving revision 1.1294.2.93
diff -u -p -r1.1294.2.92 -r1.1294.2.93
--- kernel.spec	23 Mar 2010 19:54:20 -0000	1.1294.2.92
+++ kernel.spec	28 Mar 2010 15:50:12 -0000	1.1294.2.93
@@ -1656,7 +1656,7 @@ hwcap 0 nosegneg"
     fi
     mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     cd include
-    cp -a acpi config crypto keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+    cp -a acpi config crypto keys linux math-emu media mtd net pcmcia rdma rxrpc scsi sound trace video drm asm-generic xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
     asmdir=$(readlink asm)
     cp -a $asmdir $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/
     pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -2100,6 +2100,10 @@ fi
 # and build.
 
 %changelog
+* Sun Mar 28 2010 Michael Young <m.a.young at durham.ac.uk>
+- try turning STACKPROTECTOR back on
+- add xen includes to -devel package
+
 * Tue Mar 23 2010 Michael Young <m.a.young at durham.ac.uk>
 - update pvops which should hopefully fix ix86
 - Add in a conflicts xen < 3.4.3 rule