rpms/kernel/devel Makefile.config, 1.38, 1.39 kernel-2.6.spec, 1.2273, 1.2274

Tue Jun 13 22:47:00 UTC 2006

Author: quintela

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

Modified Files:
	Makefile.config kernel-2.6.spec 
Log Message:
rename xen0/xenU to single xen kernel


Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39

--- Makefile.config	6 Jun 2006 04:35:47 -0000	1.38
+++ Makefile.config	13 Jun 2006 22:46:56 -0000	1.39
@@ -12,9 +12,7 @@
 	$(CFG)-s390.config $(CFG)-s390x.config \
 	$(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)-x86_64-xen0.config $(CFG)-x86_64-xenU.config
+	$(CFG)-i686-xen.config $(CFG)-x86_64-xen.config
 
 PLATFORMS	= x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
 TEMPFILES	= $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -123,21 +121,9 @@
 kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
 	perl scripts/merge.pl $^ ia64 > $@
 
-kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen.config: configs/config-xen-xen 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
+kernel-$(VERSION)-x86_64-xen.config: configs/config-xen-xen temp-x86_64-xen-generic
 	perl scripts/merge.pl $^ x86_64 > $@
 


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2273
retrieving revision 1.2274
diff -u -r1.2273 -r1.2274
--- kernel-2.6.spec	13 Jun 2006 20:05:13 -0000	1.2273
+++ kernel-2.6.spec	13 Jun 2006 22:46:56 -0000	1.2274
@@ -237,6 +237,8 @@
 Source37: kernel-%{kversion}-i686-xenU-PAE.config
 Source38: kernel-%{kversion}-x86_64-xen0.config
 Source39: kernel-%{kversion}-x86_64-xenU.config
+Source40: kernel-%{kversion}-i686-xen.config
+Source41: kernel-%{kversion}-x86_64-xen.config
 
 #Source66: kernel-%{kversion}-sparc.config
 #Source67: kernel-%{kversion}-sparc64.config
@@ -577,6 +579,41 @@
 This package provides kernel headers and makefiles sufficient to build modules
 against the SMP kernel package.
 
+%package xen
+Summary: The Linux kernel compiled for Xen VM operations
+
+Group: System Environment/Kernel
+Provides: kernel = %{version}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen
+Prereq: %{kernel_prereq}
+Requires: xen
+Conflicts: %{kernel_dot_org_conflicts}
+Conflicts: %{package_conflicts}
+Conflicts: %{xen_conflicts}
+# the hypervisor 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 xen
+This package includes a version of the Linux kernel which
+runs in Xen VM. It works for both priviledged and unpriviledged guests.
+
+%package xen-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+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 xen-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
 %package xen0
 Summary: The Linux kernel compiled for Xen guest0 VM operations
 
@@ -1525,6 +1562,20 @@
   popd > /dev/null
 fi
 
+%post xen
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen
+/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install %{KVERREL}xen
+/sbin/new-kernel-pkg --package kernel-xen --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post xen-devel
+[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
+if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
+  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
+
 %post xen0
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0
 /sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}xen0
@@ -1605,6 +1656,10 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}kdump
 
+%preun xen
+/sbin/modprobe loop 2> /dev/null > /dev/null  || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen
+
 %preun xen0
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
@@ -1699,6 +1754,29 @@
 
 %if %{includexen}
 %if %{buildxen}
+%files xen
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}xen
+/boot/System.map-%{KVERREL}xen
+/boot/symvers-%{KVERREL}xen.gz
+/boot/symsets-%{KVERREL}xen.tar.gz
+/boot/config-%{KVERREL}xen
+/boot/xen.gz-%{KVERREL}
+/boot/xen-syms-%{KVERREL}
+%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}xen/extra
+/lib/modules/%{KVERREL}xen/updates
+/lib/modules/%{KVERREL}xen/weak-updates
+
+%files xen-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
+
 %files xen0
 %defattr(-,root,root)
 /%{image_install_path}/vmlinuz-%{KVERREL}xen0


