Author: speedy Date: Sat Jul 30 16:19:42 2005 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- xendev bcond (now we can build xen-unstable kernel)
---- Files affected:
SPECS:
kernel.spec (1.441.2.1141 -> 1.441.2.1142)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1141 SPECS/kernel.spec:1.441.2.1142
--- SPECS/kernel.spec:1.441.2.1141 Thu Jul 28 20:36:58 2005
+++ SPECS/kernel.spec Sat Jul 30 18:19:36 2005
@@ -18,11 +18,16 @@
%bcond_with em8300 # DXR3/Hollywood
%bcond_with xen0 # build Xen0 kernel
%bcond_with xenU # build XenU kernel
+%bcond_with xendev # build Xen-devel kernel
%if %{with xen0} || %{with xenU}
%define with_xen 1
%endif
+%if %{with xendev} && %{without xen}
+cannot build xendev kernel without xen0/xenU
+%endif
+
%if !%{with grsecurity}
%undefine with_pax
%endif
@@ -137,9 +142,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
+Source34: kernel-xen0-x86_32-2.0.config
+Source35: kernel-xen0-x86_32-3.0.config
+Source36: kernel-xen0-x86_64-3.0.config
Source40: kernel.FAQ-pl
@@ -243,8 +248,11 @@
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
+# xen http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
Patch203: linux-xen-2.0.6.patch
+Patch204: linux-2.6.12-smp-alts.patch
+Patch205: linux-2.6.12.3-xen.patch
+Patch206: linux-2.6.12.3-xenbus.patch
Patch400: kernel-gcc4.patch
Patch401: kernel-hotfixes.patch
@@ -283,7 +291,11 @@
Conflicts: procps < %{_procps_ver}
Conflicts: oprofile < %{_oprofile_ver}
%if %{with xen}
+%if %{with xendev}
+ExclusiveArch: %{ix86} %{x8664}
+%else
ExclusiveArch: %{ix86}
+%endif
%else
ExclusiveArch: %{ix86} alpha %{x8664} ia64 ppc sparc sparc64
%endif
@@ -660,8 +672,14 @@
%patch202 -p1
%endif
%if %{with xen}
+%if %{with xendev}
+%patch204 -p1
+%patch205 -p1
+%patch206 -p1
+%else
%patch203 -p1
%endif
+%endif
%patch400 -p1
%patch401 -p1
@@ -731,7 +749,12 @@
%if %{with xen}
CrossOpts="ARCH=xen"
+%ifarch %{ix86}
%define _main_target_base_arch i386
+%endif
+%ifarch %{x8664}
+%define _main_target_base_arch x86_64
+%endif
%define _target_base_arch xen
%endif
@@ -741,12 +764,27 @@
smp=
[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
xen=
- %{?with_xen0:xen="0"}
- %{?with_xenU:xen="U"}
+ xenver=
+ xenarch=
+ %if %{with xen}
+ %{?with_xen0:xen="0"}
+ %{?with_xenU:xen="U"}
+ %if %{with xendev}
+ xenver="-3.0"
+ %else
+ xenver="-2.0"
+ %endif
+ %ifarch %{ix86}
+ xenarch="-x86_32"
+ %endif
+ %ifarch %{x8664}
+ xenarch="-x86_64"
+ %endif
+ %endif
if [ "$smp" = "yes" ]; then
- Config="%{_target_base_arch}$xen-smp"
+ Config="%{_target_base_arch}$xen$xenarch$xenver-smp"
else
- Config="%{_target_base_arch}$xen"
+ Config="%{_target_base_arch}$xen$xenarch$xenver"
fi
KernelVer=%{version}-%{release}$1
echo "Building config file for KERNEL $1..."
@@ -928,7 +966,12 @@
%if %{with xen}
CrossOpts="ARCH=xen"
+%ifarch %{ix86}
%define _main_target_base_arch i386
+%endif
+%ifarch %{x8664}
+%define _main_target_base_arch x86_64
+%endif
%define _target_base_arch xen
%endif
@@ -1374,6 +1417,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1142 2005/07/30 16:19:36 speedy
+- xendev bcond (now we can build xen-unstable kernel)
+
Revision 1.441.2.1141 2005/07/28 18:36:58 pluto
- defvs killer dropped.
- log fixed (squashfs 2.2 info).
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1141&r2=1.441.2.1142&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
