SPECS (LINUX_2_6_17): kernel.spec - xen support is back

zbyniu zbyniu at pld-linux.org
Tue Sep 19 10:11:07 CEST 2006 

Author: zbyniu                       Date: Tue Sep 19 08:11:07 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_17
---- Log message:
- xen support is back

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1613 -> 1.441.2.1613.2.1) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1613 SPECS/kernel.spec:1.441.2.1613.2.1
--- SPECS/kernel.spec:1.441.2.1613	Mon Sep 18 09:05:40 2006
+++ SPECS/kernel.spec	Tue Sep 19 10:11:02 2006
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # TODO:
-# - update xen patch for 2.6.17.x
 # - all netfilter patches needs update (API changed again)
 #
 # WARNING: Kernels from 2.6.16.X series not work under OldWorldMac
@@ -170,6 +169,7 @@
 Source45:	kernel-grsec.config
 Source46:	kernel-xen0.config
 Source47:	kernel-xenU.config
+Source48:	kernel-xen-extra.config
 
 ###
 #	Patches
@@ -223,7 +223,6 @@
 Patch37:	pom-ng-rpc-%{_old_netfilter_snap}.patch
 Patch38:	pom-ng-unclean-%{_old_netfilter_snap}.patch
 
-
 ##external
 Patch40:	pom-ng-IPMARK-%{_netfilter_snap}.patch
 Patch41:	pom-ng-condition-%{_netfilter_snap}.patch
@@ -268,7 +267,7 @@
 Patch102:	linux-2.6-vs2.1-128IPs.patch
 
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
-Patch120:	xen-3.0-2.6.16.patch
+Patch120:	linux-2.6-xen.patch
 
 Patch200:	linux-2.6-ppc-ICE-hacks.patch
 
@@ -279,7 +278,7 @@
 # http://lkml.org/lkml/2006/7/22/98
 Patch2001:	kernel-2.6-pnpbios.patch
 
-#wanpipe 
+#wanpipe
 #Patch3000:	wanpipe-beta7-2.3.4.patch
 
 # official grsecurity for 2.6.17.7
@@ -360,7 +359,7 @@
 your system. It contains few device drivers for specific hardware.
 Most hardware is instead supported by modules loaded after booting.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -376,7 +375,7 @@
 Systemfunktionen verantwortlich: Speicherreservierung,
 Prozeß-Management, Geräte Ein- und Ausgaben, usw.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -392,7 +391,7 @@
 fonctions basiques d'un systčme d'exploitation: allocation mémoire,
 allocation de process, entrée/sortie de peripheriques, etc.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -407,7 +406,7 @@
 Twojego komputera. Zawiera w sobie sterowniki do sprzętu znajdującego
 się w komputerze, takiego jak sterowniki dysków itp.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -555,7 +554,7 @@
 is required only on machines with two or more CPUs, although it should
 work fine on single-CPU boxes.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -571,7 +570,7 @@
 Prozessoren gebraucht, sollte aber auch auf Computern mit nur einer
 CPU laufen.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -586,7 +585,7 @@
 Il et nécessaire seulement pour les machine avec deux processeurs ou
 plus, il peut quand męme fonctionner pour les systčme mono-processeur.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -601,7 +600,7 @@
 wymagane przez komputery zawierające dwa lub więcej procesorów.
 Powinno również dobrze działać na maszynach z jednym procesorem.
 
-Netfilter module dated: %{_netfilter_nap}
+Netfilter module dated: %{_netfilter_snap}
 %{!?without_old_netfilter:Old netfilter module dated: %{_old_netfilter_snap}}
 %{?with_abi:Linux ABI suppor - enabled}
 %{?with_grsec_full:Grsecurity full support - enabled}
@@ -855,7 +854,6 @@
 %{!?without_old_netfilter:%patch37 -p1}
 %{!?without_old_netfilter:%patch38 -p1}
 
-
 ## external
 %patch40 -p1
 %patch41 -p1
@@ -1031,6 +1029,16 @@
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 %endif
 
+%if %{with xen0} || %{with xenU}
+	sed -i "s:CONFIG_X86_PC=y:# CONFIG_X86_PC is not set:" arch/%{_target_base_arch}/defconfig
+	sed -i "s:CONFIG_RIO=[ym]:# CONFIG_RIO is not set:" arch/%{_target_base_arch}/defconfig
+
+	# framebuffer devices generally don't work with xen
+	# and kernel will crash on boot if vesafb-tng is compiled in (even if off by default)
+	sed -i "s:CONFIG_FB=y:# CONFIG_FB is not set:" arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE48} >> arch/%{_target_base_arch}/defconfig
+%endif
+
 %if %{with xen0}
 	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
 %endif	
@@ -1128,7 +1136,11 @@
 	mkdir -p $KERNEL_INSTALL_DIR/boot
 	install System.map $KERNEL_INSTALL_DIR/boot/System.map-$KernelVer
 %ifarch %{ix86} %{x8664}
+%if %{with xen0} || %{with xenU}
+	install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+%else
 	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+%endif
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
 %endif
 %ifarch alpha sparc sparc64
@@ -1463,9 +1475,11 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
 %endif
+%if %{without xen0} && %{without xenU}
 %if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
+%endif
 /lib/modules/%{version}-%{release}/kernel/fs
 /lib/modules/%{version}-%{release}/kernel/kernel
 /lib/modules/%{version}-%{release}/kernel/lib
@@ -1552,10 +1566,13 @@
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}/kernel/sound/oss
+
+%if %{without xen0} && %{without xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
+%endif
 %endif			# %%{have_sound}
 %endif			# %%{with up}
 
@@ -1579,9 +1596,11 @@
 %if %{have_drm}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
 %endif
+%if %{without xen0} && %{without xenU}
 %if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
+%endif
 /lib/modules/%{version}-%{release}smp/kernel/fs
 /lib/modules/%{version}-%{release}smp/kernel/kernel
 /lib/modules/%{version}-%{release}smp/kernel/lib
@@ -1668,10 +1687,12 @@
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{version}-%{release}smp/kernel/sound/oss
+%if %{without xen0} && %{without xenU}
 %if %{have_isa}
 /lib/modules/%{version}-%{release}smp/kernel/drivers/media/radio/miropcm20.ko*
 %endif
 %endif
+%endif
 %endif			# %%{have_sound}
 %endif			# %%{with smp}
 
@@ -1757,6 +1778,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1613.2.1  2006/09/19 08:11:02  zbyniu
+- xen support is back
+
 Revision 1.441.2.1613  2006/09/18 07:05:40  blues
 - typo
 
================================================================

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

More information about the pld-cvs-commit mailing list