Guido Trotter
2006-Mar-27 10:46 UTC
[Pkg-xen-changes] r142 - in trunk/xen-3.0/debian: . patches scripts
Author: ultrotter
Date: 2006-03-27 10:45:59 +0000 (Mon, 27 Mar 2006)
New Revision: 142
Added:
trunk/xen-3.0/debian/patches/default-network.dpatch
trunk/xen-3.0/debian/scripts/
trunk/xen-3.0/debian/scripts/network-dummy
Modified:
trunk/xen-3.0/debian/changelog
trunk/xen-3.0/debian/patches/00list
trunk/xen-3.0/debian/rules
Log:
debian/changelog: ship the +hg version by default
debian/rules: add unpatch target to make dpatch-edit-patch avoid complaining
patch etc/xen/xend-config.sxp not to modify the network configuration on start
by default
ship a network-dummy script along with network-bridge and network-nat
Modified: trunk/xen-3.0/debian/changelog
==================================================================---
trunk/xen-3.0/debian/changelog 2006-03-22 18:47:11 UTC (rev 141)
+++ trunk/xen-3.0/debian/changelog 2006-03-27 10:45:59 UTC (rev 142)
@@ -1,4 +1,4 @@
-xen-3.0 (3.0.1-1) UNRELEASED; urgency=low
+xen-3.0 (3.0.1+hg8762-1) UNRELEASED; urgency=low
* The "preserve our homes" release
* Now cooperatively maintained by the Debian Xen Team
@@ -32,8 +32,9 @@
string and removes the banner.
* Don''t install unusable cruft in xen-utils
* Remove libxen packages (no stable API/ABI)
+ *
- -- Julien Danjou <acid@debian.org> Sat, 4 Mar 2006 12:59:13 +0100
+ -- Guido Trotter <ultrotter@debian.org> Mon, 27 Mar 2006 12:34:53 +0200
xen (2.0.6-1) unstable; urgency=low
Modified: trunk/xen-3.0/debian/patches/00list
==================================================================---
trunk/xen-3.0/debian/patches/00list 2006-03-22 18:47:11 UTC (rev 141)
+++ trunk/xen-3.0/debian/patches/00list 2006-03-27 10:45:59 UTC (rev 142)
@@ -2,3 +2,4 @@
manpages
version
compile_date
+default-network
Added: trunk/xen-3.0/debian/patches/default-network.dpatch
==================================================================---
trunk/xen-3.0/debian/patches/default-network.dpatch 2006-03-22 18:47:11 UTC (rev
141)
+++ trunk/xen-3.0/debian/patches/default-network.dpatch 2006-03-27 10:45:59 UTC
(rev 142)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## default-network.dpatch by Guido Trotter <ultrotter@debian.org>
+##
+## All lines beginning with `## DP:'' are a description of the patch.
+## DP: Use dummy script rather than bridge one as default for xend
+
+@DPATCH@
+diff -urNad xen-3.0-3.0.1+hg8762/tools/examples/xend-config.sxp
/tmp/dpep.lTdzeJ/xen-3.0-3.0.1+hg8762/tools/examples/xend-config.sxp
+--- xen-3.0-3.0.1+hg8762/tools/examples/xend-config.sxp 2006-03-25
16:43:37.864766456 +0100
++++ /tmp/dpep.lTdzeJ/xen-3.0-3.0.1+hg8762/tools/examples/xend-config.sxp
2006-03-27 12:24:47.000000000 +0200
+@@ -84,7 +84,7 @@
+ # two fake interfaces per guest domain. To do things like this, write
+ # yourself a wrapper script, and call network-bridge from it, as appropriate.
+ #
+-(network-script network-bridge)
++(network-script network-dummy)
+
+ # The script used to control virtual interfaces. This can be overridden on a
+ # per-vif basis when creating a domain or a configuring a new vif. The
Property changes on: trunk/xen-3.0/debian/patches/default-network.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/xen-3.0/debian/rules
==================================================================---
trunk/xen-3.0/debian/rules 2006-03-22 18:47:11 UTC (rev 141)
+++ trunk/xen-3.0/debian/rules 2006-03-27 10:45:59 UTC (rev 142)
@@ -106,6 +106,9 @@
exit 1; \
fi
+# This is to make dpatch-edit-patch work
+unpatch: clean
+
maintainerclean:
rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
@@ -144,6 +147,7 @@
$(MAKE) -C $(BUILD_DIR)/build-docs/docs install DESTDIR=$(CURDIR)/debian/tmp
$(MAKE) -C $(BUILD_DIR)/build-tools/tools install XEN_PYTHON_NATIVE_INSTALL=1
DESTDIR=$(CURDIR)/debian/tmp DISTDIR=$(CURDIR)/debian/tmp
+ cp debian/scripts/network-dummy $(CURDIR)/debian/tmp/etc/xen/scripts
dh_install --sourcedir=debian/tmp
# Build architecture-independent files here.
Added: trunk/xen-3.0/debian/scripts/network-dummy
==================================================================---
trunk/xen-3.0/debian/scripts/network-dummy 2006-03-22 18:47:11 UTC (rev 141)
+++ trunk/xen-3.0/debian/scripts/network-dummy 2006-03-27 10:45:59 UTC (rev 142)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exit 0
Property changes on: trunk/xen-3.0/debian/scripts/network-dummy
___________________________________________________________________
Name: svn:executable
+ *