rpms/kernel/devel Makefile.config, 1.65, 1.66 kernel.spec, 1.798, 1.799 config-xen-generic, 1.5, NONE config-xen-ia64, 1.1, NONE config-xen-x86, 1.1, NONE config-xen-x86_64, 1.2, NONE
Mark McLoughlin (markmc)
fedora-extras-commits at redhat.com
Thu Jul 24 16:34:42 UTC 2008
Author: markmc
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6082
Modified Files:
Makefile.config kernel.spec
Removed Files:
config-xen-generic config-xen-ia64 config-xen-x86
config-xen-x86_64
Log Message:
Kill off most of the remnants of the separate xen package
Gone is the kernel-xen variant and xen.gz
Index: Makefile.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile.config,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- Makefile.config 16 Jul 2008 21:29:33 -0000 1.65
+++ Makefile.config 24 Jul 2008 16:33:56 -0000 1.66
@@ -12,9 +12,7 @@
$(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-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)-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 > $@
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- kernel.spec 24 Jul 2008 16:30:51 -0000 1.798
+++ kernel.spec 24 Jul 2008 16:33:56 -0000 1.799
@@ -66,8 +66,6 @@
%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 @@
%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 @@
%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 @@
%endif
%if %{nopatches}
-%define includexen 0
-%define with_xen 0
%define with_bootwrapper 0
%define variant -vanilla
%else
@@ -181,7 +165,6 @@
%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 @@
%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 @@
%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 @@
%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 @@
%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 @@
%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 @@
%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
@@ -496,8 +456,6 @@
%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
@@ -508,18 +466,15 @@
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
@@ -529,7 +484,6 @@
Source60: config-ia64-generic
Source61: config-ia64
-Source62: config-xen-ia64
Source70: config-s390x
@@ -819,13 +773,6 @@
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
@@ -857,13 +804,6 @@
%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()
{
@@ -1221,19 +1161,6 @@
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
###
@@ -1383,9 +1310,6 @@
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
@@ -1458,17 +1382,6 @@
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}
@@ -1490,12 +1403,6 @@
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
@@ -1664,8 +1571,6 @@
%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 $?
@@ -1770,7 +1675,6 @@
%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
* Thu Jul 24 2008 Roland McGrath <roland at redhat.com>
--- config-xen-generic DELETED ---
--- config-xen-ia64 DELETED ---
--- config-xen-x86 DELETED ---
--- config-xen-x86_64 DELETED ---
More information about the fedora-extras-commits
mailing list