Author: aniolek Date: Thu Mar 3 10:39:04 2005 GMT
Module: SPECS Tag: LINUX_2_6_11
---- Log message:
- save branch aniolek to branch LINUX_2_6_11
---- Files affected:
SPECS:
kernel.spec (1.441.2.961.2.2 -> 1.441.2.961.2.3)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.961.2.2 SPECS/kernel.spec:1.441.2.961.2.3
--- SPECS/kernel.spec:1.441.2.961.2.2 Thu Mar 3 11:01:58 2005
+++ SPECS/kernel.spec Thu Mar 3 11:38:58 2005
@@ -4,19 +4,31 @@
# - fix lirc_sasem (usb api)
# - add distcc support (and don't break crossbuild!)
# - fix vserver against new grsec
+# - backport patch78 (expand-stack-race).
+# - fix SMP version - it looks for modules in /lib/modules/2.6.X-Y
+# instead of 2.6.X-Ysmp
#
# Conditional build:
%bcond_without smp # don't build SMP kernel
%bcond_without up # don't build UP kernel
%bcond_without source # don't build kernel-source package
-%bcond_with vserver # enable vserver
-%bcond_with pax # enable PaX
+#%bcond_without grsec # build without grsec
+#%bcond_with vserver # enable vserver (disables grsec)
+#%bcond_with pax # enable PaX
%bcond_with verbose # verbose build (V=1)
%bcond_with preemptive # build preemptive kernel
-%bcond_with regparm # (ix86) use register arguments (this break
binary-only modules)
+%bcond_with regparm # use register arguments (this break
binary-only modules)
%{?debug:%define with_verbose 1}
+#%if %{with vserver}
+#%undefine with_grsec
+#%endif
+
+%if !%{with grsec}
+%undefine with_pax
+%endif
+
%ifarch sparc
# sparc32 is missing important updates from 2.5 cycle - won't build
%undefine with_smp
@@ -44,12 +56,11 @@
#define _post_ver .1
%define _post_ver %{nil}
-%define _rel 0.101
-%define _cset 20041220_1904
+%define _rel 0.28
+%define _cset 20050302_0807
%define _apply_cset 0
%define _netfilter_snap 20041118
-%define _l7_ver 1.0
%define _enable_debug_packages 0
%define no_install_post_strip 1
@@ -66,12 +77,12 @@
Version: 2.6.11%{_post_ver}
Release: %{_rel}
Epoch: 3
-License: GPL
+License: GPL v2
Group: Base/Kernel
%define _rc %{nil}
-#define _rc -rc2
#Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
Source0:
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
+# Source0-md5: f00fd1b5a80f52baf9d1d83acddfa325
Source1: %{name}-autoconf.h
Source4:
http://ftp.kernel.org/pub/linux/kernel/v2.6/testing/cset/cset-%{_cset}.txt.bz2
@@ -98,100 +109,86 @@
Source91: %{name}-grsec+pax.config
Source92: %{name}-vserver.config
-##Patch0: 2.6.0-ksyms-add.patch
-##Patch1: linux-2.6-version.patch
-##Patch2: 2.6.0-t6-usb-irq.patch
-##Patch3: 2.6.0-t7-memleak-lkml.patch
-##Patch4: 2.6.0-t7-memleak2-lkml.patch
-###Patch5: 2.6.0-t8-swap-include-lkml.patch
-##Patch6: 2.6.0-t8-VLSI-ix86-lkml.patch
+#Patch0: 2.6.0-ksyms-add.patch
+#Patch1: linux-2.6-alsa-1.0.8-silent-output.patch
+#Patch2: 2.6.0-t6-usb-irq.patch
+#Patch3: 2.6.0-t7-memleak-lkml.patch
+#Patch4: 2.6.0-t7-memleak2-lkml.patch
+#Patch6: 2.6.0-t8-VLSI-ix86-lkml.patch
-##Patch8: 2.6.0-t8-umsdos-lkml.patch
-##Patch9: 2.6.0-t9-acpi_osl-lkml.patch
+#Patch8: 2.6.0-t8-umsdos-lkml.patch
+#Patch9: 2.6.0-t9-acpi_osl-lkml.patch
# http://www.consultmatt.co.uk/downloads/patches/kernel/2.6/
-##Patch10: 2.6.0-powernow-k7.patch
-##Patch11: 2.6.0-enable-radeon-igp-rendering.patch
-##Patch12: 2.6.0-omnikeys.patch
-
-##Patch13: 2.6.1-rc2-VLAN-NS83820-lkml.patch
-##Patch14: linux-2.6-omnibook-20040916.patch
-##Patch15: linux-2.6-enable-broken-advansys.patch
-##Patch16: linux-alpha-isa.patch
-##Patch17: 2.6.4-psion-5mx.patch
-##Patch18: 2.6.5-sparc64-missing-include.patch
-##Patch19: 2.6.5-3C920b-Tornado.patch
-##Patch20: 2.6.5-i386-cmpxchg.patch
-##Patch21: 2.6.6-serial-fifo-lkml.patch
-##Patch22: 2.6.6-qsort-updated-lkml.patch
-##Patch23: 2.6.6-xfs-qsort-lkml.patch
-###Patch24: 2.6.7-bridge_sysfs-lkml.patch
-##Patch25: 2.6.7-alpha_compile.patch
-##Patch26: 2.6.7-ppc-asm-defs.patch
-##Patch27: linux-ppc-oops.patch
-##Patch28: linux-2.6-sparc-ksyms.patch
-
-###Patch30: 2.6.x-ppp_mppe.patch
-##Patch31: linux-2.6-skge.patch
-##Patch32: 2.6.x-TGA-fbdev-lkml.patch
-##Patch33: linux-kbuild-extmod.patch
+#Patch10: 2.6.0-powernow-k7.patch
+#Patch11: 2.6.0-enable-radeon-igp-rendering.patch
+#Patch12: 2.6.0-omnikeys.patch
+
+#Patch13: 2.6.1-rc2-VLAN-NS83820-lkml.patch
+#Patch14: linux-2.6-omnibook-20040916.patch
+#Patch15: linux-2.6-enable-broken-advansys.patch
+#Patch16: linux-alpha-isa.patch
+#Patch17: 2.6.4-psion-5mx.patch
+#Patch18: 2.6.5-sparc64-missing-include.patch
+#Patch19: 2.6.5-3C920b-Tornado.patch
+#Patch20: 2.6.5-i386-cmpxchg.patch
+#Patch21: 2.6.6-serial-fifo-lkml.patch
+#Patch22: 2.6.6-qsort-updated-lkml.patch
+#Patch23: 2.6.6-xfs-qsort-lkml.patch
+#Patch24: 2.6.7-bridge_sysfs-lkml.patch
+#Patch25: 2.6.7-alpha_compile.patch
+#Patch26: 2.6.7-ppc-asm-defs.patch
+#Patch27: linux-ppc-oops.patch
+#Patch28: linux-2.6-sparc-ksyms.patch
+
+#Patch30: 2.6.x-ppp_mppe.patch
+
+#Patch32: 2.6.x-TGA-fbdev-lkml.patch
+Patch33: linux-kbuild-extmod.patch
# framebuffer fixes
-##Patch41: linux-fbcon-margins.patch
+Patch41: linux-fbcon-margins.patch
# netfilter
-##Patch50: 2.6.10-pom-ng-%{_netfilter_snap}.patch
+#Patch50: 2.6.10-pom-ng-%{_netfilter_snap}.patch
# http://l7-filter.sourceforge.net/
-##Patch52: %{name}-2.6-layer7-%{_l7_ver}.patch
-##Patch53: 2.6.10-esfq.patch
+#Patch52: 2.6.8-ipt_layer7.patch
+#Patch53: 2.6.10-esfq.patch
# http://www.linuximq.net/patchs/linux-2.6.9-imq1.diff
-##Patch54: 2.6.10-imq.patch
-##Patch55: 2.6.4-wrr.patch
-##Patch56: linux-2.6-netfilter-syms.patch
-# http://kernel.umbrella.ro/net/ (included in 2.6.11-rc1)
-##Patch57: kernel-match-nfmark-in-u32.patch
+#Patch54: 2.6.10-imq.patch
+#Patch55: 2.6.4-wrr.patch
+#Patch56: linux-2.6-netfilter-syms.patch
# pseudo terminal fix for older glibc
-###Patch60: %{name}-pts.patch
-##Patch61: %{name}-MAX_INIT_ARGS.patch
+#Patch60: %{name}-pts.patch
+#Patch61: %{name}-MAX_INIT_ARGS.patch
# http://tahoe.pl/patch.htm
-##Patch70: http://www.tahoe.pl/drivers/tahoe9xx-2.6.4-5.patch
+#Patch70: http://www.tahoe.pl/drivers/tahoe9xx-2.6.4-5.patch
# http://dev.gentoo.org/~spock/projects/gensplash/
-##Patch72: fbsplash-0.9.1-r1-2.6.10.patch
-##Patch73: squashfs2.1-patch
-##Patch74: linux-static-dev.patch
-##Patch75:
ftp://ftp.kernel.org/pub/linux/kernel/people/mbligh/patches/2.6.6-rc3/2.6.6-rc3-mjb1/350-autoswap
-##Patch76: linux-2.6-lirc-0.7.patch
-##Patch77: linux-2.6-alsa-1.0.8.patch
-
-# psmouse extension for ThinkPad laptops from
http://www.clarkson.edu/~evanchsa/
-##Patch80: trackpoint-2.6.9.patch
+Patch72: fbsplash-0.9.1-r2-2.6.11-rc4.patch
+Patch73: squashfs2.1-patch
+Patch74: linux-static-dev.patch
+Patch75:
ftp://ftp.kernel.org/pub/linux/kernel/people/mbligh/patches/2.6.6-rc3/2.6.6-rc3-mjb1/350-autoswap
+Patch76: linux-2.6-lirc-0.7.patch
+#Patch78: linux-2.6-expand-stack-race.patch
#
http://ftp.kernel.org/pub/linux/kernel/people/lenb/acpi/patches/release/2.6.10/
-##Patch90: acpi-20041210-2.6.10.diff
+#Patch90: acpi-20041210-2.6.10.diff
# frpm http://www.ssi.bg/~ja/#routers
-##Patch100: routes-2.6.10-11.diff
+#Patch100: routes-2.6.10-11.diff
#
http://kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.10-rc2/2.6.10-rc-mm2/broken-out
-##Patch110: linux-reiser4.patch.bz2
-
-##Patch200: grsecurity-2.1.1-2.6.10-200501131222.patch
-##Patch201: linux-2.6.10-secfix-200501071130.patch
-##Patch202: linux-2.6-expand-stack-race.patch
+#Patch110: linux-reiser4.patch.bz2
-##Patch210: linux-2.6-ftdi_sio-ever_ups.patch
+#Patch200: grsecurity-2.1.1-2.6.10-200501131222.patch
+#Patch201: linux-2.6.10-secfix-200501071130.patch
# linux vserver
# adapted from
http://vserver.13thfloor.at/Experimental/patch-2.6.10-vs1.9.3.17.diff
-##Patch250: linux-2.6-vs.patch
-
-# hotfixes
-##Patch300: %{name}-hotfixes.patch
-##Patch301: %{name}-gcc4.patch
-##Patch302: linux-2.6-scsi-block.patch
+#Patch250: linux-2.6-vs.patch
URL: http://www.kernel.org/
BuildRequires: binutils >= 2.14.90.0.7
@@ -202,6 +199,7 @@
BuildRequires: module-init-tools
BuildRequires: perl-base
BuildRequires: rpmbuild(macros) >= 1.153
+BuildRequires: sed >= 4.0
Autoreqprov: no
PreReq: coreutils
PreReq: module-init-tools >= 0.9.9
@@ -519,91 +517,87 @@
bzcat %{SOURCE4} | patch -p1 -s
%endif
-##patch0 -p1
-##patch1 -p0
-##patch2 -p1
-##patch3 -p1
-##patch4 -p1
-#patch5 -p1
-##patch6 -p1
-
-##patch8 -p1
-##patch9 -p1
-##patch10 -p1
-##patch11 -p1
-##patch12 -p1
-##patch13 -p1
-##patch14 -p1
-##patch15 -p1
-##patch16 -p1
-##patch17 -p1
-##patch18 -p1
-##patch19 -p1
-##patch20 -p1
-##patch21 -p1
-##patch22 -p1
-##patch23 -p1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
+#%patch3 -p1
+#%patch4 -p1
+#%patch6 -p1
+
+#%patch8 -p1
+#%patch9 -p1
+#%patch10 -p1
+#%patch11 -p1
+#%patch12 -p1
+#%patch13 -p1
+#%patch14 -p1
+#%patch15 -p1
+#%patch16 -p1
+#%patch17 -p1
+#%patch18 -p1
+#%patch19 -p1
+#%patch20 -p1
+#%patch21 -p1
+#%patch22 -p1
+#%patch23 -p1
#patch24 -p1
-##patch25 -p1
-##patch26 -p1
-##patch27 -p1
-##patch28 -p1
+#%patch25 -p1
+#%patch26 -p1
+#%patch27 -p1
+#%patch28 -p1
#patch30 -p1
-##patch31 -p1
+
#patch32 -p1 NEEDS UPDATE
-##patch33 -p1
+%patch33 -p1
-##patch41 -p1
+%patch41 -p1
# netfilter
-##patch50 -p1
+#%patch50 -p1
-##patch52 -p1
-##patch53 -p1
-##patch54 -p1
-##patch55 -p1
-##patch56 -p1
-##patch57 -p1
+#%patch52 -p1
+#%patch53 -p1
+#%patch54 -p1
+#%patch55 -p1
+#%patch56 -p1
#patch60 -p1
-##patch61 -p1
-
-##patch70 -p1
+#%patch61 -p1
-##patch72 -p1
+#%patch70 -p1
-##patch73 -p1
-##patch74 -p1
-##patch75 -p1
-##patch76 -p1
-##patch77 -p1
+%patch72 -p1
-##patch80 -p1
+%patch73 -p1
+%patch74 -p1
+%patch75 -p1
+%patch76 -p1
+#patch78 -p1
-##patch90 -p1
+#%patch90 -p1
# routers
-##patch100 -p1
+#%patch100 -p1
-##patch110 -p1
+#%patch110 -p1
-##patch200 -p1
-##patch201 -p1
-##patch202 -p1
+# <bconded_patches>
-##patch210 -p1
-
-%if %{with vserver}
-##patch250 -p1
-%endif
+#grsec
+#%ifarch alpha %{ix86} ia64 ppc sparc sparc64 amd64
+#%if %{with grsec}
+#%patch200 -p1
+#%patch201 -p1
+#%endif
+#%endif
+
+#%if %{with vserver}
+#%patch250 -p1
+#%endif
# </bconded_patches
-# hotfixes
-##patch300 -p1
-##patch301 -p1
-##patch302 -p1
# Fix EXTRAVERSION in main Makefile
sed -i 's#EXTRAVERSION =.*#EXTRAVERSION =#g' Makefile
@@ -888,6 +882,11 @@
ln -sf vmlinuz-%{version}-%{release} /boot/vmlinuz
ln -sf System.map-%{version}-%{release} /boot/System.map
+if [ ! -L /lib/modules/%{version} ] ; then
+ mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave >
/dev/null 2>&1
+fi
+rm -f /lib/modules/%{version}
+ln -snf %{version}-%{release} /lib/modules/%{version}
%depmod %{version}-%{release}
/sbin/geninitrd -f --initrdfs=rom
%{initrd_dir}/initrd-%{version}-%{release}.gz %{version}-%{release}
@@ -899,6 +898,13 @@
fi
%postun
+if [ -L /lib/modules/%{version} ]; then
+ if [ "`ls -l /lib/modules/%{version} | awk '{ print $10 }'`" =
"%{version}-%{release}" ]; then
+ if [ "$1" = "0" ]; then
+ rm -f /lib/modules/%{version}
+ fi
+ fi
+fi
rm -f %{initrd_dir}/initrd-%{version}-%{release}.gz
%post drm
@@ -940,6 +946,11 @@
ln -sf vmlinuz-%{version}-%{release}smp /boot/vmlinuz
ln -sf System.map-%{version}-%{release}smp /boot/System.map
+if [ ! -L /lib/modules/%{version} ] ; then
+ mv -f /lib/modules/%{version} /lib/modules/%{version}.rpmsave >
/dev/null 2>&1
+fi
+rm -f /lib/modules/%{version}
+ln -snf %{version}-%{release}smp /lib/modules/%{version}
%depmod %{version}-%{release}smp
/sbin/geninitrd -f --initrdfs=rom
%{initrd_dir}/initrd-%{version}-%{release}smp.gz %{version}-%{release}smp
@@ -951,6 +962,13 @@
fi
%postun smp
+if [ -L /lib/modules/%{version} ]; then
+ if [ "`ls -l /lib/modules/%{version} | awk '{ print $10 }'`" =
"%{version}-%{release}smp" ]; then
+ if [ "$1" = "0" ]; then
+ rm -f /lib/modules/%{version}
+ fi
+ fi
+fi
rm -f %{initrd_dir}/initrd-%{version}-%{release}smp.gz
%post smp-drm
@@ -1210,7 +1228,9 @@
%{_prefix}/src/linux-%{version}/crypto
%{_prefix}/src/linux-%{version}/drivers
%{_prefix}/src/linux-%{version}/fs
-%{_prefix}/src/linux-%{version}/grsecurity
+#%if %{with grsec}
+#%{_prefix}/src/linux-%{version}/grsecurity
+#%endif
%{_prefix}/src/linux-%{version}/init
%{_prefix}/src/linux-%{version}/ipc
%{_prefix}/src/linux-%{version}/kernel
@@ -1239,11 +1259,115 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.441.2.961.2.2 2005/03/03 10:01:58 cieciwa
-- updated to final 2.6.11.
+Revision 1.441.2.961.2.3 2005/03/03 10:38:58 aniolek
+- save branch aniolek to branch LINUX_2_6_11
+
+Revision 1.441.2.951.2.29 2005/03/02 23:31:48 aniolek
+- updated fbsplash patch
+- rel. 0.28
+
+Revision 1.441.2.951.2.28 2005/03/02 23:13:34 aniolek
+- start update to final 2.6.11
+
+Revision 1.441.2.951.2.27 2005/03/01 17:01:36 darekr
+- BR: sed 4.0
+
+Revision 1.441.2.951.2.26 2005/02/25 00:16:59 aniolek
+- start updated to rc5
+
+Revision 1.441.2.951.2.25 2005/02/13 20:36:44 aniolek
+- updated to 2.6.11-rc4
+- rel. 0.26
+- dropped linux-2.6-alsa-1.0.8-silent-output.patch
+
+Revision 1.441.2.951.2.24 2005/02/10 13:01:46 aniolek
+- updated cset
+- rel. 0.25
+
+Revision 1.441.2.951.2.23 2005/02/09 23:40:06 aniolek
+- applied linux-fbcon-margins.patch
+
+Revision 1.441.2.951.2.22 2005/02/09 10:00:52 aniolek
+- applied linux-static-dev.patch
+- applied 250-autoswap
+- applied linux-2.6-lirc-0.7.patch
+- updated cset
+- rel 0.24
+
+Revision 1.441.2.951.2.21 2005/02/08 20:30:09 aniolek
+- applied linux-kbuild-exmod.patch
+- rel. 0.23
+
+Revision 1.441.2.951.2.20 2005/02/08 09:54:56 aniolek
+- updated cset
+- rel. 0.22
+
+Revision 1.441.2.951.2.19 2005/02/07 21:41:58 aniolek
+- rel. 0.21
+
+Revision 1.441.2.951.2.18 2005/02/07 21:31:54 aniolek
+- dropped another patch
+
+Revision 1.441.2.951.2.17 2005/02/07 21:08:10 aniolek
+- dropped some patch
+
+Revision 1.441.2.951.2.16 2005/02/07 20:45:04 aniolek
+- updated cset
+- rel. 0.20
+- added fbsplash patch
+
+Revision 1.441.2.951.2.15 2005/02/03 22:23:06 aniolek
+- updated md5sum
+
+Revision 1.441.2.951.2.14 2005/02/03 22:16:11 aniolek
+- updated to 2.6.11 rc3
+- updated cset
+- rel. 0.19
+
+Revision 1.441.2.951.2.13 2005/02/02 15:35:31 aniolek
+- added alsa output patch
+
+Revision 1.441.2.951.2.12 2005/02/02 15:28:44 aniolek
+- updated cset
+- rel. 0.18
+
+Revision 1.441.2.951.2.11 2005/01/25 23:34:59 aniolek
+- updated cset
+- rel. 0.17
+- dropped grsec
+
+Revision 1.441.2.951.2.10 2005/01/25 13:51:47 aniolek
+- log cutted
+
+Revision 1.441.2.951.2.9 2005/01/25 13:41:56 aniolek
+- rel. 0.16
+
+Revision 1.441.2.951.2.8 2005/01/25 10:30:58 aniolek
+- updated cset
+
+Revision 1.441.2.951.2.7 2005/01/25 00:17:00 aniolek
+- updated to 2.6.11-rc2
+- dropped fbsplash patch
+- updated cset
+- upplied squashfs
+
+Revision 1.441.2.951.2.6 2005/01/18 22:27:53 aniolek
+- updated cset to 20040118_1713
+
+Revision 1.441.2.951.2.5 2005/01/18 14:45:19 aniolek
+- updated cset to 20050118_0115
+
+Revision 1.441.2.951.2.4 2005/01/16 13:36:33 aniolek
+- updated cset
+- rel. 0.12
+
+Revision 1.441.2.951.2.3 2005/01/16 12:53:32 aniolek
+- rel. 0.11
+
+Revision 1.441.2.951.2.2 2005/01/16 12:47:07 aniolek
+- updated fbsplash patch
-Revision 1.441.2.961.2.1 2005/01/25 09:09:42 cieciwa
-- begining update to version 2.6.11,
-- _rc 2,
-- cutting Changelog.
+Revision 1.441.2.951.2.1 2005/01/16 12:26:43 aniolek
+- start 2.6.11-rc1
+- without any patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.961.2.2&r2=1.441.2.961.2.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
