rpms/xen/devel .cvsignore, 1.34.2.3, 1.34.2.4 sources, 1.48.2.4, 1.48.2.5 xen.spec, 1.194.2.12, 1.194.2.13 xen-network-unmanaged.patch, 1.1.2.1, NONE xen-smx.patch, 1.1.2.1, NONE

[Daniel P. Berrange (berrange)]

Author: berrange

Update of /cvs/pkgs/rpms/xen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17780

Modified Files:
      Tag: private-berrange-xen-unstable
	.cvsignore sources xen.spec 
Removed Files:
      Tag: private-berrange-xen-unstable
	xen-network-unmanaged.patch xen-smx.patch 
Log Message:
Upgrade to 3.2.0 -rc3 snapshot. Enable HV all the time


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/.cvsignore,v
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -r1.34.2.3 -r1.34.2.4
--- .cvsignore	13 Dec 2007 22:08:23 -0000	1.34.2.3
+++ .cvsignore	21 Dec 2007 18:43:41 -0000	1.34.2.4
@@ -1,3 +1,3 @@
 *.rpm
 .build*.log
-xen-unstable-16606.tgz
+xen-unstable-16656.tgz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/sources,v
retrieving revision 1.48.2.4
retrieving revision 1.48.2.5
diff -u -r1.48.2.4 -r1.48.2.5
--- sources	13 Dec 2007 22:08:23 -0000	1.48.2.4
+++ sources	21 Dec 2007 18:43:41 -0000	1.48.2.5
@@ -1 +1 @@
-3225e4067ea1a981ba0e0fec6857ac3e  xen-unstable-16606.tgz
+d07a1dd98e86e13ecdf6935ed92c7c45  xen-unstable-16656.tgz


Index: xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xen/devel/xen.spec,v
retrieving revision 1.194.2.12
retrieving revision 1.194.2.13
diff -u -r1.194.2.12 -r1.194.2.13
--- xen.spec	19 Dec 2007 05:00:41 -0000	1.194.2.12
+++ xen.spec	21 Dec 2007 18:43:41 -0000	1.194.2.13
@@ -1,30 +1,31 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-# For official stable release, use these two tags
-%define base_version 3.1.2
-%define base_release 3
-%define base_hv_abi  3.1
+# Always set these 3 tags
+%define base_version 3.2.0
+%define base_release 1
+
+# Hypervisor ABI
+%define hv_abi  3.2
+# Whether to build -hypervisor pacakges
+%define hv_build 1
 
 # For testing upstream dev trees run either
 #    hg archive -t tgz ../xen-unstable-[changeset].tgz
 # Or
 #    hg archive -t tgz ../xen-3.1-testing-[changeset].tgz
 #
-# And then set....
-
-# The version that the dev tree will become when released
-%define base_version 3.2.0
-%define base_release 10
+# And set 'base_version' the release number that the current
+# dev tree is targetted to become,
 
-# The changeset synced to
-%define changeset 16606
+# For dev trees, also set the changeset synced to
+%define changeset 16656
 
 # Name of the tree (ie the arg to hg archive, without .tgz suffix)
 %define tree unstable
 #define tree 3.1-testing
 
 # If upstream tree is also in release candidate stage, add this tag
-%define relcandidate 1
+%define relcandidate 3
 
 
 
@@ -42,8 +43,6 @@
 
 %define release_prefix %{?changeset:0}%{!?changeset:%{base_release}}
 %define release_postfix %{?changeset:%{?relcandidate:.rc%{relcandidate}}.dev%{changeset}.%{base_release}}
-%define hv_build %{?changeset:1}%{!?changeset:0}
-%define hv_abi %{?changeset:%{base_version}-%{changeset}}%{!?changeset:%{base_hv_abi}}
 %define version_tag %{base_version}
 %define release_tag %{release_prefix}%{?dist}%{release_postfix}
 %define directory_tag xen-%{?changeset:%{tree}-%{changeset}}%{!?tree:%{base_version}-src}
@@ -63,11 +62,9 @@
 Source4: %{name}.logrotate
 Patch1: xen-initscript.patch
 Patch3: xen-compile-fixes.patch
-Patch4: xen-network-unmanaged.patch
 Patch5: xen-hvm-kernel-boot-xend.patch
 Patch6: xen-hvm-kernel-boot-relocatable.patch
 Patch7: xen-hvm-kernel-boot-nonrelocatable.patch
-Patch8: xen-smx.patch
 Patch13: xen-dumpdir.patch
 
 Patch36: xen-qemu-bootmenu.patch
@@ -153,11 +150,9 @@
 %setup -q -n %{directory_tag}
 %patch1 -p1 -b .init
 %patch3 -p1 -b .compile
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 %patch13 -p1
 
 %patch36 -p1
@@ -199,8 +194,8 @@
 %if %{hv_build}
 # install the hypervisor
 install -d 755 %{buildroot}/boot/
-install -m 644 xen/xen.gz %{buildroot}/boot/xen-%{version}-%{release}.gz
-install -m 644 xen/xen-syms %{buildroot}/boot/xen-syms-%{version}-%{release}
+install -m 644 xen/xen.gz %{buildroot}/boot/xen-%{hv_abi}.gz
+install -m 644 xen/xen-syms %{buildroot}/boot/xen-syms-%{hv_abi}
 %endif
 
 ### fixing start-script dir


--- xen-network-unmanaged.patch DELETED ---


--- xen-smx.patch DELETED ---