Bastian Blank
2008-Sep-11 10:04 UTC
[Pkg-xen-changes] r606 - in trunk/xen-unstable/debian: . bin
Author: waldi
Date: Thu Sep 11 10:04:48 2008
New Revision: 606
Log:
* debian/bin/gencontrol.py: Adopt changes.
* debian/rules.defs: Update kernel version to 2.6.26-1.
Modified:
trunk/xen-unstable/debian/bin/gencontrol.py
trunk/xen-unstable/debian/rules.defs
Modified: trunk/xen-unstable/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-unstable/debian/bin/gencontrol.py (original)
+++ trunk/xen-unstable/debian/bin/gencontrol.py Thu Sep 11 10:04:48 2008
@@ -27,15 +27,15 @@
def do_main_setup(self, vars, makeflags, extra):
makeflags.update(self.makeflags_base)
- 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_base = 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_base[i[0]]
def do_arch_packages(self, packages, makefile, arch, vars, makeflags,
extra):
utils = self.templates["control.utils"]
Modified: trunk/xen-unstable/debian/rules.defs
=============================================================================---
trunk/xen-unstable/debian/rules.defs (original)
+++ trunk/xen-unstable/debian/rules.defs Thu Sep 11 10:04:48 2008
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.25-2
+KERNELVERSION := 2.6.26-1
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates