Bastian Blank
2011-Apr-18 09:31 UTC
[Pkg-xen-changes] r875 - in branches/lenny-security/xen-3/debian: . bin
Author: waldi
Date: Mon Apr 18 09:31:01 2011
New Revision: 875
Log:
* debian/changelog: Update.
* debian/bin/gencontrol.py: Adopt linux-2.6 changes.
* debian/rules.defs: Use 2.6.26-2.
Modified:
branches/lenny-security/xen-3/debian/bin/gencontrol.py
branches/lenny-security/xen-3/debian/changelog
branches/lenny-security/xen-3/debian/rules.defs
Modified: branches/lenny-security/xen-3/debian/bin/gencontrol.py
=============================================================================---
branches/lenny-security/xen-3/debian/bin/gencontrol.py Sat Apr 16 12:25:55 2011
(r874)
+++ branches/lenny-security/xen-3/debian/bin/gencontrol.py Mon Apr 18 09:31:01
2011 (r875)
@@ -20,15 +20,16 @@
''ABINAME'': self.abiname,
})
- def do_main_packages(self, packages, extra):
-
packages.extend(self.process_packages(self.templates["control.main"],
self.vars))
+ def do_main_packages(self, packages, vars, makeflags, extra):
+
packages.extend(self.process_packages(self.templates["control.main"],
vars))
def do_arch_setup(self, vars, makeflags, arch, extra):
+ config_entry = self.config.merge(''base'', arch)
+
for i in (
(''xen-arch'', ''XEN_ARCH''),
):
- if vars.has_key(i[0]):
- makeflags[i[1]] = vars[i[0]]
+ makeflags[i[1]] = config_entry[i[0]]
def do_arch_packages(self, packages, makefile, arch, vars, makeflags,
extra):
utils = self.templates["control.utils"]
Modified: branches/lenny-security/xen-3/debian/changelog
=============================================================================---
branches/lenny-security/xen-3/debian/changelog Sat Apr 16 12:25:55 2011 (r874)
+++ branches/lenny-security/xen-3/debian/changelog Mon Apr 18 09:31:01 2011
(r875)
@@ -1,3 +1,9 @@
+xen-3 (3.2.1-3) UNRELEASED; urgency=low
+
+ * Fix to build on currently Lenny.
+
+ -- Bastian Blank <waldi at debian.org> Mon, 18 Apr 2011 11:30:01 +0200
+
xen-3 (3.2.1-2) unstable; urgency=low
* Use e2fslibs based ext2 support for pygrub. (closes: #476366)
Modified: branches/lenny-security/xen-3/debian/rules.defs
=============================================================================---
branches/lenny-security/xen-3/debian/rules.defs Sat Apr 16 12:25:55 2011 (r874)
+++ branches/lenny-security/xen-3/debian/rules.defs Mon Apr 18 09:31:01 2011
(r875)
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.25-2
+KERNELVERSION := 2.6.26-2
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates