SPECS (LINUX_2_6): kernel.spec - rel 0.4 - imq stuff added - bcond...

[mguevara]

Author: mguevara                     Date: Fri Dec 22 01:35:25 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rel 0.4 - imq stuff added - bcond imq

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1694 -> 1.441.2.1695) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1694 SPECS/kernel.spec:1.441.2.1695
--- SPECS/kernel.spec:1.441.2.1694	Tue Dec 19 21:22:38 2006
+++ SPECS/kernel.spec	Fri Dec 22 02:35:19 2006
@@ -1,24 +1,12 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - update xen patch for 2.6.18 
-# - all netfilter patches needs update (API changed again)
-# - VESAFB-TNG
-# - IMQ
-# - wanpipe
-# - reiser4
-# - Linux ABI
-# - grsecurity - does not builds --without grsecuriy
-#
 # TODO 2.6.19:
-# - all above todos ???
-# - p1 linux-2.6-sata-promise-pata-ports.patch - test second alternative 
-# - p4 fbsplash-0.9.2-r5-2.6.18-rc4.patch - untested (bcond)
+#
+# - p4 fbsplash - needs update (bcond off)
 # - p1000 linux-2.6-grsec-minimal.patch - needs update
 # - p200 linux-2.6-ppc-ICE-hacks.patch - untested - ppc needed
-# - separate PaX and grsecurity support 
+# - separate PaX and grsecurity support - future
 # - update configs for up/smp i386 (almost done) 
-# - check status of kernel-netfilter.config 
 # - check status of kernel-suspend2.config 
 # - update configs for up/smp x86_64
 # - update configs for up/smp sparc
@@ -26,12 +14,15 @@
 # - update configs for up/smp alpha
 # - update configs for up/smp ppc
 # - update configs for up/smp ia64
-# - p5 vesafb-tng - applies but untested (bcond off)
-# - p51 reiser4 - applies but untested (bcond off)
-# - p60 linux-2.6-sk98lin-8.36.1.3.patch - needs update to 2.6.19
-
+# - p5 vesafb-tng - needs update (bcond off)
+# - p51 reiser4 - needs update (bcond off)
+# - p50 imq - test (bcond off)
 #
-# WARNING: Kernels from 2.6.16.X series not work under OldWorldMac
+# FUTURE:
+# - separate PaX and grsecurity support - future
+# - update xen patch for 2.6.19 
+# - wanpipe
+# - Linux ABI
 #
 # Conditional build:
 %bcond_without	smp		# don't build SMP kernel
@@ -56,7 +47,8 @@
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 
-%bcond_without	ide_acpi	# support for ide-acpi from SuSE (instead of previous hack)
+%bcond_without	ide_acpi	# support for ide-acpi from SuSE
+%bcond_with	imq		# imq support
 
 %{?debug:%define with_verbose 1}
 
@@ -128,7 +120,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			0.3
+%define		_rel			0.4
 
 %define		_old_netfilter_snap	20060504
 %define		_netfilter_snap		20061213
@@ -206,6 +198,7 @@
 
 Source49:	kernel-pax.config
 Source50:	kernel-no-pax.config
+Source55:	kernel-imq.config
 
 ###
 #	Patches
@@ -289,8 +282,11 @@
 #	End netfilter
 ###
 
-# from http://www.linuximq.net/patchs/linux-2.6.16-imq2.diff
-#Patch50:	linux-2.6.16-imq2.diff
+# based on 2.6.17 patch from http://www.linuximq.net/patchs/linux-2.6.17-imq1.diff, 
+# some stuff moved from net/sched/sch_generic.c to net/core/dev.c for 2.6.19 
+# compatibility. not tested. 
+
+Patch50:	linux-2.6.19-imq1.diff
 
 # from http://laurent.riffard.free.fr/reiser4/reiser4-for-2.6.19.patch.gz
 # based on http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.18/reiser4-for-2.6.18-3.patch.gz
@@ -980,7 +976,9 @@
 ##
 # end of netfilter
 
-#%patch50 -p1
+%if %{with imq}
+%patch50 -p1
+%endif
 
 # reiser4
 %if %{with reiser4}
@@ -1183,6 +1181,10 @@
 	cat %{SOURCE50} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with imq}
+	cat %{SOURCE55} >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with ide_acpi}
 	echo "CONFIG_BLK_DEV_IDEACPI=y" >> arch/%{_target_base_arch}/defconfig
 %endif
@@ -1905,6 +1907,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1695  2006/12/22 01:35:19  mguevara
+- rel 0.4 - imq stuff added - bcond imq
+
 Revision 1.441.2.1694  2006/12/19 20:22:38  mguevara
 - rel 0.3
 
================================================================

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