Bastian Blank
2012-Jul-01 15:35 UTC
[Pkg-xen-changes] r1056 - in trunk/xen: . debian debian/bin debian/patches
Author: waldi
Date: Sun Jul 1 15:35:01 2012
New Revision: 1056
Log:
Merge /branches/wheezy/xen.
Added:
trunk/xen/debian/patches/upstream-25290:7a6dcecb1781-rework
- copied unchanged from r1055,
branches/wheezy/xen/debian/patches/upstream-25290:7a6dcecb1781-rework
Modified:
trunk/xen/ (props changed)
trunk/xen/debian/bin/gencontrol.py
trunk/xen/debian/changelog
Modified: trunk/xen/debian/bin/gencontrol.py
=============================================================================---
trunk/xen/debian/bin/gencontrol.py Sun Jul 1 15:30:24 2012 (r1055)
+++ trunk/xen/debian/bin/gencontrol.py Sun Jul 1 15:35:01 2012 (r1056)
@@ -58,7 +58,7 @@
cmds_build = ["$(MAKE) -f debian/rules.real build-arch %s" %
makeflags]
cmds_setup = ["$(MAKE) -f debian/rules.real setup-arch %s" %
makeflags]
makefile.add(''binary-arch_%s_real'' % arch, cmds =
cmds_binary_arch)
- makefile.add(''build_%s_real'' % arch, cmds =
cmds_build)
+ makefile.add(''build-arch_%s_real'' % arch, cmds =
cmds_build)
makefile.add(''setup_%s_real'' % arch, cmds =
cmds_setup)
def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour,
extra):
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Sun Jul 1 15:30:24 2012 (r1055)
+++ trunk/xen/debian/changelog Sun Jul 1 15:35:01 2012 (r1056)
@@ -3,18 +3,20 @@
* New upstream snapshot.
* Build-depend against libglib2.0-dev and libyajl-dev.
* Disable seabios build for now.
- * Fix udev rules for emulated network devices.
+ * Remove support for Lenny and earlier.
* Support build-arch and build-indep make targets.
-- Bastian Blank <waldi at debian.org> Sun, 13 May 2012 12:21:10 +0000
-xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) UNRELEASED; urgency=low
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-3) unstable; urgency=low
- * Remove /usr/lib/xen-default.
+ * Remove /usr/lib/xen-default. It breaks systems if xenstored is not
+ compatible.
* Fix init script usage.
- * Remove support for Lenny and earlier.
+ * Fix udev rules for emulated network devices:
+ - Force names of emulated network devices to a predictable name.
- -- Bastian Blank <waldi at debian.org> Sun, 17 Jun 2012 23:52:46 +0200
+ -- Bastian Blank <waldi at debian.org> Sun, 01 Jul 2012 16:59:04 +0200
xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-2) unstable; urgency=low
Copied: trunk/xen/debian/patches/upstream-25290:7a6dcecb1781-rework (from r1055,
branches/wheezy/xen/debian/patches/upstream-25290:7a6dcecb1781-rework)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/patches/upstream-25290:7a6dcecb1781-rework Sun Jul 1
15:35:01 2012 (r1056, copy of r1055,
branches/wheezy/xen/debian/patches/upstream-25290:7a6dcecb1781-rework)
@@ -0,0 +1,78 @@
+--- a/tools/hotplug/Linux/vif-common.sh
++++ b/tools/hotplug/Linux/vif-common.sh
+@@ -85,12 +85,23 @@
+ : ${INTERFACE:?}
+
+ # Get xenbus_path from device name.
+- # The name is built like that: "tap${domid}.${devid}".
+- dev_=${dev#tap}
++ # The name is built like that: "vif${domid}.${devid}-emu".
++ dev_=${dev#vif}
++ dev_=${dev_%-emu}
+ domid=${dev_%.*}
+ devid=${dev_#*.}
+
+ XENBUS_PATH="/local/domain/0/backend/vif/$domid/$devid"
++ vifname=$(xenstore_read_default "$XENBUS_PATH/vifname"
"")
++ if [ "$vifname" ]
++ then
++ vifname="${vifname}-emu"
++ if [ "$command" == "add" ] && ! ip link
show "$vifname" >&/dev/null
++ then
++ do_or_die ip link set "$dev" name "$vifname"
++ fi
++ dev="$vifname"
++ fi
+ fi
+
+ ip=${ip:-}
+--- a/tools/hotplug/Linux/xen-backend.rules
++++ b/tools/hotplug/Linux/xen-backend.rules
+@@ -13,4 +13,4 @@
+ KERNEL=="gntdev", NAME="xen/%k", MODE="0600"
+ KERNEL=="pci_iomul", NAME="xen/%k", MODE="0600"
+ KERNEL=="tapdev[a-z]*", NAME="xen/blktap-2/tapdev%m",
MODE="0600"
+-SUBSYSTEM=="net", KERNEL=="tap*", ACTION=="add",
RUN+="/etc/xen/scripts/vif-setup $env{ACTION} type_if=tap"
++SUBSYSTEM=="net", KERNEL=="vif*-emu",
ACTION=="add", RUN+="/etc/xen/scripts/vif-setup $env{ACTION}
type_if=tap"
+--- a/tools/python/xen/xend/image.py
++++ b/tools/python/xen/xend/image.py
+@@ -917,11 +917,7 @@
+ ret.append("-net")
+ ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
+ (nics, mac, model))
+- vifname = devinfo.get(''vifname'')
+- if vifname:
+- vifname = "tap-" + vifname
+- else:
+- vifname = "tap%d.%d" % (self.vm.getDomid(), nics-1)
++ vifname = "vif%d.%d-emu" % (self.vm.getDomid(), nics-1)
+ ret.append("-net")
+ ret.append("tap,vlan=%d,ifname=%s,bridge=%s" %
+ (nics, vifname, bridge))
+--- a/tools/libxl/libxl_dm.c
++++ b/tools/libxl/libxl_dm.c
+@@ -135,10 +135,7 @@
+ vifs[i].mac[0], vifs[i].mac[1],
vifs[i].mac[2],
+ vifs[i].mac[3], vifs[i].mac[4],
vifs[i].mac[5]);
+ char *ifname;
+- if (!vifs[i].ifname)
+- ifname = libxl__sprintf(gc, "tap%d.%d",
info->domid, vifs[i].devid);
+- else
+- ifname = vifs[i].ifname;
++ ifname = libxl__sprintf(gc, "vif%d.%d-emu",
info->domid, vifs[i].devid);
+ flexarray_vappend(dm_args,
+ "-net", libxl__sprintf(gc,
"nic,vlan=%d,macaddr=%s,model=%s",
+ vifs[i].devid, smac,
vifs[i].model),
+@@ -272,11 +269,7 @@
+ vifs[i].mac[0], vifs[i].mac[1],
vifs[i].mac[2],
+ vifs[i].mac[3], vifs[i].mac[4],
vifs[i].mac[5]);
+ char *ifname;
+- if (!vifs[i].ifname) {
+- ifname = libxl__sprintf(gc, "tap%d.%d",
info->domid, vifs[i].devid);
+- } else {
+- ifname = vifs[i].ifname;
+- }
++ ifname = libxl__sprintf(gc, "vif%d.%d-emu",
info->domid, vifs[i].devid);
+ flexarray_append(dm_args, "-net");
+ flexarray_append(dm_args, libxl__sprintf(gc,
"nic,vlan=%d,macaddr=%s,model=%s",
+ vifs[i].devid, smac, vifs[i].model));