SPECS (LINUX_2_6_17): kernel.spec - 2.6.17.14-3, removed linux-2.6...

[mguevara]

Author: mguevara                     Date: Mon Oct 23 21:31:53 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_17
---- Log message:
- 2.6.17.14-3, removed linux-2.6.15_ide-gtm-stm.diff patch, added ide_acpi
  bcond (default off)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1613.2.6 -> 1.441.2.1613.2.7) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1613.2.6 SPECS/kernel.spec:1.441.2.1613.2.7
--- SPECS/kernel.spec:1.441.2.1613.2.6	Wed Oct 18 21:42:36 2006
+++ SPECS/kernel.spec	Mon Oct 23 23:31:48 2006
@@ -28,6 +28,8 @@
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
 
+%bcond_with	ide_acpi	# support for ide-acpi from SuSE (instead of previous hack)
+
 %{?debug:%define with_verbose 1}
 
 %if %{without grsecurity}
@@ -103,7 +105,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			1
+%define		_rel			3
 
 %define		_old_netfilter_snap	20060504
 %define		_netfilter_snap		20060829
@@ -273,9 +275,9 @@
 Patch70:	linux-2.6-suspend2-avoid-redef.patch
 Patch71:	linux-2.6-suspend2-page.patch
 
-# ide s3 wakeup for hp nx8220 notebooks
-# from http://hehe.pl/drg/trash/nx8220-s3/
-Patch75:	linux-2.6.15_ide-gtm-stm.diff
+# ide-acpi instead of nx8220 s3 suspend/resume hack
+# http://svn.uludag.org.tr/pardus/devel/kernel/kernel/files/suse/ide-acpi-support.patch
+Patch75:	linux-2.6.17-ide-acpi-support.patch
 
 # cx88-blackbird based tv tuner card audio fix
 Patch80:        linux-2.6.17-cx88-tvaudio.patch
@@ -392,6 +394,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description -l de
 Das Kernel-Paket enthält den Linux-Kernel (vmlinuz), den Kern des
@@ -409,6 +412,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description -l fr
 Le package kernel contient le kernel linux (vmlinuz), la partie
@@ -426,6 +430,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description -l pl
 Pakiet zawiera jądro Linuksa niezbędne do prawidłowego działania
@@ -442,6 +447,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %package vmlinux
 Summary:	vmlinux - uncompressed kernel image
@@ -591,6 +597,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description smp -l de
 Dieses Paket enthält eine SMP (Multiprozessor)-Version von
@@ -608,6 +615,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description smp -l fr
 Ce package inclu une version SMP du noyau de Linux version {version}.
@@ -624,6 +632,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %description smp -l pl
 Pakiet zawiera jądro SMP Linuksa w wersji %{version}. Jest ono
@@ -640,6 +649,7 @@
 %{?with_fbsplash:Fbsplash - enabled }
 %{?with_vesafb_tng:VesaFB New generation - enabled}
 %{?with_nfsroot:Root on NFS - enabled}
+%{?with_ide_acpi:IDE ACPI - enabled}
 
 %package smp-vmlinux
 Summary:	vmlinux - uncompressed SMP kernel image
@@ -915,8 +925,10 @@
 
 %patch60 -p1
 
-# ide s3 wakeup on hp nx8220
-%patch75 -p1 
+%if %{with ide_acpi}
+# ide-acpi instead of nx8220 s3 suspend/resume hack
+%patch75 -p1
+%endif
 
 # cx88-tvaudio
 %patch80 -p1
@@ -1101,6 +1113,10 @@
 	cat %{SOURCE50} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with ide_acpi}
+	echo "CONFIG_BLK_DEV_IDEACPI=y" >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with xen0} || %{with xenU}
 	sed -i "s:CONFIG_X86_PC=y:# CONFIG_X86_PC is not set:" arch/%{_target_base_arch}/defconfig
 	sed -i "s:CONFIG_RIO=[ym]:# CONFIG_RIO is not set:" arch/%{_target_base_arch}/defconfig
@@ -1850,6 +1866,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1613.2.7  2006/10/23 21:31:48  mguevara
+- 2.6.17.14-3, removed linux-2.6.15_ide-gtm-stm.diff patch, added ide_acpi
+  bcond (default off)
+
 Revision 1.441.2.1613.2.6  2006/10/18 19:42:36  mguevara
 - 2.6.17.14-1 update, pax with grsec builds, solves CVE-2006-4623 ?
 
================================================================

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