rpms/kernel/FC-5 Makefile.config, 1.38, 1.39 kernel-2.6.spec, 1.2145, 1.2146

[fedora-cvs-commits redhat com]

Author: quintela

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv4882

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
add support for xen unified kernel & PAE support on that kernel


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/Makefile.config,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Makefile.config	6 Jun 2006 04:35:22 -0000	1.38
+++ Makefile.config	4 Jul 2006 13:47:36 -0000	1.39
@@ -13,7 +13,7 @@
 	$(CFG)-ppc.config $(CFG)-ppc-smp.config \
 	$(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
 	$(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
-	$(CFG)-i686-xen0-PAE.config $(CFG)-i686-xenU-PAE.config \
+	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
 	$(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
@@ -129,18 +129,19 @@
 kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE kernel-$(VERSION)-i686-xen0.config
-	perl scripts/merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
 	perl scripts/merge.pl $^ i386 > $@
 
-kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE kernel-$(VERSION)-i686-xenU.config
-	perl scripts/merge.pl $^ i386 > $@
-
 kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
 kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 
+kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen kernel-$(VERSION)-i686-xen0.config
+	perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen kernel-$(VERSION)-x86_64-xen0.config
+	perl scripts/merge.pl $^ x86_64 > $@
+
+


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2145
retrieving revision 1.2146
diff -u -r1.2145 -r1.2146
--- kernel-2.6.spec	30 Jun 2006 18:47:17 -0000	1.2145
+++ kernel-2.6.spec	4 Jul 2006 13:47:36 -0000	1.2146
@@ -9,7 +9,6 @@
 %define includexen 1
 # Whether to build the Xen kernels, disable if you want.
 %define buildxen 1
-%define buildxenPAE 0
 %define builddoc 0
 %define buildkdump 1
 
@@ -53,11 +52,6 @@
 %define buildkdump 1
 %endif
 
-# ... and XenPAE only on i686
-%ifnarch i686
-%define buildxenPAE 0
-%endif
-
 # Second, per-architecture exclusions (ifarch)
 
 %ifarch %{all_x86}
@@ -225,10 +219,10 @@
 
 Source35: kernel-%{kversion}-i686-xen0.config
 Source36: kernel-%{kversion}-i686-xenU.config
-Source37: kernel-%{kversion}-i686-xen0-PAE.config
-Source38: kernel-%{kversion}-i686-xenU-PAE.config
-Source39: kernel-%{kversion}-x86_64-xen0.config
-Source40: kernel-%{kversion}-x86_64-xenU.config
+Source37: kernel-%{kversion}-i686-xen.config
+Source38: kernel-%{kversion}-x86_64-xen0.config
+Source49: kernel-%{kversion}-x86_64-xenU.config
+Source40: kernel-%{kversion}-x86_64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -530,42 +524,42 @@
 against the kernel package.
 
 
-%package xen0-PAE
-Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support
+%package xen
+Summary: The Linux kernel compiled for Xen VM operations with PAE support
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
 Prereq: %{kernel_prereq}
 Requires: xen
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
-# the xen0-PAE kernel needs a newer mkinitrd than everything else right now
+# the xen kernel needs a newer mkinitrd than everything else right now
 Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
 AutoReqProv: no
 
-%description xen0-PAE
+%description xen
 This package includes a version of the Linux kernel which runs in
-Xen's guest0 VM with PAE support and provides device services to the
+Xen's VM with PAE support and provides device services to the
 unprivileged guests.
 
 Install this package in your Xen guest0 environment.
 
 
-%package xen0-PAE-devel
+%package xen-devel
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-xen0-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xen0-PAE
+Provides: kernel-xen-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen
+Provides: kernel-devel = %{rpmversion}-%{release}xen
 Prereq: /usr/bin/find
 
-%description xen0-PAE-devel
+%description xen-devel
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
@@ -603,39 +597,6 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the kernel package.
 
-%package xenU-PAE
-Summary: The Linux kernel compiled for unprivileged Xen guest VMs with PAE support
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Prereq: %{kernel_prereq}
-Conflicts: %{kernel_dot_org_conflicts}
-Conflicts: %{package_conflicts}
-Conflicts: %{xen_conflicts}
-# We can't let RPM do the dependencies automatic because it'll then pick up
-# a correct but undesirable perl dependency from the module headers which
-# isn't required for the kernel proper to function
-AutoReqProv: no
-
-%description xenU-PAE
-This package includes a version of the Linux kernel which runs in Xen
-unprivileged guest VMs with PAE support.  This should be installed
-both inside the unprivileged guest (for the modules) and in the guest0
-domain.
-
-%package xenU-PAE-devel
-Summary: Development package for building kernel modules to match the kernel.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: kernel-xenU-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}xenU-PAE
-Prereq: /usr/bin/find
-
-%description xenU-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
 
 %package kdump
 Summary: A minimal Linux kernel compiled for kernel crash dumps.
@@ -1258,12 +1219,11 @@
 %if %{buildxen}
   cd xen
   mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
-%if %{buildxenPAE}
+# FixMe: Juan Quintela (when no PAE is not needed anymore)
   make debug=y verbose=y crash_debug=y pae=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}-PAE
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}-PAE
   make clean
-%endif
   make debug=y verbose=y crash_debug=y
   install -m 644 xen.gz $RPM_BUILD_ROOT/boot/xen.gz-%{KVERREL}
   install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}
@@ -1282,11 +1242,7 @@
 %endif
 
 %if %{includexen}
-%if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz xen0-PAE
-BuildKernel vmlinuz vmlinuz xenU-PAE
-%endif
-
+BuildKernel vmlinuz vmlinuz xen
 %if %{buildxen}
 BuildKernel vmlinuz vmlinuz xen0
 BuildKernel vmlinuz vmlinuz xenU
@@ -1406,28 +1362,19 @@
   popd > /dev/null
 fi
 
-%post xen0-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0-PAE
-/sbin/new-kernel-pkg --package kernel-xen0-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}xen0-PAE
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen0-PAE-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu} > /dev/null
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
+%post xen
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
+if [ -e /proc/xen/xsd_kva -o ! -d /proc/xen ]; then 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+else 
+	/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
 fi
-
-%post xenU-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU-PAE
-/sbin/new-kernel-pkg --package kernel-xenU-PAE --mkinitrd --depmod --install %{KVERREL}xenU-PAE
 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
 
-%post xenU-PAE-devel
+%post xen-devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
 if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  pushd /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu} > /dev/null
+  pushd /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu} > /dev/null
   /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
   popd > /dev/null
 fi
@@ -1464,13 +1411,9 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xenU
 
-%preun xen0-PAE
+%preun xen
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0-PAE
-
-%preun xenU-PAE
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU-PAE
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
 
 
 ###
@@ -1555,45 +1498,26 @@
 /usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
-%files xen0-PAE
+%files xen
 %defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE
-/boot/System.map-%{KVERREL}xen0-PAE
-/boot/config-%{KVERREL}xen0-PAE
+/%{image_install_path}/vmlinuz-%{KVERREL}xen
+/boot/System.map-%{KVERREL}xen
+/boot/config-%{KVERREL}xen
 /boot/xen.gz-%{KVERREL}-PAE
 /boot/xen-syms-%{KVERREL}-PAE
-%dir /lib/modules/%{KVERREL}xen0-PAE
-/lib/modules/%{KVERREL}xen0-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0-PAE/build
-/lib/modules/%{KVERREL}xen0-PAE/source
+%dir /lib/modules/%{KVERREL}xen
+/lib/modules/%{KVERREL}xen/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen/build
+/lib/modules/%{KVERREL}xen/source
 /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0-PAE/extra
-/lib/modules/%{KVERREL}xen0-PAE/updates
+/lib/modules/%{KVERREL}xen/extra
+/lib/modules/%{KVERREL}xen/updates
 
-%files xen0-PAE-devel
+%files xen-devel
 %defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 
-%files xenU-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE
-/boot/System.map-%{KVERREL}xenU-PAE
-/boot/config-%{KVERREL}xenU-PAE
-%dir /lib/modules/%{KVERREL}xenU-PAE
-/lib/modules/%{KVERREL}xenU-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xenU-PAE/build
-/lib/modules/%{KVERREL}xenU-PAE/source
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU-PAE/extra
-/lib/modules/%{KVERREL}xenU-PAE/updates
-
-%files xenU-PAE-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu}
-%endif
 %endif
 
 %if %{buildkdump}