SPECS (LINUX_2_6): kernel.spec - removed outdated sata-promise-pat...

baggins baggins at pld-linux.org
Tue Aug 7 22:06:36 CEST 2007


Author: baggins                      Date: Tue Aug  7 20:06:36 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- removed outdated sata-promise-pata-ports 
- updated sk98lin, toshiba_acpi
- enabled squashfs lzma
- updated i386 config

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1737 -> 1.441.2.1738) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1737 SPECS/kernel.spec:1.441.2.1738
--- SPECS/kernel.spec:1.441.2.1737	Tue Aug  7 20:05:06 2007
+++ SPECS/kernel.spec	Tue Aug  7 22:06:31 2007
@@ -5,11 +5,7 @@
 # TODO:
 # - update all config files
 # - update grsec_full & pax patches
-# - update or drop patch1 linux-2.6-sata-promise-pata-ports.patch (probably drop)
 # - update or drop patch17 kernel-pom-ng-rsh.patch
-# - update or drop patch54 linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
-# - update or drop patch60 linux-2.6-sk98lin_8.41.2.3.patch
-# - update or drop patch65 sqlzma2k-3.2-r2.patch (there is an external spec for the module btw)
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
 #
 # FUTURE:
@@ -21,7 +17,6 @@
 # - pom-ng talk-conntrack-nat -> nf_conntrack ?
 # - nf-hipac ?
 # - pax hooks for selinux (experimental)
-# - add lzma support for squashfs
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-source package
@@ -211,11 +206,6 @@
 #	Patches
 ###
 
-# PATA ports on SATA Promise controller; patch based on:
-# http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch
-## TODO: patch1 -- update or drop -- not updated for a long time
-Patch1:		linux-2.6-sata-promise-pata-ports.patch
-
 # tahoe9XX http://tahoe.pl/drivers/tahoe9xx-2.6.11.5.patch
 Patch2:		tahoe9xx-2.6.11.5.patch
 
@@ -275,9 +265,8 @@
 # esfq from http://fatooh.org/esfq-2.6/current/esfq-kernel.patch
 Patch53:	esfq-kernel.patch
 
-# from http://memebeam.org/free-software/toshiba_acpi/
-## TODO: patch54 -- update or drop 
-Patch54:	linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
+# http://memebeam.org/free-software/toshiba_acpi/toshiba_acpi-dev_toshiba_test5-linux_2.6.21.patch
+Patch54:	linux-2.6-toshiba_acpi.patch
 # by Baggins request:
 # derived from ftp://ftp.cmf.nrl.navy.mil/pub/chas/linux-atm/vbr/vbr-kernel-diffs
 Patch55:	linux-2.6-atm-vbr.patch
@@ -289,11 +278,9 @@
 Patch58:	linux-PF_RING.patch
 
 # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
-## TODO: patch60 -- update or drop -- needs update to 2.6.22
-Patch60:	linux-2.6-sk98lin_8.41.2.3.patch
+Patch60:	linux-2.6-sk98lin_v10.0.4.3.patch
 
 # lzma support for squashfs (patch6) from http://www.squashfs-lzma.org/dl/sqlzma3.2-r2b.tar.bz2
-## TODO: patch65 -- update or drop 
 Patch65:	sqlzma2k-3.2-r2.patch
 
 # http://www.tuxonice.net/downloads/all/suspend2-2.2.10-for-2.6.22.patch.bz2
@@ -728,9 +715,6 @@
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
-# TODO 2.6.20 - check this out - promise pata-sata stuff.
-#patch1 -p1
-
 # suspend2:
 %if %{with suspend2}
 ##ifarch %{ix86} %{x8664} ia64 ppc alpha
@@ -757,7 +741,7 @@
 
 # squashfs with (TODO) lzma support
 %patch6 -p1
-# %patch65 -p1
+%patch65 -p1
 
 %patch7 -p1
 %patch9 -p1
@@ -826,8 +810,8 @@
 %patch52 -p1
 %endif
 
-# TODO check linux-2.6-toshiba_acpi_0.18-dev_toshiba_test4.patch
-#patch54 -p1
+# toshiba_acpi
+%patch54 -p1
 
 %patch55 -p1
 %patch56 -p1
@@ -839,8 +823,8 @@
 %patch58 -p1
 
 
-# linux-2.6-sk98lin_8.41.2.3.patch
-## TODO update to 2.6.22 -- patch60 -p1
+# linux-2.6-sk98lin_v10.0.4.3.patch
+%patch60 -p1
 
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
@@ -1612,6 +1596,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1738  2007/08/07 20:06:31  baggins
+- removed outdated sata-promise-pata-ports
+- updated sk98lin, toshiba_acpi
+- enabled squashfs lzma
+- updated i386 config
+
 Revision 1.441.2.1737  2007/08/07 18:05:06  baggins
 - dropped obsolete patches
 - updated reiser4 patch
================================================================

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



More information about the pld-cvs-commit mailing list