rpms/kernel/devel Makefile.config, 1.32, 1.33 kernel-2.6.spec, 1.1928, 1.1929
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 10 04:58:19 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13514
Modified Files:
Makefile.config kernel-2.6.spec
Log Message:
start syncing kernel-xen
Index: Makefile.config
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.config 31 Jan 2006 22:13:01 -0000 1.32
+++ Makefile.config 10 Feb 2006 04:58:14 -0000 1.33
@@ -12,8 +12,9 @@
$(CFG)-s390.config $(CFG)-s390x.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-ppc64.config $(CFG)-ia64.config \
- $(CFG)-i686-xen0.config $(CFG)-i686-xenU.config \
- $(CFG)-x86_64-xen0.config $(CFG)-x86_64-xenU.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
PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390 ia64 # sparc sparc64
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -118,15 +119,21 @@
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
- perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-i686-hypervisor.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
+ perl scripts/merge.pl $^ i386 > $@
+
+kernel-$(VERSION)-i686-guest.config: configs/config-xen-xenU temp-x86-xen-generic
+ perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-i686-xenU.config: configs/config-xen-xenU temp-x86-xen-generic
- perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-i686-guest-PAE.config: configs/config-xen-xenU-PAE temp-x86-xen-generic
+ perl scripts/merge.pl $^ i386 > $@
-kernel-$(VERSION)-x86_64-xen0.config: configs/config-xen-xen0 temp-x86_64-xen-generic
- perl scripts/merge.pl $^ xen > $@
+kernel-$(VERSION)-x86_64-hypervisor.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 $^ xen > $@
+kernel-$(VERSION)-x86_64-guest.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.1928
retrieving revision 1.1929
diff -u -r1.1928 -r1.1929
--- kernel-2.6.spec 10 Feb 2006 03:07:11 -0000 1.1928
+++ kernel-2.6.spec 10 Feb 2006 04:58:14 -0000 1.1929
@@ -6,6 +6,8 @@
%define buildup 1
%define buildsmp 1
%define includexen 0
+# includexenPAE requieres includexen enabled
+%define includexenPAE 0
%define builddoc 0
%define buildkdump 0
@@ -24,7 +26,7 @@
%define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys}
%define signmodules 0
%define make_target bzImage
-%define kernel_image arch/$Arch/boot/bzImage
+%define kernel_image x86
%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
@@ -48,9 +50,11 @@
%ifarch i686
%define buildxen %{includexen}
+%define buildxenPAE %{includexenPAE}
%define buildkdump 1
%else
%define buildxen 0
+%define buildxenPAE 0
%endif
%ifarch %{all_x86}
@@ -193,13 +197,15 @@
Source28: kernel-%{kversion}-ppc.config
Source29: kernel-%{kversion}-ppc-smp.config
Source30: kernel-%{kversion}-ia64.config
-Source31: kernel-%{kversion}-i686-xen0.config
-Source32: kernel-%{kversion}-i686-xenU.config
+Source31: kernel-%{kversion}-i686-hypervisor.config
+Source32: kernel-%{kversion}-i686-guest.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
#
# Patches 0 through 100 are meant for core subsystem upgrades
@@ -461,25 +467,25 @@
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}
Conflicts: %{package_conflicts}
Conflicts: %{xen_conflicts}
-# the xen0 kernel needs a newer mkinitrd than everything else right now
+# 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
+%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.
@@ -487,25 +493,65 @@
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 hypervisor-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
+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
+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 hypervisor-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 hypervisor-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-hypervisor-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}hypervisor-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}hypervisor-PAE
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description hypervisor-PAE-devel
+This package provides kernel headers and makefiles sufficient to build modules
+against the kernel package.
+
+%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}
@@ -515,22 +561,56 @@
# 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.
+
+%package guest-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
+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 guest-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 guest-PAE-devel
+Summary: Development package for building kernel modules to match the kernel.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: kernel-guest-PAE-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}guest-PAE
+Provides: kernel-devel = %{rpmversion}-%{release}guest-PAE
+Prereq: /usr/sbin/hardlink, /usr/bin/find
+
+%description guest-PAE-devel
This package provides kernel headers and makefiles sufficient to build modules
against the kernel package.
@@ -932,28 +1012,27 @@
make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
-cd linux-%{kversion}.%{_target_cpu}
-
-
-
BuildKernel() {
+ MakeTarget=$1
+ KernelImage=$2
+ Flavour=$3
# Pick the right config file for the kernel we're building
- if [ -n "$1" ] ; then
- Config=kernel-%{kversion}-%{_target_cpu}-$1.config
- DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu}
- DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu}
+ if [ -n "$Flavour" ] ; then
+ Config=kernel-%{kversion}-%{_target_cpu}-$Flavour.config
+ DevelDir=/usr/src/kernels/%{KVERREL}-$Flavour-%{_target_cpu}
+ DevelLink=/usr/src/kernels/%{KVERREL}$Flavour-%{_target_cpu}
else
Config=kernel-%{kversion}-%{_target_cpu}.config
DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu}
DevelLink=
fi
- KernelVer=%{version}-%{release}$1
- echo BUILDING A KERNEL FOR $1 %{_target_cpu}...
+ KernelVer=%{version}-%{release}$Flavour
+ echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
# make sure EXTRAVERSION says what we want it to say
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}$1/" Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}$Flavour/" Makefile
# and now to start the build process
@@ -963,10 +1042,14 @@
Arch=`head -1 .config | cut -b 3-`
echo USING ARCH=$Arch
+ if [ "$KernelImage" == "x86" ]; then
+ KernelImage=arch/$Arch/boot/bzImage
+ fi
+
make -s ARCH=$Arch nonint_oldconfig > /dev/null
make -s ARCH=$Arch include/linux/version.h
- make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
+ make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget
make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
make ARCH=$Arch buildcheck
@@ -978,12 +1061,12 @@
mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
- cp %{kernel_image} $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
+ cp $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
if [ -f arch/$Arch/boot/zImage.stub ]; then
cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
fi
- if [ "$1" == "kdump" ]; then
+ if [ "$Flavour" == "kdump" ]; then
cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer
rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer
fi
@@ -1111,21 +1194,28 @@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/boot
+cd linux-%{kversion}.%{_target_cpu}
+
%if %{buildup}
-BuildKernel
+BuildKernel %make_target %kernel_image
%endif
%if %{buildsmp}
-BuildKernel smp
+BuildKernel %make_target %kernel_image smp
+%endif
+
+%if %{buildxenPAE}
+BuildKernel vmlinuz vmlinuz hypervisor-PAE
+BuildKernel vmlinuz vmlinuz guest-PAE
%endif
%if %{buildxen}
-BuildKernel xen0
-BuildKernel xenU
+BuildKernel vmlinuz vmlinuz hypervisor
+BuildKernel vmlinuz vmlinuz guest
%endif
%if %{buildkdump}
-BuildKernel kdump
+BuildKernel %make_target %kernel_image kdump
%endif
###
@@ -1209,27 +1299,52 @@
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 %{KVERREL}xen0
+%post hypervisor
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor
+/sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post hypervisor-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
+ /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
+ popd > /dev/null
+fi
+
+%post guest
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest
+[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
+
+%post guest-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
+ /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done
+ popd > /dev/null
+fi
+
+%post hypervisor-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor-PAE
+/sbin/new-kernel-pkg --package kernel-hypervisor-PAE --mkinitrd --depmod --install --multiboot %{KVERREL}hypervisor-PAE
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xen0-devel
+%post hypervisor-PAE-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
+ pushd /usr/src/kernels/%{KVERREL}-hypervisor-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
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xenU
+%post guest-PAE
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest-PAE
[ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X
-%post xenU-devel
+%post guest-PAE-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
+ pushd /usr/src/kernels/%{KVERREL}-guest-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
@@ -1254,13 +1369,21 @@
/sbin/modprobe loop 2> /dev/null > /dev/null || :
/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp
-%preun xen0
+%preun hypervisor
+/sbin/modprobe loop 2> /dev/null > /dev/null || :
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor
+
+%preun guest
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest
-%preun xenU
+%preun hypervisor-PAE
/sbin/modprobe loop 2> /dev/null > /dev/null || :
-/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}hypervisor-PAE
+
+%preun guest-PAE
+/sbin/modprobe loop 2> /dev/null > /dev/null || :
+/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}guest-PAE
###
@@ -1305,41 +1428,79 @@
%endif
%if %{buildxen}
-%files xen0
+%files hypervisor
%defattr(-,root,root)
-/%{image_install_path}/vmlinuz-%{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}/vmlinuz-%{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}/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
+/%{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
/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 %{buildxenPAE}
+%files hypervisor-PAE
+%defattr(-,root,root)
+/%{image_install_path}/vmlinuz-%{KVERREL}hypervisor-PAE
+/boot/System.map-%{KVERREL}hypervisor-PAE
+/boot/config-%{KVERREL}hypervisor-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
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}hypervisor-PAE/extra
+/lib/modules/%{KVERREL}hypervisor-PAE/updates
+
+%files hypervisor-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-hypervisor-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}hypervisor-PAE-%{_target_cpu}
+
+%files guest-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
+/etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf
+/lib/modules/%{KVERREL}guest-PAE/extra
+/lib/modules/%{KVERREL}guest-PAE/updates
+
+%files guest-PAE-devel
+%defattr(-,root,root)
+%verify(not mtime) /usr/src/kernels/%{KVERREL}-guest-PAE-%{_target_cpu}
+/usr/src/kernels/%{KVERREL}guest-PAE-%{_target_cpu}
%endif
%if %{buildkdump}
@@ -1373,6 +1534,13 @@
%endif
%changelog
+* Fri Feb 10 2006 Dave Jones <davej at redhat.com>
+- Begin the kernel-xen & kernel merge by merging the easy bits.
+
+* Fri Feb 10 2006 Juan Quintela <quintela at redhat.com>
+- rebase rawhide 1.1924.
+- merge with rawhide spec file.
+
* Thu Feb 9 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc2-git7
- More airo encryption fixing from Dan Williams.
@@ -1380,9 +1548,35 @@
- Disable DRM for certain Radeons that don't work right now.
- Further fixing of the selinux mprotect patch
+* Wed Feb 8 2006 Rik van Riel <riel at redhat.com>
+- fix oops on SMP boot (#180535)
+
+* Wed Feb 8 2006 Jeremy Katz <katzj at redhat.com>
+- update to newer hypervisor snapshot, conflict with older tools
+- fix pae hypervisor new-kernel-pkg call
+
+* Wed Feb 8 2006 Juan Quintela <quintela at redhat.com>
+- make_target & kernel_image passed as arguments to BuildKernel.
+
+* Wed Feb 8 2006 Juan Quintela <quintela at redhat.com>
+- removed SMP_ALTERNATIVES from smp kernel.
+
+* Wed Feb 8 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1918.
+- add up, smp & kdump kernels.
+- add xen PAE kernels.
+
* Wed Feb 8 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc2-git6
+* Tue Feb 7 2006 Juan Quintela <quintela at redhat.com>
+- fix xen to compile with gcc-4.1.
+- disable PAE build.
+- enable debug hypervisor options.
+
+* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com>
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
* Tue Feb 7 2006 Dave Jones <davej at redhat.com>
- Touch NMI watchdogs in printk pauser.
@@ -1392,6 +1586,9 @@
* Tue Feb 7 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc2-git3
+* Mon Feb 6 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide 1.1914.
+
* Mon Feb 6 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc2-git2
@@ -1405,6 +1602,11 @@
- 2.6.16rc2-git1
- Fix deadlock in do_path_lookup()
+* Fri Feb 3 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to chrisw's latest merge tree (fix skbuff conflicts)
+- Rebase to xen-unstable hypervisor cset 8737
+- Fix merge of davej's acpi changes to xen
+
* Fri Feb 3 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc2
- Modify /etc/sysconfig/kernel on x86-64 to handle kernel-smp going away.
@@ -1413,6 +1615,17 @@
- Fix some bogus percpu data accesses.
- Suppress some network layer msgs
+* Thu Feb 2 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19892
+- Disable PAE again
+
+* Thu Feb 2 2006 Juan Quintela <quintela at redhat.com>
+- merged with rawhide 1985.
+- enable PAE for this run.
+
+* Thu Feb 2 2006 Juan Quintela <quintela at redhat.com>
+- Add PAE hypervisor & guest kernel, disabled by default.
+
* Thu Feb 2 2006 Dave Jones <davej at redhat.com>
- 2.6.16rc1-git6
- enable the periodic slab debugger again.
@@ -1435,6 +1648,10 @@
* Tue Jan 31 2006 Don Zickus <<dzickus at redhat.com>
- Enable x86-64 kdumping, and kdump related specfile cleanup.
+* Tue Jan 31 2006 Juan Quintela <quintela at redhat.com>
+- Merge with rawhide 1884.
+- kdump don't work yet at xen.
+
* Mon Jan 30 2006 Dave Jones <davej at redhat.com>
- Dan Williams' goodies for wireless drivers to make NetworkManager
work with WEP/WPA on ipw2200, and WEP on airo.
@@ -1443,6 +1660,14 @@
- New userspace audit message types.
- Fix software suspend on kernels without memory hotplug. (#178339)
+* Fri Jan 27 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase to linux-2.6-merge.hg cset 19859
+- Rebase to HV from xen-unstable.hg cset 8680
+- Delete unused linux-2.6.12-xen.patch
+
+* Thu Jan 26 2006 Juan Quintela <quintela at redhat.com>
+- "don't edit patches by hand" release.
+
* Thu Jan 26 2006 Dave Jones <davej at redhat.com>
- Fix building of kdump kernels.
- Fix slab corruption in network layer.
@@ -1450,6 +1675,9 @@
- Update ACPI to latest acpi-git tree.
- Fix the SELinux mprotect checks on executable mappings. (#178747)
+* Wed Jan 25 2006 Juan Quintela <quintela at redhat.com>
+- merge with rawhide kernel 1.1869.
+
* Wed Jan 25 2006 Dave Jones <davej at redhat.com>
- Disable page allocation debugging again.
@@ -1527,9 +1755,19 @@
- 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e)
- Disable S390
+* Wed Jan 11 2006 <sct at redhat.com>
+- Fix up kevent usage for xen net backend
+- Fix %post to create mkinitrd for domU
+
* Tue Jan 10 2006 David Woodhouse <dwmw2 at redhat.com>
- 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7)
+* Mon Jan 9 2006 Stephen Tweedie <sct at redhat.com>
+- Rebase xen to hypervisor from 20060106
+- Rebase xen kernel code to linux-2.6-merge.hg cset 16985
+- Disable power management bits that don't work in Xen
+- Remove include/asm-xen from rpm
+
* Mon Jan 9 2006 Dave Jones <davej at redhat.com>
- 2.6.15-git5
@@ -1611,6 +1849,20 @@
* Wed Dec 21 2005 Dave Jones <davej at redhat.com>
- 2.6.15-rc6-git2
+* Wed Dec 21 2005 Juan Quintela <quintela at trasno.org>
+- rebase to rawhide 1.7779.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- switch BSD license to Dual BSD/GPL as agreed with upstream.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- add EXPORT_SYMBOL for xen_net_read_mac.
+
+* Tue Dec 20 2005 Juan Quintela <quintela at redhat.com>
+- xennet is a module again.
+- merge with rawhide 1.7776 kernel.
+- HIGHMEM4G is default now.
+
* Tue Dec 20 2005 Dave Jones <davej at redhat.com>
- 2.6.15-rc6-git1
- Make APM work again.
@@ -1698,6 +1950,9 @@
* Sat Dec 03 2005 Dave Jones <davej at redhat.com>
- 2.6.15-rc4-git2
+* Fri Dec 2 2005 Stephen Tweedie <sct at redhat.com>
+- Initial merge of current linux-2.6-merge.hg tree into rawhide
+
* Fri Dec 02 2005 Dave Jones <davej at redhat.com>
- 2.6.15-rc4-git1
- sysfs debug on x86-64 too.
More information about the fedora-cvs-commits
mailing list