rpms/kernel/devel kernel-2.6.spec,1.2175,1.2176
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 28 14:48:34 UTC 2006
- Previous message (by thread): rpms/cups/devel cups-rpath.patch,1.1,1.2
- Next message (by thread): rpms/kdebase/FC-5 kdebase-3.5.2-1-redhat.patch, NONE, 1.1 kdebase-3.5.2-kwin.patch, NONE, 1.1 kdebase.spec, 1.161, 1.162 kdebase-3.5.2-redhat.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dwmw2
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30056
Modified Files:
kernel-2.6.spec
Log Message:
Fix xen
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2175
retrieving revision 1.2176
diff -u -r1.2175 -r1.2176
--- kernel-2.6.spec 28 Apr 2006 13:59:32 -0000 1.2175
+++ kernel-2.6.spec 28 Apr 2006 14:48:31 -0000 1.2176
@@ -9,7 +9,7 @@
# Whether to apply the Xen patches, leave this enabled.
%define includexen 1
# Whether to build the Xen kernels, disable if you want.
-%define buildxen 1
+%define buildxen 0
%define buildxenPAE 0
%define builddoc 0
%define buildkdump 1
@@ -717,9 +717,11 @@
rm -f pax_global_header
%setup -q -n %{name}-%{version} -c -a1
cp %{SOURCE2} .
-# Xen tarball contains pre-build i386 binaries which need removing
- rm -f xen/tools/figlet/figlet
- rm -f xen/tools/symbols
+# Sometimes we accidentally import an unclean Xen tarball
+ if [ -x xen/tools/figlet/figlet ]; then
+ echo "Xen tarball is unclean. Use an unbuilt Xen tarball"
+ exit 1
+ fi
mv linux-%{kversion} vanilla
mv xen xen-vanilla
cp %{SOURCE2} .
@@ -1708,7 +1710,8 @@
%changelog
* Fri Apr 28 2006 David Woodhouse <dwmw2 at redhat.com>
-- Remove another Xen tool which was pre-built in the tarball
+- Disable Xen on the basis that it doesn't build
+- Check for Xen tarball being unclean, abort early even on i386.
* Thu Apr 27 2006 Juan Quintela <quintela at redhat.com>
- Remove figlet by hand again.
- Previous message (by thread): rpms/cups/devel cups-rpath.patch,1.1,1.2
- Next message (by thread): rpms/kdebase/FC-5 kdebase-3.5.2-1-redhat.patch, NONE, 1.1 kdebase-3.5.2-kwin.patch, NONE, 1.1 kdebase.spec, 1.161, 1.162 kdebase-3.5.2-redhat.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list