X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel.spec;h=04b9a72f09a395b1b97c813287f89e4c645ff075;hb=1b847adf2234f6952d6b892c8ba8df1311757b6d;hp=7fb08165b9b8db4d55cc801f5093c8e13b771494;hpb=e340824c52ecae9e5ec68ace7b3ad40d2b3190d4;p=linux-2.6.git

diff --git a/kernel.spec b/kernel.spec
index 7fb08165b..04b9a72f0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1284,7 +1284,7 @@ ApplyPatch linux-2.6.29-sparc-IOC_TYPECHECK.patch
 # Exec shield
 #
 ###-vs- 
-ApplyPatch linux-2.6-execshield.patch -F3
+#ApplyPatch linux-2.6-execshield.patch -F3
 
 #
 # bugfixes to drivers and filesystems
@@ -1327,7 +1327,7 @@ ApplyPatch linux-2.6-acpi-video-dos.patch
 ApplyPatch linux-2.6-debug-sizeof-structs.patch
 ApplyPatch linux-2.6-debug-nmi-timeout.patch
 ApplyPatch linux-2.6-debug-taint-vm.patch
-ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
+#ApplyPatch linux-2.6-debug-vm-would-have-oomkilled.patch
 ApplyPatch linux-2.6-debug-always-inline-kzalloc.patch
 
 #
@@ -1514,7 +1514,7 @@ do
   mv $i .config
   Arch=`head -1 .config | cut -b 3-`
 ###-vs- ignore the warnings, due to IPV6 being set to 'm'
-  make ARCH=$Arch %{oldconfig_target} > /dev/null
+  make ARCH=$Arch %{oldconfig_target} || :
   echo "# $Arch" > configs/$i
   cat .config >> configs/$i
 done