SPECS (LINUX_2_6_11): kernel.spec - LINUX_2_6 branch copied to (st...
pluto
pluto at pld-linux.org
Mon Jun 13 11:28:28 CEST 2005
Author: pluto Date: Mon Jun 13 09:28:28 2005 GMT
Module: SPECS Tag: LINUX_2_6_11
---- Log message:
- LINUX_2_6 branch copied to (stable) LINUX_2_6_11.
LINUX_2_6_* branches will contain stable series of the kernel.
---- Files affected:
SPECS:
kernel.spec (1.441.2.961.2.51 -> 1.441.2.961.2.52)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.961.2.51 SPECS/kernel.spec:1.441.2.961.2.52
--- SPECS/kernel.spec:1.441.2.961.2.51 Sun Jun 5 00:02:05 2005
+++ SPECS/kernel.spec Mon Jun 13 11:28:21 2005
@@ -16,6 +16,12 @@
%bcond_with preemptive # build preemptive kernel
%bcond_with regparm # (ix86) use register arguments (this break binary-only modules)
%bcond_with em8300 # DXR3/Hollywood
+%bcond_with xen0 # build Xen0 kernel
+%bcond_with xenU # build XenU kernel
+
+%if %{with xen0} || %{with xenU}
+%define with_xen 1
+%endif
%if !%{with grsecurity}
%undefine with_pax
@@ -41,6 +47,14 @@
grsecurity conflicts with vserver
%endif
+%if %{with xen} && %{with grsecurity}
+xen conflicts with grsecurity
+%endif
+
+%if %{with xen0} && %{with xenU}
+xen0 conflicts with xenU
+%endif
+
%{?debug:%define with_verbose 1}
%ifarch sparc
@@ -52,6 +66,11 @@
%undefine with_up
%endif
+%if %{with xen}
+# xen (for now) is only UP
+%undefine with_smp
+%endif
+
## Program required by kernel to work.
%define _binutils_ver 2.12
%define _util_linux_ver 2.10o
@@ -68,11 +87,11 @@
%define _procps_ver 3.2.0
%define _oprofile_ver 0.5.3
-%define _rel 1
+%define _rel 3
%define _cset 20041220_1904
%define _apply_cset 0
-%define _netfilter_snap 20050520
+%define _netfilter_snap 20050611
%define _enable_debug_packages 0
%define no_install_post_strip 1
@@ -85,8 +104,8 @@
Summary(de): Der Linux-Kernel (Kern des Linux-Betriebssystems)
Summary(fr): Le Kernel-Linux (La partie centrale du systeme)
Summary(pl): Jądro Linuksa
-Name: kernel%{?!with_grsecurity:-no_grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}
-%define _postver .11
+Name: kernel%{?with_grsecurity:-grsecurity}%{?with_omosix:-openmosix}%{?with_vserver:-vserver}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+%define _postver .12
#define _postver %{nil}
Version: 2.6.11%{_postver}
Release: %{_rel}
@@ -97,7 +116,7 @@
#define _rc -rc3
#Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
-# Source0-md5: d074fe2ef6ccbd635ebc6c327bb82a2b
+# Source0-md5: 7e3b6e630bb05c1a8c1ba46e010dbe44
Source1: kernel-autoconf.h
Source2: kernel-config.h
@@ -117,6 +136,9 @@
Source31: kernel-ppc-smp.config
Source32: kernel-ia64.config
Source33: kernel-ia64-smp.config
+Source34: kernel-xen0.config
+#Source35: kernel-xen0-smp.config
+#Source36: kernel-xenU.config
Source40: kernel.FAQ-pl
@@ -126,6 +148,7 @@
Source92: kernel-omosix.config
Source93: kernel-vserver.config
Source94: kernel-em8300.config
+Source95: kernel-linuxabi.config
Patch0: 2.6.0-ksyms-add.patch
Patch1: linux-2.6-version.patch
@@ -210,7 +233,7 @@
Patch112: linux-2.6-sata-sil-corruption-lockup.patch
Patch113: linux-2.6-xfrm-policy-destructor.patch
Patch114: linux-2.6-dst-cache-overflow.patch
-
+Patch115: linux-2.6-net-sundance-ip100A-pciids.patch
Patch116: linux-2.6-null-tty-driver-oops.patch
Patch117: linux-2.6-sata-sil-mod15write-workaround.patch
Patch118: linux-2.6-ext2-corruption.patch
@@ -223,11 +246,15 @@
Patch125: linux-2.6-jiffies-rounding.patch
Patch126: linux-2.6-cputime-misscalculation.patch
Patch127: linux-2.6-jfs-fsync-wrong-behavior.patch
-Patch128: linux-2.6-hfsplus-leak-and-oops.patch
+
Patch129: linux-2.6-vfs-two-read-without-clear-between.patch
Patch130: linux-2.6-fix-via82xx-resume.patch
Patch131: linux-2.6-ppc-fix-sleep-on-old-101-powerbook.patch
-Patch132: linux-2.6-rmap-oops.patch
+
+Patch133: linux-2.6-via82c586-irq-routing.patch
+Patch134: linux-2.6-udp-locking.patch
+# derived from http://adsl-brisbane.lubemobile.com.au/ras/debian/sarge/kernel-patch-linuxabi/
+Patch135: linux-2.6-unix-abi.patch
# derived from http://www.grsecurity.net/grsecurity-2.1.5-2.6.11.7-200504111924.patch.gz
Patch200: grsecurity-2.1.5-2.6.11.7-200504111924.patch
@@ -236,6 +263,8 @@
Patch201: linux-2.6-omosix.patch
# vserver-2.0-pre4
Patch202: linux-2.6-vs2.patch
+# xen 2.0.6 http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
+Patch203: linux-xen-2.0.6.patch
Patch400: kernel-gcc4.patch
Patch401: kernel-hotfixes.patch
@@ -272,7 +301,11 @@
Conflicts: nfs-utils < %{_nfs_utils_ver}
Conflicts: procps < %{_procps_ver}
Conflicts: oprofile < %{_oprofile_ver}
+%if %{with xen}
+ExclusiveArch: %{ix86}
+%else
ExclusiveArch: %{ix86} alpha %{x8664} ia64 ppc sparc sparc64
+%endif
ExclusiveOS: Linux
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -636,7 +669,7 @@
%patch112 -p1
%patch113 -p1
%patch114 -p1
-
+%patch115 -p1
%patch116 -p1
%patch117 -p1
%patch118 -p1
@@ -649,21 +682,29 @@
%patch125 -p1
%patch126 -p1
%patch127 -p1
-%patch128 -p1
+
%patch129 -p1
%patch130 -p1
%patch131 -p1
-%patch132 -p1
+
+%patch133 -p1
+%patch134 -p1
+%ifarch %{ix86}
+%patch135 -p1
+%endif
%if %{with grsecurity}
%patch200 -p1
%endif
%if %{with omosix}
-%patch201 -p1
+%{__patch} -p1 -F3 < %{PATCH201}
%endif
%if %{with vserver}
%patch202 -p1
%endif
+%if %{with xen}
+%patch203 -p1
+%endif
%patch400 -p1
%patch401 -p1
@@ -711,9 +752,10 @@
%ifarch i686 pentium3 pentium4
sed -i 's:CONFIG_MATH_EMULATION=y:# CONFIG_MATH_EMULATION is not set:' $1
%endif
- %ifarch %{ix86}
+ %if %{with regparm}
sed -i 's:# CONFIG_REGPARM is not set:CONFIG_REGPARM=y:' $1
%endif
+ cat %{SOURCE95} >> $1
%endif
}
@@ -724,15 +766,24 @@
CrossOpts=""
%endif
+%if %{with xen}
+CrossOpts="ARCH=xen"
+%define _main_target_base_arch i386
+%define _target_base_arch xen
+%endif
+
BuildConfig() {
%{?debug:set -x}
# is this a special kernel we want to build?
smp=
[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
+ xen=
+ %{?with_xen0:xen="0"}
+ %{?with_xenU:xen="U"}
if [ "$smp" = "yes" ]; then
- Config="%{_target_base_arch}-smp"
+ Config="%{_target_base_arch}$xen-smp"
else
- Config="%{_target_base_arch}"
+ Config="%{_target_base_arch}$xen"
fi
KernelVer=%{version}-%{release}$1
echo "Building config file for KERNEL $1..."
@@ -761,6 +812,9 @@
ln -sf arch/%{_target_base_arch}/defconfig .config
install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{version}/include/linux
rm -f include/linux/autoconf.h
+%if %{with xen}
+ %{__make} $CrossOpts oldconfig
+%endif
%{__make} $CrossOpts include/linux/autoconf.h
if [ "$smp" = "yes" ]; then
install include/linux/autoconf.h \
@@ -792,6 +846,10 @@
%{__make} $CrossOpts include/linux/version.h \
%{?with_verbose:V=1}
+%if %{with xen}
+ %{__make} $CrossOpts oldconfig
+%endif
+
# make does vmlinux, modules and bzImage at once
%ifarch sparc sparc64
%ifarch sparc64
@@ -823,8 +881,12 @@
mkdir -p $KERNEL_INSTALL_DIR/boot
install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
%ifarch %{ix86} %{x8664}
+%if %{with xen}
+ install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+%else
install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
%endif
+%endif
%ifarch alpha sparc sparc64
gzip -cfv vmlinux > vmlinuz
install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
@@ -876,9 +938,11 @@
# SMP KERNEL
KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-SMP"
rm -rf $KERNEL_INSTALL_DIR
+%if !%{with xen}
BuildConfig smp
%{?with_smp:BuildKernel smp}
%{?with_smp:PreInstallKernel smp}
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -943,8 +1007,8 @@
install %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
install %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/config.h
-# moved updated file to man-pages
-#install -D drivers/net/sk98lin/sk98lin.4 $RPM_BUILD_ROOT%{_mandir}/man4/sk98lin.4
+# ghosted initrd
+touch $RPM_BUILD_ROOT/boot/initrd-%{version}-%{release}{,smp}.gz
%clean
rm -rf $RPM_BUILD_ROOT
@@ -979,9 +1043,6 @@
/sbin/rc-boot 1>&2 || :
fi
-%postun
-rm -f %{initrd_dir}/initrd-%{version}-%{release}.gz
-
%post drm
%depmod %{version}-%{release}
@@ -1036,9 +1097,6 @@
/sbin/rc-boot 1>&2 || :
fi
-%postun smp
-rm -f %{initrd_dir}/initrd-%{version}-%{release}smp.gz
-
%post smp-drm
%depmod %{version}-%{release}smp
@@ -1092,8 +1150,12 @@
%endif
/boot/vmlinuz-%{version}-%{release}
/boot/System.map-%{version}-%{release}
+%ghost /boot/initrd-%{version}-%{release}.gz
%dir /lib/modules/%{version}-%{release}
%dir /lib/modules/%{version}-%{release}/kernel
+%ifarch %{ix86}
+/lib/modules/%{version}-%{release}/kernel/abi
+%endif
%ifnarch ppc sparc
/lib/modules/%{version}-%{release}/kernel/arch
%endif
@@ -1121,7 +1183,6 @@
%endif
/lib/modules/%{version}-%{release}/build
%ghost /lib/modules/%{version}-%{release}/modules.*
-#%{_mandir}/man4/sk98lin.4*
%ifnarch sparc sparc64
%files drm
@@ -1168,8 +1229,12 @@
%endif
/boot/vmlinuz-%{version}-%{release}smp
/boot/System.map-%{version}-%{release}smp
+%ghost /boot/initrd-%{version}-%{release}smp.gz
%dir /lib/modules/%{version}-%{release}smp
%dir /lib/modules/%{version}-%{release}smp/kernel
+%ifarch %{ix86}
+/lib/modules/%{version}-%{release}smp/kernel/abi
+%endif
%ifnarch ppc sparc
/lib/modules/%{version}-%{release}smp/kernel/arch
%endif
@@ -1197,7 +1262,6 @@
%endif
/lib/modules/%{version}-%{release}smp/build
%ghost /lib/modules/%{version}-%{release}smp/modules.*
-#%{_mandir}/man4/sk98lin.4*
%ifnarch sparc sparc64
%files smp-drm
@@ -1236,7 +1300,9 @@
%defattr(644,root,root,755)
%dir %{_prefix}/src/linux-%{version}
%{_prefix}/src/linux-%{version}/include
+%if !%{with xen}
%{_prefix}/src/linux-%{version}/config-smp
+%endif
%{_prefix}/src/linux-%{version}/config-up
%files module-build
@@ -1264,6 +1330,9 @@
%if %{with source}
%files source
%defattr(644,root,root,755)
+%ifarch %{ix86}
+%{_prefix}/src/linux-%{version}/abi
+%endif
%{_prefix}/src/linux-%{version}/arch/*/[!Mk]*
%{_prefix}/src/linux-%{version}/arch/*/kernel/[!M]*
%exclude %{_prefix}/src/linux-%{version}/arch/*/kernel/asm-offsets.*
@@ -1305,11 +1374,105 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.441.2.961.2.51 2005/06/04 22:02:05 kolodko
+Revision 1.441.2.961.2.52 2005/06/13 09:28:21 pluto
+- LINUX_2_6 branch copied to (stable) LINUX_2_6_11.
+ LINUX_2_6_* branches will contain stable series of the kernel.
+
+Revision 1.441.2.1112 2005/06/13 08:14:48 pluto
+- %%files fixed.
+
+Revision 1.441.2.1111 2005/06/12 17:42:26 speedy
+- xen is only UP
+- disable building smp config (when building --with xen)
+
+Revision 1.441.2.1110 2005/06/12 15:55:51 pluto
+- unix abi patch rebconded (like in the paszczus' commit).
+
+Revision 1.441.2.1109 2005/06/12 12:41:47 pluto
+- gcc4 patch and linuxabi patch updated.
+- release 2.
+
+Revision 1.441.2.1108 2005/06/12 10:25:32 pluto
+- postun(rm -f initrd...) removed (already included in %%files).
+
+Revision 1.441.2.1107 2005/06/12 09:22:55 pluto
+- simplified, log extended.
+
+Revision 1.441.2.1106 2005/06/12 09:06:10 pluto
+- updated to 2.6.11.12.
+ # x86_64: Fix ptrace boundary check
+ # x86_64: avoid SMP boot up race
+ # fix hfsplus oops, hfs and hfsplus leak
+ # fix deadlock with ip_queue and tcp local input path.
+ # ext3: fix log_do_checkpoint() assertion failure
+ # fix for bttv driver (v0.9.15) for Leadtek WinFast VC100 XP capture cards
+ # netem: duplication fix prevent bad forwarding table updates
+ # try_to_unmap_cluster() passes out-of-bounds pte to pte_unmap()
+- release 1.
+
+Revision 1.441.2.1105 2005/06/11 18:11:37 pluto
+- rmap experimental fix removed.
+
+Revision 1.441.2.1104 2005/06/11 17:06:16 pluto
+- pom-ng branch diff updated.
+
+Revision 1.441.2.1103 2005/06/11 15:58:58 speedy
+- kernel-xen.config
+
+Revision 1.441.2.1102 2005/06/11 15:19:01 speedy
+- more work on xen (mostly inspired by wpk)
+
+Revision 1.441.2.1101 2005/06/11 12:15:05 speedy
+- xenU/xen0 bcond and conflicts
+
+Revision 1.441.2.1100 2005/06/11 11:58:25 speedy
+- xen is only on %%{ix86} (exclusive arch)
+
+Revision 1.441.2.1099 2005/06/11 11:37:05 speedy
+- xen support (NFY)
+
+Revision 1.441.2.1098 2005/06/10 10:33:44 glen
+- add initrd to package as %ghost
+ it's for identifying who owns the files in the system
+
+Revision 1.441.2.1097 2005/06/09 17:36:26 pluto
+- paszczus' commit reverted.
+
+Revision 1.441.2.1096 2005/06/09 15:02:54 paszczus
+- bconded patch135
+
+Revision 1.441.2.1095 2005/06/09 07:32:01 pluto
+- %%files: unix abi modules only for ix86.
+
+Revision 1.441.2.1094 2005/06/08 18:27:52 paszczus
+- temporary commented out Patch132 cause it propably makes oops on rmap
+- release 2.3 for test-build
+
+Revision 1.441.2.1093 2005/06/06 13:10:34 pluto
+- unix abi modules seem to work.
+- release 2.2.
+
+Revision 1.441.2.1092 2005/06/06 11:11:45 pluto
+- %%files += unix abi modules.
+
+Revision 1.441.2.1091 2005/06/04 21:59:22 kolodko
- rm alsa-driver* from Provides & Obsoletes
-Revision 1.441.2.961.2.50 2005/06/01 12:55:25 cieciwa
-- updated.
+Revision 1.441.2.1090 2005/06/02 10:57:28 pluto
+- allow linux to run foreign unix binaries.
+
+Revision 1.441.2.1089 2005/06/01 22:03:55 pluto
+- via82c586 irq routing fixed.
+- udp locking fixed.
+- release 2.
+
+Revision 1.441.2.1088 2005/06/01 21:32:19 pluto
+- sundance pciids patch moved before bconded patchset.
+- log fixed.
+
+Revision 1.441.2.1087 2005/06/01 13:53:23 cieciwa
+- _rel 1.1
+- updated PCI ID for sundancedriver.
Revision 1.441.2.1086 2005/05/31 21:48:37 pluto
- updated to 2.6.11.11.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.961.2.51&r2=1.441.2.961.2.52&f=u
More information about the pld-cvs-commit
mailing list