8:20 a.m.
Kill off most of the remnants of the separate xen package
Gone is the kernel-xen variant and xen.gz
Index: devel/kernel.spec
===================================================================
--- devel.orig/kernel.spec 2008-07-23 14:13:25.000000000 +0100
+++ devel.orig/kernel.spec 2008-07-23 14:13:25.000000000 +0100
@@ -66,8 +66,6 @@ Summary: The Linux kernel
%define with_smp %{?_without_smp: 0} %{?!_without_smp: 1}
# kernel-PAE (only valid for i686)
%define with_pae %{?_without_pae: 0} %{?!_without_pae: 1}
-# kernel-xen
-%define with_xen %{?_without_xen: 0} %{?!_without_xen: 1}
# kernel-kdump
%define with_kdump %{?_without_kdump: 0} %{?!_without_kdump: 1}
# kernel-debug
@@ -94,17 +92,10 @@ Summary: The Linux kernel
%define with_smponly %{?_with_smponly: 1} %{?!_with_smponly: 0}
# Only build the pae kernel (--with paeonly):
%define with_paeonly %{?_with_paeonly: 1} %{?!_with_paeonly: 0}
-# Only build the xen kernel (--with xenonly):
-%define with_xenonly %{?_with_xenonly: 1} %{?!_with_xenonly: 0}
# should we do C=1 builds with sparse
%define with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0}
-# Whether or not to apply the Xen patches -- leave this enabled
-%define includexen 0
-# Xen doesn't work with current upstream kernel, shut it off
-%define with_xen 0
-
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
@@ -135,11 +126,6 @@ Summary: The Linux kernel
%define make_target bzImage
-%define xen_hv_cset 11633
-%define xen_flags verbose=y crash_debug=y
-%define xen_target vmlinuz
-%define xen_image vmlinuz
-
%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}.%{_target_cpu}
%define hdrarch %_target_cpu
@@ -152,8 +138,6 @@ Summary: The Linux kernel
%endif
%if %{nopatches}
-%define includexen 0
-%define with_xen 0
%define with_bootwrapper 0
%define variant -vanilla
%else
@@ -181,7 +165,6 @@ Summary: The Linux kernel
%if %{with_baseonly}
%define with_smp 0
%define with_pae 0
-%define with_xen 0
%define with_kdump 0
%define with_debug 0
%endif
@@ -190,7 +173,6 @@ Summary: The Linux kernel
%if %{with_smponly}
%define with_up 0
%define with_pae 0
-%define with_xen 0
%define with_kdump 0
%define with_debug 0
%endif
@@ -199,16 +181,6 @@ Summary: The Linux kernel
%if %{with_paeonly}
%define with_up 0
%define with_smp 0
-%define with_xen 0
-%define with_kdump 0
-%define with_debug 0
-%endif
-
-# if requested, only build xen kernel
-%if %{with_xenonly}
-%define with_up 0
-%define with_smp 0
-%define with_pae 0
%define with_kdump 0
%define with_debug 0
%endif
@@ -230,11 +202,6 @@ Summary: The Linux kernel
%define with_pae 0
%endif
-# xen only builds on i686, x86_64 and ia64
-%ifnarch i686 x86_64 ia64
-%define with_xen 0
-%endif
-
# only build kernel-kdump on ppc64
# (no relocatable kernel support upstream yet)
%ifnarch ppc64
@@ -281,8 +248,6 @@ Summary: The Linux kernel
%define all_arch_configs kernel-%{version}-i?86*.config
%define image_install_path boot
%define hdrarch i386
-# we build always xen i686 HV with pae
-%define xen_flags verbose=y crash_debug=y pae=y
%define kernel_image arch/x86/boot/bzImage
%endif
@@ -334,10 +299,6 @@ Summary: The Linux kernel
%define image_install_path boot/efi/EFI/redhat
%define make_target compressed
%define kernel_image vmlinux.gz
-# ia64 xen HV doesn't building with debug=y at the moment
-%define xen_flags verbose=y crash_debug=y
-%define xen_target compressed
-%define xen_image vmlinux.gz
%endif
%ifarch alpha alphaev56
@@ -374,7 +335,6 @@ Summary: The Linux kernel
%define with_up 0
%define with_smp 0
%define with_pae 0
-%define with_xen 0
%define with_kdump 0
%define with_debuginfo 0
%define _enable_debug_packages 0
@@ -497,8 +457,6 @@ BuildRequires: rpm-build >= 4.4.2.1-4
%endif
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-#Source1: xen-%{xen_hv_cset}.tar.bz2
-Source2: Config.mk
Source10: COPYING.modules
Source11: genkey
@@ -509,18 +467,15 @@ Source20: Makefile.config
Source21: config-debug
Source22: config-nodebug
Source23: config-generic
-Source24: config-xen-generic
-Source25: config-rhel-generic
-Source26: config-rhel-x86-generic
+Source24: config-rhel-generic
+Source25: config-rhel-x86-generic
Source30: config-x86-generic
Source31: config-i586
Source32: config-i686
Source33: config-i686-PAE
-Source34: config-xen-x86
Source40: config-x86_64-generic
-Source41: config-xen-x86_64
Source50: config-powerpc-generic
Source51: config-powerpc32-generic
@@ -530,7 +485,6 @@ Source54: config-powerpc64-kdump
Source60: config-ia64-generic
Source61: config-ia64
-Source62: config-xen-ia64
Source70: config-s390x
@@ -823,13 +777,6 @@ It should only be installed when trying
on kernel bugs, as some of these options impact performance noticably.
-%define variant_summary The Linux kernel compiled for Xen VM operations
-%kernel_variant_package -n Xen xen
-%description xen
-This package includes a version of the Linux kernel which
-runs in a Xen VM. It works for both privileged and unprivileged guests.
-
-
%define variant_summary A minimal Linux kernel compiled for crash dumps
%kernel_variant_package kdump
%description kdump
@@ -861,13 +808,6 @@ exit 1
%endif
%endif
-%if %{with_xenonly}
-%if !%{with_xen}
-echo "Cannot build --with xenonly, xen build is disabled"
-exit 1
-%endif
-%endif
-
patch_command='patch -p1 -F1 -s'
ApplyPatch()
{
@@ -1220,19 +1160,6 @@ find . \( -name "*.orig" -o -name "*~" \
cd ..
-# Unpack the Xen tarball.
-%if %{includexen}
-cp %{SOURCE2} .
-if [ -d xen ]; then
- rm -rf xen
-fi
-%setup -D -T -q -n kernel-%{kversion} -a1
-cd xen
-# Any necessary hypervisor patches go here
-
-%endif
-
-
###
### build
###
@@ -1376,9 +1303,6 @@ BuildKernel() {
ln -sf ../../../include/asm-ppc* asm
popd
fi
-%if %{includexen}
- cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-%endif
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built
@@ -1463,17 +1387,6 @@ EOF
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/boot
-%if %{includexen}
-%if %{with_xen}
- cd xen
- mkdir -p $RPM_BUILD_ROOT/%{image_install_path} $RPM_BUILD_ROOT/boot
- make %{?_smp_mflags} %{xen_flags}
- install -m 644 xen.gz $RPM_BUILD_ROOT/%{image_install_path}/xen.gz-%{KVERREL}.xen
- install -m 755 xen-syms $RPM_BUILD_ROOT/boot/xen-syms-%{KVERREL}.xen
- cd ..
-%endif
-%endif
-
cd linux-%{kversion}.%{_target_cpu}
%if %{with_debug}
@@ -1495,12 +1408,6 @@ BuildKernel %make_target %kernel_image
BuildKernel %make_target %kernel_image smp
%endif
-%if %{includexen}
-%if %{with_xen}
-BuildKernel %xen_target %xen_image xen
-%endif
-%endif
-
%if %{with_kdump}
BuildKernel vmlinux vmlinux kdump vmlinux
%endif
@@ -1669,8 +1576,6 @@ fi}\
%kernel_variant_post -v PAEdebug -s kernel-smp -r kernel-PAEdebug
%kernel_variant_preun PAEdebug
-%kernel_variant_preun xen
-%kernel_variant_post -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e
/proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}.xen`
if [ -x /sbin/ldconfig ]
then
/sbin/ldconfig -X || exit $?
@@ -1775,7 +1680,6 @@ fi
%kernel_variant_files %{with_pae} PAE
%kernel_variant_files %{with_pae_debug} PAEdebug
%kernel_variant_files -k vmlinux %{with_kdump} kdump
-%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen %{with_xen} xen
%changelog
* Tue Jul 22 2008 Dave Jones <davej(a)redhat.com>
Index: devel/config-xen-generic
===================================================================
--- devel.orig/config-xen-generic 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/config-xen-generic 2008-07-23 14:12:23.000000000 +0100
@@ -1,74 +0,0 @@
-
-CONFIG_XEN_PCIDEV_FRONTEND=y
-# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
-
-
-CONFIG_XEN=y
-CONFIG_XEN_INTERFACE_VERSION=0x00030202
-
-#
-# XEN
-#
-CONFIG_XEN_PRIVILEGED_GUEST=y
-# CONFIG_XEN_UNPRIVILEGED_GUEST is not set
-CONFIG_XEN_PRIVCMD=y
-CONFIG_XEN_XENBUS_DEV=y
-CONFIG_XEN_BACKEND=y
-CONFIG_XEN_BLKDEV_BACKEND=m
-CONFIG_XEN_BLKDEV_TAP=m
-CONFIG_XEN_NETDEV_BACKEND=m
-# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
-CONFIG_XEN_NETDEV_LOOPBACK=m
-CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
-# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
-# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
-# CONFIG_XEN_TPMDEV_BACKEND is not set
-CONFIG_XEN_BLKDEV_FRONTEND=m
-CONFIG_XEN_NETDEV_FRONTEND=m
-CONFIG_XEN_FRAMEBUFFER=y
-CONFIG_XEN_KEYBOARD=y
-CONFIG_XEN_SCRUB_PAGES=y
-# CONFIG_XEN_DISABLE_SERIAL is not set
-CONFIG_XEN_SYSFS=y
-CONFIG_XEN_COMPAT_030002_AND_LATER=y
-# CONFIG_XEN_COMPAT_LATEST_ONLY is not set
-CONFIG_XEN_COMPAT_030002=y
-CONFIG_NO_IDLE_HZ=y
-CONFIG_XEN_UTIL=y
-CONFIG_XEN_BALLOON=y
-CONFIG_XEN_DEVMEM=y
-CONFIG_XEN_SKBUFF=y
-CONFIG_XEN_REBOOT=y
-CONFIG_XEN_SMPBOOT=y
-
-# Microcode needs sys_mlock & sys_munlock that are not exported
-# it needs to be compiled in
-# FIXME: This isn't going to work as of .19, due to firmware loader
-# not being available that early in boot. This will cause long pauses during boot.
-CONFIG_MICROCODE=y
-
-# TPM is not working, somebody have to merge the xen bits
-# CONFIG_TCG_TPM is not set
-
-# frequency scaling really needs to be done in the hypervisor instead
-# CONFIG_CPU_FREQ is not set
-
-# need to set the serial stuff up like this or serial console doesn't
-# work quite right in dom0. ick.
-CONFIG_SERIAL_8250=m
-# CONFIG_SERIAL_8250_CONSOLE is not set
-
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ_250=y
-
-# xen and kvm conflict
-# CONFIG_KVM is not set
-# CONFIG_KVM_INTEL is not set
-# CONFIG_KVM_AMD is not set
-
-
-CONFIG_XEN_KBDDEV_FRONTEND=m
-CONFIG_XEN_FBDEV_FRONTEND=m
-
-CONFIG_XEN_MAX_DOMAIN_MEMORY=8
Index: devel/config-xen-ia64
===================================================================
--- devel.orig/config-xen-ia64 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/config-xen-ia64 2008-07-23 14:12:23.000000000 +0100
@@ -1,25 +0,0 @@
-# CONFIG_IA64_GENERIC is not set
-CONFIG_IA64_DIG=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM_MANUAL=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-
-CONFIG_XEN=y
-CONFIG_XEN_IA64_DOM0_VP=y
-CONFIG_XEN_DISABLE_SERIAL=y
-# CONFIG_XEN_PCIDEV_BACKEND is not set
-# CONFIG_XEN_PCIDEV_BACKEND_VPCI is not set
-# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
-# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
-# CONFIG_XEN_TPMDEV_BACKEND is not set
-
-# internal #defines conflict with xen-ia64
-# CONFIG_FB_NEOMAGIC is not set
-
-# don't work, missing symbols
-# CONFIG_KEXEC is not set
-# CONFIG_CRASH_DUMP is not set
-
-# Missing function not exported
-# CONFIG_XEN_BLKDEV_TAP is not set
Index: devel/config-xen-x86
===================================================================
--- devel.orig/config-xen-x86 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/config-xen-x86 2008-07-23 14:12:23.000000000 +0100
@@ -1,4 +0,0 @@
-
-# CONFIG_X86_PC is not set
-CONFIG_X86_XEN=y
-# CONFIG_X86_GENERICARCH is not set
Index: devel/config-xen-x86_64
===================================================================
--- devel.orig/config-xen-x86_64 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/config-xen-x86_64 2008-07-23 14:12:23.000000000 +0100
@@ -1,10 +0,0 @@
-# things we want different from i686 xen
-
-CONFIG_X86_64=y
-
-# CONFIG_X86_XEN is not set
-CONFIG_X86_64_XEN=y
-
-CONFIG_GENERIC_CPU=y
-
-# CONFIG_HVC_XEN is not set
Index: devel/scripts/rebase-xen-hv.sh
===================================================================
--- devel.orig/scripts/rebase-xen-hv.sh 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/scripts/rebase-xen-hv.sh 2008-07-23 14:12:23.000000000 +0100
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-# it only rebases de hypervisor now
-
-set -x
-
-pushd xen || exit 1
-make clean
-popd
-
-CSET=`hg tip | grep "changeset:" | cut -f2 -d':' | sed 's/
//g'`
-tar cvf xen-$CSET.tar xen || exit 1
-rm -f xen-$CSET.tar.bz2
-bzip2 -v9 xen-$CSET.tar || exit 1
-
-set +x
-
-ls -l xen-$CSET.tar.bz2
Index: devel/scripts/rebase-xen-kernel.sh
===================================================================
--- devel.orig/scripts/rebase-xen-kernel.sh 2008-07-23 14:12:23.000000000 +0100
+++ devel.orig/scripts/rebase-xen-kernel.sh 2008-07-23 14:12:23.000000000 +0100
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# you are supposed to have both linux-2.6 "upstream tree"
-# and linux-2.6-xen-fedora mercurial updated against that tree
-
-# it needs linux-2.6 linux-2.6-xen and linux-2.6-xen-fedora on the current directory
-# with the right changesets on them.
-
-set -x
-
-# remove previous patch if it exist
-rm -f linux-2.6-xen.patch
-
-for repo in linux-2.6 linux-2.6-xen-fedora xen-3.0.3-testing linux-2.6-xen-3.0.3 ; do
- if [ ! -d $repo/ ]; then
- echo "$repo directory don't exist";
- exit 1
- else
- echo " * $repo `cd $repo; (hg tip | grep 'changeset:')`" >>
linux-2.6-xen.patch
- fi
-done
-
-/usr/bin/diff -urNp --exclude=".hg*" --exclude="*.orig"
--exclude="*~" \
- /scratch/src/linux-2.6.18/ linux-2.6-xen-fedora/ >> linux-2.6-xen.patch
-
-
-set +x
-
-ls -lh linux-2.6-xen.patch
Index: devel/Makefile.config
===================================================================
--- devel.orig/Makefile.config 2008-07-23 14:13:20.000000000 +0100
+++ devel.orig/Makefile.config 2008-07-23 14:13:20.000000000 +0100
@@ -12,9 +12,7 @@ CONFIGFILES = \
$(CFG)-s390x.config \
$(CFG)-ppc.config $(CFG)-ppc-smp.config \
$(CFG)-sparc64.config $(CFG)-sparc64-smp.config \
- $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config \
- $(CFG)-i686-xen.config $(CFG)-x86_64-xen.config \
- $(CFG)-ia64-xen.config
+ $(CFG)-ppc64.config $(CFG)-ppc64-kdump.config $(CFG)-ia64.config
PLATFORMS = x86 x86_64 powerpc powerpc32 powerpc64 s390x ia64 sparc64
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
@@ -61,21 +59,6 @@ temp-s390-generic: config-s390x temp-gen
temp-ia64-generic: config-ia64-generic temp-generic
perl merge.pl $^ > $@
-temp-x86-xen-generic-tmp: config-xen-generic temp-x86-generic
- perl merge.pl $^ > $@
-
-temp-x86-xen-generic: config-xen-x86 temp-x86-xen-generic-tmp
- perl merge.pl $^ > $@
-
-temp-x86_64-xen-generic-tmp: config-xen-generic temp-x86_64-generic
- perl merge.pl $^ > $@
-
-temp-x86_64-xen-generic: config-xen-x86_64 temp-x86_64-xen-generic-tmp
- perl merge.pl $^ > $@
-
-temp-ia64-xen-generic: config-xen-generic temp-ia64-generic
- perl merge.pl $^ > $@
-
kernel-$(VERSION)-i686.config: config-i686 temp-x86-generic
perl merge.pl $^ i386 > $@
@@ -120,12 +103,3 @@ kernel-$(VERSION)-ppc-smp.config: config
kernel-$(VERSION)-ia64.config: config-ia64 temp-ia64-generic
perl merge.pl $^ ia64 > $@
-
-kernel-$(VERSION)-i686-xen.config: config-i686-PAE temp-x86-xen-generic
- perl merge.pl $^ i386 > $@
-
-kernel-$(VERSION)-x86_64-xen.config: /dev/null temp-x86_64-xen-generic
- perl merge.pl $^ x86_64 > $@
-
-kernel-$(VERSION)-ia64-xen.config: config-xen-ia64 temp-ia64-xen-generic
- perl merge.pl $^ ia64 > $@
--