[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec,1.2280,1.2281



Author: quintela

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

Modified Files:
	kernel-2.6.spec 
Log Message:
xen0/xenU kernels are history


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2280
retrieving revision 1.2281
diff -u -r1.2280 -r1.2281
--- kernel-2.6.spec	14 Jun 2006 10:26:03 -0000	1.2280
+++ kernel-2.6.spec	14 Jun 2006 10:43:15 -0000	1.2281
@@ -230,15 +230,9 @@
 
 Source32: kernel-%{kversion}-ia64.config
 
-#Source33: kernel-%{kversion}-i686-xen0.config
-#Source34: kernel-%{kversion}-i686-xenU.config
+Source33: kernel-%{kversion}-i686-xen.config
+Source34: kernel-%{kversion}-x86_64-xen.config
 Source35: kernel-%{kversion}-i686-kdump.config
-#Source36: kernel-%{kversion}-i686-xen0-PAE.config
-#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
@@ -613,152 +607,6 @@
 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
-
-Group: System Environment/Kernel
-Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xen0
-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 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 xen0-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
-Prereq: /usr/bin/find
-
-%description xen0-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-
-%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}xen0-PAE
-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
-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
-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.
-
-Install this package in your Xen guest0 environment.
-
-
-%package xen0-PAE-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
-Prereq: /usr/bin/find
-
-%description xen0-PAE-devel
-This package provides kernel headers and makefiles sufficient to build modules
-against the kernel package.
-
-%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}xenU
-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
-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
-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
-Prereq: /usr/bin/find
-
-%description xenU-devel
-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.
 
@@ -1443,8 +1291,7 @@
 
 %if %{includexen}
 %if %{buildxenPAE}
-BuildKernel vmlinuz vmlinuz xen0-PAE
-BuildKernel vmlinuz vmlinuz xenU-PAE
+BuildKernel vmlinuz vmlinuz xen-PAE
 %endif
 
 %if %{buildxen}
@@ -1577,58 +1424,6 @@
   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
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xen0-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  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 xenU
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
-/sbin/new-kernel-pkg --package kernel-xenU --mkinitrd --depmod --install %{KVERREL}xenU
-[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-
-%post xenU-devel
-[ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
-if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ] ; then
-  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 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
-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
-[ -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
-  /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
-  popd > /dev/null
-fi
-
 %post kdump
 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump
 /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump
@@ -1661,22 +1456,6 @@
 /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
-
-%preun xenU
-/sbin/modprobe loop 2> /dev/null > /dev/null  || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xenU
-
-%preun xen0-PAE
-/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
-
 
 ###
 ### file lists
@@ -1779,95 +1558,6 @@
 /usr/src/kernels/%{KVERREL}xen-%{_target_cpu}
 %endif
 
-%if %{buildxenPAE}
-%files xen0
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0
-/boot/System.map-%{KVERREL}xen0
-/boot/symvers-%{KVERREL}xen0.gz
-/boot/symsets-%{KVERREL}xen0.tar.gz
-/boot/config-%{KVERREL}xen0
-/boot/xen.gz-%{KVERREL}
-/boot/xen-syms-%{KVERREL}
-%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}xen0/extra
-/lib/modules/%{KVERREL}xen0/updates
-/lib/modules/%{KVERREL}xen0/weak-updates
-
-%files xen0-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-%{_target_cpu}
-
-%files xenU
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU
-/boot/System.map-%{KVERREL}xenU
-/boot/symvers-%{KVERREL}xenU.gz
-/boot/symsets-%{KVERREL}xenU.tar.gz
-/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}xenU/extra
-/lib/modules/%{KVERREL}xenU/updates
-/lib/modules/%{KVERREL}xenU/weak-updates
-
-%files xenU-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xenU-%{_target_cpu}
-
-%files xen0-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xen0-PAE
-/boot/System.map-%{KVERREL}xen0-PAE
-/boot/symvers-%{KVERREL}xen0-PAE.gz
-/boot/symsets-%{KVERREL}xen0-PAE.tar.gz
-/boot/config-%{KVERREL}xen0-PAE
-/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
-/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
-/lib/modules/%{KVERREL}xen0-PAE/extra
-/lib/modules/%{KVERREL}xen0-PAE/updates
-/lib/modules/%{KVERREL}xen0-PAE/weak-updates
-
-%files xen0-PAE-devel
-%defattr(-,root,root)
-%verify(not mtime) /usr/src/kernels/%{KVERREL}-xen0-PAE-%{_target_cpu}
-/usr/src/kernels/%{KVERREL}xen0-PAE-%{_target_cpu}
-
-%files xenU-PAE
-%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{KVERREL}xenU-PAE
-/boot/System.map-%{KVERREL}xenU-PAE
-/boot/symvers-%{KVERREL}xenU-PAE.gz
-/boot/symsets-%{KVERREL}xenU-PAE.tar.gz
-/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
-/lib/modules/%{KVERREL}xenU-PAE/weak-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}
@@ -1904,6 +1594,10 @@
 %endif
 
 %changelog
+* Wed Jun 14 2006 Juan Quintela <quintela troll mitica> - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_%tag
+- remove xen0/xenU/xen0-PAE/xenU-PAE packages
+- remove %%requires xen from xen kernels
+
 * Wed Jun 14 2006 Juan Quintela <quintela redhat com>
 - rename xen0 & xenU to single xen kernels.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]