SPECS (LINUX_2_6): kernel.spec - small_fixes patch added from kern...

blues blues at pld-linux.org
Mon Jul 31 16:21:37 CEST 2006


Author: blues                        Date: Mon Jul 31 14:21:37 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- small_fixes patch added from kernel-desktop.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1572 -> 1.441.2.1573) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1572 SPECS/kernel.spec:1.441.2.1573
--- SPECS/kernel.spec:1.441.2.1572	Mon Jul 31 12:53:50 2006
+++ SPECS/kernel.spec	Mon Jul 31 16:21:32 2006
@@ -88,7 +88,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			0.1
+%define		_rel			0.2
 
 %define		_netfilter_snap		20060504
 %define		_nf_hipac_ver		0.9.1
@@ -261,6 +261,8 @@
 
 Patch1000:	linux-2.6-grsec-minimal.patch
 
+Patch2000:	kernel-small_fixes.patch
+
 # grsecurity snap for 2.6.16.14
 # based on http://www.grsecurity.net/~spender/grsecurity-2.1.9-2.6.16.14-200605060936.patch
 Patch9999:	grsecurity-2.1.9-2.6.16.14.patch
@@ -798,6 +800,9 @@
 %patch200 -p1
 %endif
 
+##Small fixes:
+%patch2000 -p1
+
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
 
@@ -809,6 +814,7 @@
 
 %build
 TuneUpConfigForIX86 () {
+	set -x
 %ifarch %{ix86}
 	pae=
 	[ "$2" = "yes" ] && pae=yes
@@ -864,6 +870,7 @@
 
 BuildConfig() {
 	%{?debug:set -x}
+	set -x
 	# is this a special kernel we want to build?
 	smp=
 	[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
@@ -892,7 +899,7 @@
 %endif
 
 	# netfilter
-	cat %{SOURCE40} >> arch/%{_target_base_arch}/defconfig
+	#cat %{SOURCE40} >> arch/%{_target_base_arch}/defconfig
 	# squashfs
 	cat %{SOURCE41} >> arch/%{_target_base_arch}/defconfig
 	# suspend2
@@ -906,7 +913,7 @@
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
 
 %if %{with grsecurity}
-	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
+	#cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 %endif
 
 %if %{with xen0}
@@ -948,6 +955,7 @@
 
 BuildKernel() {
 	%{?debug:set -x}
+	set -x
 	echo "Building kernel $1 ..."
 	%{__make} $CrossOpts mrproper \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
@@ -1620,6 +1628,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1573  2006/07/31 14:21:32  blues
+- small_fixes patch added from kernel-desktop.
+
 Revision 1.441.2.1572  2006/07/31 10:53:50  blues
 - vs updated to current-one. All patching is ok (netfilter left).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1572&r2=1.441.2.1573&f=u



More information about the pld-cvs-commit mailing list