SPECS (LINUX_2_6): kernel.spec - abi and sk78lin moved to external specs - ...

[zbyniu]

Author: zbyniu                       Date: Mon May 12 14:17:40 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- abi and sk78lin moved to external specs
- end of my little psychological test, conclusion: nobody read this spec since 7 months ;->

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1895 -> 1.441.2.1896) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1895 SPECS/kernel.spec:1.441.2.1896
--- SPECS/kernel.spec:1.441.2.1895	Sat May 10 12:52:42 2008
+++ SPECS/kernel.spec	Mon May 12 16:17:34 2008
@@ -8,10 +8,8 @@
 # TODO:
 # - update imq, owner-xid patch
 # - grsec_full awaits for new snap
-# - update configs for !x86
 # - test bconds builds
 # - tproxy patch
-# - remove abi and sk98lin if external built modules works
 # - another nf modules disappeared?
 # - benchmark NO_HZ & HZ=1000 vs HZ=300 on i686
 # - apparmor (no future?)
@@ -28,7 +26,6 @@
 %bcond_without	pcmcia		# don't build pcmcia
 %bcond_without	regparm		# if your blob doesn't work try disable this
 
-%bcond_with	abi		# build ABI support only ix86 !!
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	xen0		# added Xen0 support
 %bcond_with	xenU		# added XenU support
@@ -85,16 +82,11 @@
 %define		with_grsecurity		1
 %endif
 
-%ifnarch %{ix86}
-%undefine	abi
-%endif
-
 %define		have_drm	1
 %define		have_oss	1
 %define		have_sound	1
 
 %if %{with rescuecd}
-%undefine	with_abi
 %undefine	with_tuxonice
 %undefine	with_grsec_full
 %undefine	with_grsec_minimal
@@ -179,10 +171,6 @@
 Source6:	kernel-config.py
 Source7:	kernel-module-build.pl
 
-# TODO - cleanup
-#Source14:	http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
-# Source14-md5:	bf32f8baa98aeafa75a672097acd9cc8
-
 Source19:	kernel-multiarch.config
 Source20:	kernel-i386.config
 Source21:	kernel-x86_64.config
@@ -193,8 +181,6 @@
 Source26:	kernel-ia64.config
 Source27:	kernel-ppc64.config
 
-Source34:	kernel-abi.config
-
 Source40:	kernel-netfilter.config
 Source41:	kernel-squashfs.config
 Source42:	kernel-tuxonice.config
@@ -295,10 +281,6 @@
 # http://synce.svn.sourceforge.net/svnroot/synce/trunk/patches/linux-2.6.22-rndis_host-wm5.patch
 Patch59:	kernel-rndis_host-wm5.patch
 
-# Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
-Patch60:	linux-2.6-sk98lin_v10.0.4.3.patch
-# potrzebuje modyfikacji, ale jest zbyt rano
-
 # Project suspend2 renamed to tuxonice
 # http://tuxonice.org/downloads/all/tuxonice-3.0-rc7-for-2.6.25.patch.bz2
 Patch69:	linux-2.6-suspend2.patch
@@ -492,7 +474,6 @@
 %endif
 
 %define __features Netfilter module dated: %{netfilter_snap}\
-%{?with_abi:Linux ABI support - enabled}\
 %{?with_grsec_full:Grsecurity full support - enabled}\
 %{?with_pax:PaX support - enabled}\
 %{?with_xen0:Xen 0 - enabled}\
@@ -737,7 +718,7 @@
 /usr/src/linux/Documentation.
 
 %prep
-%setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
+%setup -q -n linux-%{_basever}%{_rc}
 
 # hack against warning in pax/grsec
 %ifarch alpha
@@ -874,9 +855,6 @@
 # kernel-rndis_host-wm5.patch
 %patch59 -p1
 
-# linux-2.6-sk98lin_v10.0.4.3.patch
-#patch60 -p1
-
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
 
@@ -975,10 +953,6 @@
 %patch2000 -p1
 %patch2001 -p1
 
-%if %{with abi}
-patch -p1 -s < kernel-patch-linuxabi-20060404/linuxabi-2.6.17-0.patch
-%endif
-
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{?_alt_kernel:%{_alt_kernel}}#g' Makefile
 
@@ -1211,10 +1185,6 @@
 	echo "CONFIG_ROOT_NFS=y" >> %{defconfig}
 %endif
 
-%if %{with abi}
-	cat %{SOURCE34} >> %{defconfig}
-%endif
-
 %if %{with rescuecd}
 	RescueConfig %{defconfig}
 %endif
@@ -1664,9 +1634,6 @@
 %if %{with source}
 %files source -f aux_files_exc
 %defattr(644,root,root,755)
-%if %{with abi}
-%{_kernelsrcdir}/abi
-%endif /* abi */
 %{_kernelsrcdir}/arch/*/[!Mk]*
 %{_kernelsrcdir}/arch/*/kernel/[!M]*
 %exclude %{_kernelsrcdir}/arch/*/kernel/asm-offsets*
@@ -1711,6 +1678,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1896  2008-05-12 14:17:34  zbyniu
+- abi and sk78lin moved to external specs
+- end of my little psychological test, conclusion: nobody read this spec since 7 months ;->
+
 Revision 1.441.2.1895  2008-05-10 10:52:42  zbyniu
 - "make everything as simple as possible, but not simpler"
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1895&r2=1.441.2.1896&f=u