rpms/kernel-xen/devel kernel-xen.spec,1.13.2.3,1.13.2.4
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Dec 14 18:19:17 UTC 2005
Author: sct
Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6536
Modified Files:
Tag: private-kernel-xen-2_6_12-1_13_FC5-sct-branch
kernel-xen.spec
Log Message:
Rename dom0/domU subpackages to hypervisor/guest for compatibility
with existing kernel-xen packages in rawhide.
Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- kernel-xen.spec 13 Dec 2005 19:39:12 -0000 1.13.2.3
+++ kernel-xen.spec 14 Dec 2005 18:19:15 -0000 1.13.2.4
@@ -4,7 +4,7 @@
# These are the kernels that are built IF the architecture allows it.
%define buildup 0
-%define buildsmp 1
+%define buildsmp 0
%define includexen 1
%define builddoc 0
%define buildkdump 0
@@ -48,9 +48,9 @@
%ifarch i686
%define buildxen %{includexen}
-%define buildkdump 1
%else
%define buildxen 0
+%define buildkdump 0
%endif
%ifarch %{all_x86}
@@ -149,7 +149,7 @@
#
%define kernel_prereq fileutils, module-init-tools, initscripts >= 8.11.1-1, mkinitrd >= 4.2.21-1
-Name: kernel
+Name: kernel-xen
Group: System Environment/Kernel
License: GPLv2
Version: %{rpmversion}
@@ -443,12 +443,12 @@
This package provides kernel headers and makefiles sufficient to build modules
against the SMP kernel package.
-%package xen0
+%package hypervisor
Summary: The Linux kernel compiled for Xen guest0 VM operations
Group: System Environment/Kernel
Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
Prereq: %{kernel_prereq}
Requires: xen
Conflicts: %{kernel_dot_org_conflicts}
@@ -461,7 +461,7 @@
# isn't required for the kernel proper to function
AutoReqProv: no
-%description xen0
+%description hypervisor
This package includes a version of the Linux kernel which
runs in Xen's guest0 VM and provides device services to
the unprivileged guests.
@@ -469,25 +469,25 @@
Install this package in your Xen guest0 environment.
-%package xen0-devel
+%package hypervisor-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0
-Provides: kernel-devel = %{rpmversion}-%{release}xen0
+Provides: kernel-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
Prereq: /usr/sbin/hardlink, /usr/bin/find
-%description xen0-devel
+%description hypervisor-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
-%package xenU
+%package guest
Summary: The Linux kernel compiled for unprivileged Xen guest VMs
Group: System Environment/Kernel
Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest
Prereq: %{kernel_prereq}
Conflicts: %{kernel_dot_org_conflicts}
Conflicts: %{package_conflicts}
@@ -497,22 +497,22 @@
# isn't required for the kernel proper to function
AutoReqProv: no
-%description xenU
+%description guest
This package includes a version of the Linux kernel which
runs in Xen unprivileged guest VMs. This should be installed
both inside the unprivileged guest (for the modules) and in
the guest0 domain.
-%package xenU-devel
+%package guest-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU
-Provides: kernel-devel = %{rpmversion}-%{release}xenU
+Provides: kernel-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
+Provides: kernel-devel = %{rpmversion}-%{release}guest
Prereq: /usr/sbin/hardlink, /usr/bin/find
-%description xenU-devel
+%description guest-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
@@ -1146,25 +1146,25 @@
popd > /dev/null
fi
-%post xen0
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot %{KVERREL}xen0
+%post hypervisor
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xen0-devel
+%post hypervisor-devel
if [ -x /usr/sbin/hardlink ] ; then
- pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null
+ pushd /usr/src/kernels/%{KVERREL}-hypervisor-%{_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 xenU
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
+%post guest
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xenU-devel
+%post guest-devel
if [ -x /usr/sbin/hardlink ] ; then
- pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null
+ pushd /usr/src/kernels/%{KVERREL}-guest-%{_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
@@ -1188,13 +1188,13 @@
/sbin/modprobe loop 2> /dev/null > /dev/null || :
[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
-%preun xen0
+%preun hypervisor
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
-%preun xenU
+%preun guest
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU
+[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
###
@@ -1239,41 +1239,41 @@
%endif
%if %{buildxen}
-%files xen0
+%files hypervisor
%defattr(-,root,root)
-/%{image_install_path}/*-%{KVERREL}xen0
-/boot/System.map-%{KVERREL}xen0
-/boot/config-%{KVERREL}xen0
-%dir /lib/modules/%{KVERREL}xen0
-/lib/modules/%{KVERREL}xen0/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xen0/build
-/lib/modules/%{KVERREL}xen0/source
+/%{image_install_path}/*-%{KVERREL}hypervisor
+/boot/System.map-%{KVERREL}hypervisor
+/boot/config-%{KVERREL}hypervisor
+%dir /lib/modules/%{KVERREL}hypervisor
+/lib/modules/%{KVERREL}hypervisor/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
+/lib/modules/%{KVERREL}hypervisor/source
/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0/extra
-/lib/modules/%{KVERREL}xen0/updates
+/lib/modules/%{KVERREL}hypervisor/extra
+/lib/modules/%{KVERREL}hypervisor/updates
-%files xen0-devel
+%files hypervisor-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}hypervisor-%{_target_cpu}
-%files xenU
+%files guest
%defattr(-,root,root)
-/%{image_install_path}/*-%{KVERREL}xenU
-/boot/System.map-%{KVERREL}xenU
-/boot/config-%{KVERREL}xenU
-%dir /lib/modules/%{KVERREL}xenU
-/lib/modules/%{KVERREL}xenU/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}xenU/build
-/lib/modules/%{KVERREL}xenU/source
+/%{image_install_path}/*-%{KVERREL}guest
+/boot/System.map-%{KVERREL}guest
+/boot/config-%{KVERREL}guest
+%dir /lib/modules/%{KVERREL}guest
+/lib/modules/%{KVERREL}guest/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}guest/build
+/lib/modules/%{KVERREL}guest/source
/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xenU/extra
-/lib/modules/%{KVERREL}xenU/updates
+/lib/modules/%{KVERREL}guest/extra
+/lib/modules/%{KVERREL}guest/updates
-%files xenU-devel
+%files guest-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
%endif
%if %{buildkdump}
More information about the fedora-cvs-commits
mailing list