Bastian Blank
2012-Aug-13 20:04 UTC
[Pkg-xen-changes] r1091 - in trunk/xen: . debian debian/bin debian/templates
Author: waldi
Date: Mon Aug 13 20:04:18 2012
New Revision: 1091
Log:
Merge /branches/wheezy/xen.
Added:
trunk/xen/debian/templates/control.system.latest.in
- copied unchanged from r1090,
branches/wheezy/xen/debian/templates/control.system.latest.in
Modified:
trunk/xen/ (props changed)
trunk/xen/debian/ (props changed)
trunk/xen/debian/bin/gencontrol.py
trunk/xen/debian/changelog
trunk/xen/debian/rules.real
trunk/xen/debian/xen-utils-common.xendomains.init
Modified: trunk/xen/debian/bin/gencontrol.py
=============================================================================---
trunk/xen/debian/bin/gencontrol.py Mon Aug 13 20:01:17 2012 (r1090)
+++ trunk/xen/debian/bin/gencontrol.py Mon Aug 13 20:04:18 2012 (r1091)
@@ -76,14 +76,16 @@
def do_flavour_packages(self, packages, makefile, arch, featureset,
flavour, vars, makeflags, extra):
hypervisor = self.templates["control.hypervisor"]
+ system_latest = self.templates["control.system.latest"]
if not vars.has_key(''desc''):
vars[''desc''] = ''''
packages_own = []
packages_own.extend(self.process_packages(hypervisor, vars))
+ packages_dummy = self.process_packages(system_latest, vars)
- for package in packages_own:
+ for package in packages_own + packages_dummy:
name = package[''Package'']
package.setdefault(''Architecture'',
PackageArchitecture()).add(arch)
if name in packages:
@@ -104,6 +106,9 @@
cmds_binary_arch = ["$(MAKE) -f debian/rules.real
binary-arch-flavour %s" % makeflags]
cmds_build = ["$(MAKE) -f debian/rules.real build-arch-flavour
%s" % makeflags]
cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s"
% makeflags]
+
+ cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy
DH_OPTIONS=''%s'' %s" % (u''
''.join([u"-p%s" % i[''Package''] for i in
packages_dummy]), makeflags)]
+
makefile.add("binary-arch_%s_%s_%s" % (arch, featureset,
flavour), cmds = cmds_binary_arch)
makefile.add("build-arch_%s_%s_%s" % (arch, featureset,
flavour), cmds = cmds_build)
makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour),
cmds = cmds_setup)
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Mon Aug 13 20:01:17 2012 (r1090)
+++ trunk/xen/debian/changelog Mon Aug 13 20:04:18 2012 (r1091)
@@ -8,12 +8,36 @@
-- Bastian Blank <waldi at debian.org> Sun, 13 May 2012 12:21:10 +0000
-xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) UNRELEASED; urgency=low
+xen (4.1.3-1) UNRELEASED; urgency=low
+
+ * New upstream release: (closes: #683286)
+ - Fix error handling for unexpected conditions.
+ - Update CPUID masking to latest Intel spec.
+ - Allow large ACPI ids.
+ - Fix IOMMU support for PCI-to-PCIe bridges.
+ - Disallow access to some sensitive IO-ports.
+ - Fix wrong address in IOTLB.
+ - Fix deadlock on CPUs without working cpufreq driver.
+ * Fixup broken patches.
+ * Don''t leave the x86 emulation in a bad state. (closes: #683279)
+ CVE-2012-3432
+ * Only check for shared pages while any exist on teardown.
+ CVE-2012-3433
+
+ -- Bastian Blank <waldi at debian.org> Mon, 30 Jul 2012 21:06:34 +0200
+
+xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-5) unstable; urgency=low
[ Ian Campbell ]
* Set tap device MAC addresses to fe:ff:ff:ff:ff:ff (Closes: #671018)
+ * Only run xendomains initscript if toolstack is xl or xm (Closes: #680528)
+
+ [ Bastian Blank ]
+ * Actually build-depend on new enough version of dpkg-dev.
+ * Add xen-sytem-* meta-packages. We are finally in a position to do
+ automatic upgrades and this package is missing. (closes: #681376)
- -- Bastian Blank <waldi at debian.org> Mon, 09 Jul 2012 19:13:45 +0100
+ -- Bastian Blank <waldi at debian.org> Sat, 28 Jul 2012 10:23:26 +0200
xen (4.1.3~rc1+hg-20120614.a9c0a89c08f2-4) unstable; urgency=low
Modified: trunk/xen/debian/rules.real
=============================================================================---
trunk/xen/debian/rules.real Mon Aug 13 20:01:17 2012 (r1090)
+++ trunk/xen/debian/rules.real Mon Aug 13 20:04:18 2012 (r1091)
@@ -122,6 +122,12 @@
dh_md5sums
dh_builddeb
+install-dummy:
+ dh_testdir
+ dh_testroot
+ dh_prep
+ +$(MAKE_SELF) install-base
+
install-docs: SOURCE_DIR = $(BUILD_DIR)/build-docs
install-docs: DIR = $(BUILD_DIR)/install-docs
install-docs: PACKAGE_NAME = xen-docs-$(VERSION)
Copied: trunk/xen/debian/templates/control.system.latest.in (from r1090,
branches/wheezy/xen/debian/templates/control.system.latest.in)
=============================================================================---
/dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/xen/debian/templates/control.system.latest.in Mon Aug 13 20:04:18 2012
(r1091, copy of r1090,
branches/wheezy/xen/debian/templates/control.system.latest.in)
@@ -0,0 +1,8 @@
+Package: xen-system at localversion@
+Depends: xen-hypervisor- at version@@localversion@, xen-utils- at version@,
${misc:Depends}
+Provides: xen-system
+Description: Xen System on @class@ (meta-package)
+ This package depends on the latest Xen hypervisor for use on @class@ and the
Xen utils.
+ .
+ @desc@
+
Modified: trunk/xen/debian/xen-utils-common.xendomains.init
=============================================================================---
trunk/xen/debian/xen-utils-common.xendomains.init Mon Aug 13 20:01:17 2012
(r1090)
+++ trunk/xen/debian/xen-utils-common.xendomains.init Mon Aug 13 20:04:18 2012
(r1091)
@@ -23,6 +23,15 @@
exit 0;
fi
+TOOLSTACK=$(/usr/lib/xen-common/bin/xen-toolstack 2>/dev/null)
+if [ $? -ne 0 ]; then
+ log_warning_msg "No usable Xen toolstack selected"
+ exit 0
+fi
+if [ "$(basename "$TOOLSTACK")" != xm ] && [
"$(basename "$TOOLSTACK")" != xl ]; then
+ exit 0
+fi
+
if ! [ -e /proc/xen/privcmd ]; then
exit 0
fi