[Pkg-xen-changes] r19 - in trunk/debian: . patches
Ralph Passgang
tha-guest at costa.debian.org
Sat Feb 18 16:38:53 UTC 2006
Author: tha-guest
Date: 2006-02-18 16:38:52 +0000 (Sat, 18 Feb 2006)
New Revision: 19
Modified:
trunk/debian/control
trunk/debian/patches/00list
trunk/debian/rules
trunk/debian/xen-hypervisor-pae.install
trunk/debian/xen-hypervisor.install
Log:
- changed debian/rules to build a pae hypervisor on i386
(has to be done after the "make dist" for the non-pae stuff)
- changed debian/control to have new dependencies and so on,
because the pae hypervisor can coexist with the non-pae version
- updated xen-hypervisor.install and xen-hypervisor-pae.install
- added 30rename-pae-hypervisor.dpatch (and updated 00list)
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2006-02-18 09:56:32 UTC (rev 18)
+++ trunk/debian/control 2006-02-18 16:38:52 UTC (rev 19)
@@ -9,7 +9,7 @@
Package: xen
Section: misc
Architecture: i386 amd64
-Depends: xen-utils, xen-hypervisor
+Depends: xen-utils, xen-hypervisor | xen-hypervisor-pae
Description: a Virtual Machine Monitor like VMWare or plex86
XEN is a Virtual Machine Monitor (VMM) originally developed by the
Systems Research Group of the University of Cambridge Computer
@@ -23,7 +23,6 @@
Section: misc
Architecture: i386 amd64
Depends: ${shlibs:Depends}
-Conflicts: xen-hypervisor-pae
Suggests: linux-xen0-2.6 | kernel-xen0-2.6
Description: The Xen Hypervisor
The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
@@ -42,10 +41,8 @@
Section: misc
Architecture: i386
Depends: ${shlibs:Depends}
-Conflicts: xen-hypervisor
-Provides: xen-hypervisor
Suggests: linux-xen0-2.6 | kernel-xen0-2.6
-Description: The Xen Hypervisor
+Description: The Xen Hypervisor (pae enabled version)
The hypervisor is the "core" for XEN itself. It gets booted by the boot loader
and controls cpu and memory, sharing them between your administrative domain
(Domain 0) and the virtual guest systems.
@@ -62,7 +59,7 @@
Package: xen-utils
Section: misc
Architecture: i386 amd64
-Depends: xen-hypervisor, python-twisted, python, libxen-python, iproute, hotplug | udev (>= 0.059), bash, ${shlibs:Depends}
+Depends: xen-hypervisor | xen-hypervisor-pae, python-twisted, python, libxen-python, iproute, hotplug | udev (>= 0.059), bash, ${shlibs:Depends}
Recommends: bridge-utils
Description: XEN administrative tools
The userspace tools to manage a system virtualized through the XEN virtual
Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list 2006-02-18 09:56:32 UTC (rev 18)
+++ trunk/debian/patches/00list 2006-02-18 16:38:52 UTC (rev 19)
@@ -1,2 +1,3 @@
10sysconfig
20lib64
+30rename-pae-hypervisor
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2006-02-18 09:56:32 UTC (rev 18)
+++ trunk/debian/rules 2006-02-18 16:38:52 UTC (rev 19)
@@ -35,6 +35,10 @@
install: debian/stamps/build
rm -rf debian/install
$(MAKE) dist DESTDIR=$(CURDIR)/debian/install KERNELS= XEN_PYTHON_NATIVE_INSTALL=1 CC=$(CC) GCC=$(CC) HOSTCC=$(CC)
+ifeq ($(DEB_BUILD_ARCH),i386)
+ $(MAKE) mrproper
+ $(MAKE) xen DESTDIR=$(CURDIR)/debian/install KERNELS= GCC=$(CC) CC=$(CC) HOSTCC=$(CC) XEN_TARGET_X86_PAE=y
+endif
$(MAKE) -C tools/examples install-udev DESTDIR=$(CURDIR)/debian/install
find $(CURDIR)/debian/install -name '*.pyc' | xargs rm
mkdir -p debian/install/etc/xen/sv debian/install/etc/xen/xend/server
Modified: trunk/debian/xen-hypervisor-pae.install
===================================================================
--- trunk/debian/xen-hypervisor-pae.install 2006-02-18 09:56:32 UTC (rev 18)
+++ trunk/debian/xen-hypervisor-pae.install 2006-02-18 16:38:52 UTC (rev 19)
@@ -1 +1,3 @@
-boot
+boot/xen_pae-syms*
+boot/xen_pae-*
+boot/xen_pae.gz
Modified: trunk/debian/xen-hypervisor.install
===================================================================
--- trunk/debian/xen-hypervisor.install 2006-02-18 09:56:32 UTC (rev 18)
+++ trunk/debian/xen-hypervisor.install 2006-02-18 16:38:52 UTC (rev 19)
@@ -1 +1,3 @@
-boot
+boot/xen-syms*
+boot/xen-*
+boot/xen.gz
More information about the Pkg-xen-changes
mailing list