10 files changed, 112 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index c13a87f..914dde0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnumach (2:1.3.99.dfsg.git20100732-2) unstable; urgency=low
+
+  [ Samuel Thibault ]
+  * debian/control: Add gnumach-xen and gnumach-xen-dbg, containing Xen
+    variants of gnumach and gnumach-dbg. Add gnumach-common to contain msgids
+    shared by gnumach and gnumach-xen, which now depend on it.
+  * debian/rules: Add rules to build Xen variants of gnumach.
+
+ -- Samuel Thibault <sthibault@debian.org>  Sat, 31 Jul 2010 17:35:20 +0200
+
 gnumach (2:1.3.99.dfsg.git20100732-1) unstable; urgency=low
 
   [ Samuel Thibault ]
diff --git a/debian/control b/debian/control
index ec757b5..b47786f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,10 +13,18 @@ Standards-Version: 3.9.1
 
 Package: gnumach
 Architecture: any-i386
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, gnumach-common
 Description: The GNU version of the Mach microkernel
  This is the Utah Mach microkernel used by the Hurd.
 
+Package: gnumach-xen
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-common
+Description: The GNU version of the Mach microkernel for Xen
+ This is the Utah Mach microkernel used by the Hurd.
+ .
+ The version in this package is compiled with Xen support.
+
 Package: gnumach-udeb
 XC-Package-Type: udeb
 Provides: kernel-image, floppy-modules, ide-modules, input-modules, nic-modules, nic-pcmcia-modules, nic-wireless-modules, pcmcia-modules, scsi-modules, serial-modules
@@ -39,6 +47,26 @@ Description: The GNU version of the Mach microkernel for debugging
  gnumach package, except that it is not stripped and has the
  kernel-level debugger compiled in.
 
+Package: gnumach-xen-dbg
+Section: debug
+Priority: extra
+Provides: gnumach
+Architecture: any-i386
+Depends: ${misc:Depends}, gnumach-xen (= ${binary:Version})
+Description: The GNU version of the Mach microkernel for Xen for debugging
+ This is the Utah Mach microkernel used by the Hurd.
+ .
+ The version in this package is identical to the version found in the
+ gnumach-xen package, except that it is not stripped and has the
+ kernel-level debugger compiled in.
+
+Package: gnumach-common
+Section: devel
+Architecture: any-i386
+Depends: ${misc:Depends}
+Description: The GNU version of the Mach microkernel, common files.
+ This are common files used by the Utah Mach microkernel used by the Hurd.
+
 Package: gnumach-dev
 Section: devel
 Architecture: any-i386
diff --git a/debian/gnumach-common.install b/debian/gnumach-common.install
new file mode 100644
index 0000000..fc04c04
--- /dev/null
+++ b/debian/gnumach-common.install
@@ -0,0 +1 @@
+usr/share/msgids
diff --git a/debian/gnumach-xen-dbg.docs b/debian/gnumach-xen-dbg.docs
new file mode 100644
index 0000000..9eafbe1
--- /dev/null
+++ b/debian/gnumach-xen-dbg.docs
@@ -0,0 +1,2 @@
+README
+NEWS
diff --git a/debian/gnumach-xen-dbg.install b/debian/gnumach-xen-dbg.install
new file mode 100644
index 0000000..36ef4c3
--- /dev/null
+++ b/debian/gnumach-xen-dbg.install
@@ -0,0 +1 @@
+boot
diff --git a/debian/gnumach-xen.docs b/debian/gnumach-xen.docs
new file mode 100644
index 0000000..9eafbe1
--- /dev/null
+++ b/debian/gnumach-xen.docs
@@ -0,0 +1,2 @@
+README
+NEWS
diff --git a/debian/gnumach-xen.info b/debian/gnumach-xen.info
new file mode 100644
index 0000000..87c8231
--- /dev/null
+++ b/debian/gnumach-xen.info
@@ -0,0 +1 @@
+#build/doc/mach.info*
diff --git a/debian/gnumach-xen.install b/debian/gnumach-xen.install
new file mode 100644
index 0000000..36ef4c3
--- /dev/null
+++ b/debian/gnumach-xen.install
@@ -0,0 +1 @@
+boot
diff --git a/debian/gnumach.install b/debian/gnumach.install
index 2024141..36ef4c3 100644
--- a/debian/gnumach.install
+++ b/debian/gnumach.install
@@ -1,2 +1 @@
 boot
-usr/share/msgids
diff --git a/debian/rules b/debian/rules
index 890f1a9..eeb85d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,17 @@
 #
 
 pkg := gnumach
+pkg_xen := gnumach-xen
 pkg_udeb := gnumach-udeb
 pkg_dbg := gnumach-dbg
+pkg_xen_dbg := gnumach-xen-dbg
+pkg_common := gnumach-common
 pkg_dev := gnumach-dev
 
 D := $(CURDIR)/debian/tmp
+D_XEN := $(D)-xen
 D_DBG := $(D)-dbg
+D_XEN_DBG := $(D)-xen-dbg
 
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -25,6 +30,12 @@ endif
 
 drivers := 
 
+common_configure := \
+		CFLAGS="$(CFLAGS)" \
+		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+		--prefix=/usr \
+		--exec-prefix=/
+
 configure: configure.ac
 	autoreconf -fi
 
@@ -33,21 +44,32 @@ build/config.status: configure
 	
 	-mkdir build
 	cd build && ../configure $(drivers) \
-		CFLAGS="$(CFLAGS)" \
-		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-		--prefix=/usr \
-		--exec-prefix=/
+		$(common_configure)
+
+build-xen/config.status: configure
+	dh_testdir
+	
+	-mkdir build-xen
+	cd build-xen && ../configure \
+		$(common_configure) \
+		--enable-platform=xen
 
 build-dbg/config.status: configure
 	dh_testdir
 	
 	-mkdir build-dbg
 	cd build-dbg && ../configure --enable-kdb $(drivers) \
-		CFLAGS="$(CFLAGS)" \
-		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
-		--exec-prefix=/
+		$(common_configure) \
+
+build-xen-dbg/config.status: configure
+	dh_testdir
+	
+	-mkdir build-xen-dbg
+	cd build-xen-dbg && ../configure --enable-kdb \
+		$(common_configure) \
+		--enable-platform=xen
 
-build: build-gnumach-std build-gnumach-dbg
+build: build-gnumach-std build-gnumach-xen build-gnumach-dbg build-gnumach-xen-dbg
 
 build-gnumach-std: build/config.status
 	dh_testdir
@@ -58,6 +80,15 @@ else
 	$(MAKE) -C build check
 endif
 
+build-gnumach-xen: build-xen/config.status
+	dh_testdir
+	
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) -C build-xen
+else
+	$(MAKE) -C build-xen check
+endif
+
 build-gnumach-dbg: build-dbg/config.status
 	dh_testdir
 	
@@ -67,11 +98,20 @@ else
 	$(MAKE) -C build-dbg check
 endif
 
+build-gnumach-xen-dbg: build-xen-dbg/config.status
+	dh_testdir
+	
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	$(MAKE) -C build-xen-dbg
+else
+	$(MAKE) -C build-xen-dbg check
+endif
+
 clean:
 	dh_testdir
 	
 	rm -f machine
-	rm -rf build build-dbg $(D_DBG)
+	rm -rf build build-xen build-dbg build-xen-dbg $(D_XEN) $(D_DBG) $(D_XEN_DBG)
 	
 	# Clean up autogenerated cruft
 	rm -rf autom4te.cache build-aux
@@ -90,10 +130,18 @@ install: build
 	$(MAKE) -C build install \
 		DESTDIR=$(D)
 	
+	$(MAKE) -C build-xen install \
+		DESTDIR=$(D_XEN)
+	
 	$(MAKE) -C build-dbg install-exec \
 		DESTDIR=$(D_DBG) \
 	
+	$(MAKE) -C build-xen-dbg install-exec \
+		DESTDIR=$(D_XEN_DBG) \
+	
+	mv $(D_XEN)/boot/gnumach $(D_XEN)/boot/gnumach-xen
 	mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-dbg
+	mv $(D_XEN_DBG)/boot/gnumach $(D_XEN_DBG)/boot/gnumach-xen-dbg
 
 binary: binary-indep binary-arch
 
@@ -103,17 +151,22 @@ binary-arch: install
 	dh_testdir
 	dh_testroot
 	
-	dh_install -a -N$(pkg_dbg) --sourcedir=$(D)
+	dh_install -a -N$(pkg_xen) -N$(pkg_dbg) -N$(pkg_xen_dbg) --sourcedir=$(D)
+	dh_install -p$(pkg_xen) --sourcedir=$(D_XEN)
 	dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG)
+	dh_install -p$(pkg_xen_dbg) --sourcedir=$(D_XEN_DBG)
 	
 	dh_installdocs -a
 	dh_installchangelogs -a -k ChangeLog
 #	dh_installinfo -a
 	
 	dh_link -a
-	dh_strip -a -N$(pkg_dbg)
+	dh_strip -a -N$(pkg_dbg) -N$(pkg_xen_dbg)
 	dh_compress -p$(pkg) -p$(pkg_udeb) -A boot/gnumach
+	dh_compress -p$(pkg_xen) boot/gnumach-xen
 	dh_compress -p$(pkg_dbg) boot/gnumach-dbg
+	dh_compress -p$(pkg_xen_dbg) boot/gnumach-xen-dbg
+	dh_compress -p$(pkg_common)
 	dh_compress -p$(pkg_dev)
 	dh_fixperms -a
 	dh_installdeb -a
@@ -121,6 +174,6 @@ binary-arch: install
 	dh_md5sums -a
 	dh_builddeb -a
 
-.PHONY: build build-gnumach-std build-gnumach-dbg clean
+.PHONY: build build-gnumach-std build-gnumach-xen build-gnumach-dbg build-gnumach-xen-dbg clean
 .PHONY: install binary binary-indep binary-arch