rpms/kernel/devel Makefile.config, 1.34, 1.35 kernel-2.6.spec, 1.2017, 1.2018
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 6 16:56:40 UTC 2006
Author: sct
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25752
Modified Files:
Makefile.config kernel-2.6.spec
Log Message:
Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency
with upstream and to make kernel subtype suffixes match the subpackage
names. (From Jeremy Katz.)
Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.config 15 Feb 2006 00:52:14 -0000 1.34
+++ Makefile.config 6 Mar 2006 16:56:38 -0000 1.35
@@ -12,9 +12,9 @@
$(CFG)-s390.config $(CFG)-s390x.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-ppc64.config $(CFG)-ia64.config \
- $(CFG)-i686-hypervisor.config $(CFG)-i686-guest.config \
- $(CFG)-i686-hypervisor-PAE.config $(CFG)-i686-guest-PAE.config \
- $(CFG)-x86_64-hypervisor.config $(CFG)-x86_64-guest.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
PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -120,21 +120,21 @@
kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic
perl scripts/merge.pl $^ ia64 > $@
-kernel-$(VERSION)-i686-hypervisor.config: configs/config-xen-xen0 temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen0.config: configs/config-xen-xen0 temp-x86-xen-generic
perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-i686-hypervisor-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic
+kernel-$(VERSION)-i686-xen0-PAE.config: configs/config-xen-xen0-PAE temp-x86-xen-generic
perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-i686-guest.config: configs/config-xen-xenU temp-x86-xen-generic
+kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-i686-guest-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic
+kernel-$(VERSION)-i686-xenU-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic
perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-x86_64-hypervisor.config: configs/config-xen-xen0 temp-x86_64-xen-generic
+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-guest.config: configs/config-xen-xenU temp-x86_64-xen-generic
+kernel-$(VERSION)-x86_64-xenU.config: configs/config-xen-xenU 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.2017
retrieving revision 1.2018
diff -u -r1.2017 -r1.2018
--- kernel-2.6.spec 6 Mar 2006 16:31:46 -0000 1.2017
+++ kernel-2.6.spec 6 Mar 2006 16:56:38 -0000 1.2018
@@ -203,17 +203,17 @@
Source28: kernel-%{kversion}-ppc.config
Source29: kernel-%{kversion}-ppc-smp.config
Source30: kernel-%{kversion}-ia64.config
-Source31: kernel-%{kversion}-i686-hypervisor.config
-Source32: kernel-%{kversion}-i686-guest.config
+Source31: kernel-%{kversion}-i686-xen0.config
+Source32: kernel-%{kversion}-i686-xenU.config
Source33: kernel-%{kversion}-i686-kdump.config
Source33: kernel-%{kversion}-x86_64-kdump.config
#Source34: kernel-%{kversion}-sparc.config
#Source35: kernel-%{kversion}-sparc64.config
#Source36: kernel-%{kversion}-sparc64-smp.config
-Source37: kernel-%{kversion}-i686-hypervisor-PAE.config
-Source38: kernel-%{kversion}-i686-guest-PAE.config
-Source39: kernel-%{kversion}-x86_64-hypervisor.config
-Source40: kernel-%{kversion}-x86_64-guest.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
#
# Patches 0 through 100 are meant for core subsystem upgrades
@@ -497,12 +497,12 @@
This package provides kernel headers and makefiles sufficient to build modules
against the SMP kernel package.
-%package xen-hypervisor
+%package xen0
Summary: The Linux kernel compiled for Xen guest0 VM operations
Group: System Environment/Kernel
Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0
Prereq: %{kernel_prereq}
Requires: xen
Conflicts: %{kernel_dot_org_conflicts}
@@ -515,47 +515,46 @@
# isn't required for the kernel proper to function
AutoReqProv: no
-%description xen-hypervisor
+%description xen0
This package includes a version of the Linux kernel which
runs in Xen's guest0 VM and provides device services to
the unprivileged guests.
Install this package in your Xen guest0 environment.
-
-%package xen-hypervisor-devel
+%package xen0-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xen-hypervisor-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor
-Provides: kernel-devel = %{rpmversion}-%{release}hypervisor
+Provides: kernel-xen0-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xen0
+Provides: kernel-devel = %{rpmversion}-%{release}xen0
Prereq: /usr/sbin/hardlink, /usr/bin/find
-%description xen-hypervisor-devel
+%description xen0-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
-%package xen-hypervisor-PAE
+%package xen0-PAE
Summary: The Linux kernel compiled for Xen guest0 VM operations with PAE support
Group: System Environment/Kernel
Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0-PAE
Prereq: %{kernel_prereq}
Requires: xen
Conflicts: %{kernel_dot_org_conflicts}
Conflicts: %{package_conflicts}
Conflicts: %{xen_conflicts}
-# the hypervisor-PAE kernel needs a newer mkinitrd than everything else right now
+# the xen0-PAE 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-hypervisor-PAE
+%description xen0-PAE
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
unprivileged guests.
@@ -563,25 +562,25 @@
Install this package in your Xen guest0 environment.
-%package xen-hypervisor-PAE-devel
+%package xen0-PAE-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xen-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE
+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
Prereq: /usr/sbin/hardlink, /usr/bin/find
-%description xen-hypervisor-PAE-devel
+%description xen0-PAE-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
-%package xen-guest
+%package xenU
Summary: The Linux kernel compiled for unprivileged Xen guest VMs
Group: System Environment/Kernel
Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}guest
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU
Prereq: %{kernel_prereq}
Conflicts: %{kernel_dot_org_conflicts}
Conflicts: %{package_conflicts}
@@ -591,31 +590,31 @@
# isn't required for the kernel proper to function
AutoReqProv: no
-%description xen-guest
+%description xenU
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 xen-guest-devel
+%package xenU-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xen-guest-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest
-Provides: kernel-devel = %{rpmversion}-%{release}guest
+Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU
+Provides: kernel-devel = %{rpmversion}-%{release}xenU
Prereq: /usr/sbin/hardlink, /usr/bin/find
-%description xen-guest-devel
+%description xenU-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
-%package xen-guest-PAE
+%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}guest-PAE
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU-PAE
Prereq: %{kernel_prereq}
Conflicts: %{kernel_dot_org_conflicts}
Conflicts: %{package_conflicts}
@@ -625,22 +624,22 @@
# isn't required for the kernel proper to function
AutoReqProv: no
-%description xen-guest-PAE
+%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 xen-guest-PAE-devel
+%package xenU-PAE-devel
Summary: Development package for building kernel modules to match the kernel.
Group: System Environment/Kernel
AutoReqProv: no
-Provides: kernel-xen-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
-Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE
+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/sbin/hardlink, /usr/bin/find
-%description xen-guest-PAE-devel
+%description xenU-PAE-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
@@ -1294,13 +1293,13 @@
%endif
%if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz hypervisor-PAE
-BuildKernel vmlinuz vmlinuz guest-PAE
+BuildKernel vmlinuz vmlinuz xen0-PAE
+BuildKernel vmlinuz vmlinuz xenU-PAE
%endif
%if %{buildxen}
-BuildKernel vmlinuz vmlinuz hypervisor
-BuildKernel vmlinuz vmlinuz guest
+BuildKernel vmlinuz vmlinuz xen0
+BuildKernel vmlinuz vmlinuz xenU
%endif
%if %{buildkdump}
@@ -1388,54 +1387,54 @@
popd > /dev/null
fi
-%post xen-hypervisor
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor
+%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
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xen-hypervisor-devel
+%post xen0-devel
[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
- pushd /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu} > /dev/null
+ pushd /usr/src/kernels/%{KVERREL}-xen0-%{_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 xen-guest
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
-/sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest
+%post xenU
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
+/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}U
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xen-guest-devel
+%post xenU-devel
[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
- pushd /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu} > /dev/null
+ pushd /usr/src/kernels/%{KVERREL}-xenU-%{_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 xen-hypervisor-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
-/sbin/new-kernel-pkg --package kernel-xen-hypervisor-PAE --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL}-PAE %{KVERREL}hypervisor-PAE
+%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 xen-hypervisor-PAE-devel
+%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}-hypervisor-PAE-%{_target_cpu} > /dev/null
+ 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
fi
-%post xen-guest-PAE
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
-/sbin/new-kernel-pkg --package kernel-xen-guest-PAE --mkinitrd --depmod --install %{KVERREL}guest-PAE
+%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 xen-guest-PAE-devel
+%post xenU-PAE-devel
[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
- pushd /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu} > /dev/null
+ pushd /usr/src/kernels/%{KVERREL}-xenU-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
fi
@@ -1460,21 +1459,21 @@
/sbin/modprobe loop 2> /dev/null > /dev/null || :
/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
-%preun xen-hypervisor
+%preun xen0
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
-%preun xen-guest
+%preun xenU
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU
-%preun xen-hypervisor-PAE
+%preun xen0-PAE
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0-PAE
-%preun xen-guest-PAE
+%preun xenU-PAE
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU-PAE
###
@@ -1519,83 +1518,83 @@
%endif
%if %{buildxen}
-%files xen-hypervisor
+%files xen0
%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor
-/boot/System.map-%{KVERREL}hypervisor
-/boot/config-%{KVERREL}hypervisor
+/%{image_install_path}/vmlinuz-%{KVERREL}xen0
+/boot/System.map-%{KVERREL}xen0
+/boot/config-%{KVERREL}xen0
/boot/xen.gz-%{KVERREL}
/boot/xen-syms-%{KVERREL}
-%dir /lib/modules/%{KVERREL}hypervisor
-/lib/modules/%{KVERREL}hypervisor/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}hypervisor/build
-/lib/modules/%{KVERREL}hypervisor/source
+%dir /lib/modules/%{KVERREL}xen0
+/lib/modules/%{KVERREL}xen0/kernel
+%verify(not mtime) /lib/modules/%{KVERREL}xen0/build
+/lib/modules/%{KVERREL}xen0/source
/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}hypervisor/extra
-/lib/modules/%{KVERREL}hypervisor/updates
+/lib/modules/%{KVERREL}xen0/extra
+/lib/modules/%{KVERREL}xen0/updates
-%files xen-hypervisor-devel
+%files xen0-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}hypervisor-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
-%files xen-guest
+%files xenU
%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{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
+/%{image_install_path}/vmlinuz-%{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
/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}guest/extra
-/lib/modules/%{KVERREL}guest/updates
+/lib/modules/%{KVERREL}xenU/extra
+/lib/modules/%{KVERREL}xenU/updates
-%files xen-guest-devel
+%files xenU-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
%endif
%if %{buildxenPAE}
-%files xen-hypervisor-PAE
+%files xen0-PAE
%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
-/boot/System.map-%{KVERREL}hypervisor-PAE
-/boot/config-%{KVERREL}hypervisor-PAE
+/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE
+/boot/System.map-%{KVERREL}xen0-PAE
+/boot/config-%{KVERREL}xen0-PAE
/boot/xen.gz-%{KVERREL}-PAE
/boot/xen-syms-%{KVERREL}-PAE
-%dir /lib/modules/%{KVERREL}hypervisor-PAE
-/lib/modules/%{KVERREL}hypervisor-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}hypervisor-PAE/build
-/lib/modules/%{KVERREL}hypervisor-PAE/source
+%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
/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}hypervisor-PAE/extra
-/lib/modules/%{KVERREL}hypervisor-PAE/updates
+/lib/modules/%{KVERREL}xen0-PAE/extra
+/lib/modules/%{KVERREL}xen0-PAE/updates
-%files xen-hypervisor-PAE-devel
+%files xen0-PAE-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu}
-%files xen-guest-PAE
+%files xenU-PAE
%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}guest-PAE
-/boot/System.map-%{KVERREL}guest-PAE
-/boot/config-%{KVERREL}guest-PAE
-%dir /lib/modules/%{KVERREL}guest-PAE
-/lib/modules/%{KVERREL}guest-PAE/kernel
-%verify(not mtime) /lib/modules/%{KVERREL}guest-PAE/build
-/lib/modules/%{KVERREL}guest-PAE/source
+/%{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}guest-PAE/extra
-/lib/modules/%{KVERREL}guest-PAE/updates
+/lib/modules/%{KVERREL}xenU-PAE/extra
+/lib/modules/%{KVERREL}xenU-PAE/updates
-%files xen-guest-PAE-devel
+%files xenU-PAE-devel
%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu}
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}xenU-PAE-%{_target_cpu}
%endif
%if %{buildkdump}
@@ -1631,6 +1630,9 @@
%changelog
* Mon Mar 6 2006 Stephen Tweedie <sct at redhat.com>
- Merge xen rebase with 1.2016 kernel
+- Rename kernel-xen-(hypervisor|guest) to kernel-xen(0|U) for consistency
+ with upstream and to make kernel subtype suffixes match the subpackage
+ names. (From Jeremy Katz.)
* Sun Mar 5 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc5-git8
More information about the fedora-cvs-commits
mailing list