Bastian Blank
2008-Feb-07 15:49 UTC
[Pkg-xen-changes] r522 - in trunk/xen-3/debian: . arch/amd64 arch/i386 bin
Author: waldi
Date: Thu Feb 7 15:49:11 2008
New Revision: 522
Log:
Update to linux-support-2.6.24-1.
Modified:
trunk/xen-3/debian/arch/amd64/defines
trunk/xen-3/debian/arch/i386/defines
trunk/xen-3/debian/bin/gencontrol.py
trunk/xen-3/debian/rules
trunk/xen-3/debian/rules.defs
Modified: trunk/xen-3/debian/arch/amd64/defines
=============================================================================---
trunk/xen-3/debian/arch/amd64/defines (original)
+++ trunk/xen-3/debian/arch/amd64/defines Thu Feb 7 15:49:11 2008
@@ -3,7 +3,7 @@
amd64
xen-arch: x86_64
-[amd64]
+[amd64_base]
class: AMD64
longclass: all 64bit single- and multiprocessor AMD and Intel
Modified: trunk/xen-3/debian/arch/i386/defines
=============================================================================---
trunk/xen-3/debian/arch/i386/defines (original)
+++ trunk/xen-3/debian/arch/i386/defines Thu Feb 7 15:49:11 2008
@@ -4,14 +4,14 @@
i386-nonpae
xen-arch: x86_32
-[i386]
+[i386_base]
class: i386
config: pae=y
desc:
This version of the hypervisor is built with PAE enabled. If you have a cpu
without pae support install the -nonpae version instead.
-[i386-nonpae]
+[i386-nonpae_base]
class: i386 without pae
desc:
This version of the hypervisor is built without PAE.
Modified: trunk/xen-3/debian/bin/gencontrol.py
=============================================================================---
trunk/xen-3/debian/bin/gencontrol.py (original)
+++ trunk/xen-3/debian/bin/gencontrol.py Thu Feb 7 15:49:11 2008
@@ -1,16 +1,17 @@
#!/usr/bin/env python
+
import os, sys
sys.path.append(os.path.join(sys.path[0], "../lib/python"))
+
from debian_xen.debian import VersionXen
+from debian_linux.config import ConfigCoreHierarchy
+from debian_linux.debian import Changelog
from debian_linux.gencontrol import Gencontrol as Base
-from debian_linux.config import *
-from debian_linux.debian import *
+from debian_linux.utils import Templates
class Gencontrol(Base):
- makefile_targets = (''binary-arch'',
''build'', ''setup'')
-
def __init__(self):
- super(Gencontrol, self).__init__()
+ super(Gencontrol,
self).__init__(ConfigCoreHierarchy(["debian/arch"]),
Templates(["debian/templates"]))
self.process_changelog()
def do_main_setup(self, vars, makeflags, extra):
@@ -48,32 +49,21 @@
j = self.substitute(self.templates["xen-utils.%s" % i],
vars)
file("debian/%s.%s" % (package_utils_name, i),
''w'').write(j)
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real
binary-arch-arch %s" % makeflags))
- cmds_build = []
- cmds_build.append(("$(MAKE) -f debian/rules.real build-arch
%s" % makeflags,))
- cmds_setup = []
- cmds_setup.append(("$(MAKE) -f debian/rules.real setup-arch
%s" % makeflags,))
- makefile.append(("binary-arch-%s-real:" % arch,
cmds_binary_arch))
- makefile.append(("build-%s-real:" % arch, cmds_build))
- makefile.append(("setup-%s-real:" % arch, cmds_setup))
+ cmds_binary_arch = ["$(MAKE) -f debian/rules.real binary-arch-arch
%s" % makeflags]
+ 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(''setup_%s_real'' % arch, cmds =
cmds_setup)
- def do_subarch_makefile(self, makefile, arch, subarch, makeflags, extra):
- pass
-
- def do_flavour_setup(self, vars, makeflags, arch, subarch, flavour, extra):
+ def do_flavour_setup(self, vars, makeflags, arch, featureset, flavour,
extra):
for i in (
(''config'', ''CONFIG''),
):
if vars.has_key(i[0]):
makeflags[i[1]] = vars[i[0]]
- def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags,
extra):
- for i in self.makefile_targets:
- makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch,
flavour))
- makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch,
flavour, i, arch, flavour))
-
- def do_flavour_packages(self, packages, makefile, arch, subarch, flavour,
vars, makeflags, extra):
+ def do_flavour_packages(self, packages, makefile, arch, featureset,
flavour, vars, makeflags, extra):
hypervisor = self.templates["control.hypervisor"]
if not vars.has_key(''desc''):
@@ -97,16 +87,12 @@
j = self.substitute(self.templates["xen-hypervisor.%s" %
i], vars)
file("debian/%s.%s" % (package_name, i),
''w'').write(j)
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real
binary-arch-flavour %s" % makeflags,))
- cmds_build = []
- cmds_build.append(("$(MAKE) -f debian/rules.real build-flavour
%s" % makeflags,))
- cmds_setup = []
- cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour
%s" % makeflags,))
- makefile.append(("binary-arch-%s-%s-real:" % (arch, flavour),
cmds_binary_arch))
- makefile.append(("build-%s-%s-real:" % (arch, flavour),
cmds_build))
- makefile.append(("setup-%s-%s-real:" % (arch, flavour),
cmds_setup))
- makefile.append(("source-%s-%s-real:" % (arch, flavour)))
+ cmds_binary_arch = ["$(MAKE) -f debian/rules.real
binary-arch-flavour %s" % makeflags]
+ cmds_build = ["$(MAKE) -f debian/rules.real build-flavour %s"
% makeflags]
+ cmds_setup = ["$(MAKE) -f debian/rules.real setup-flavour %s"
% makeflags]
+ makefile.add("binary-arch_%s_%s_%s" % (arch, featureset,
flavour), cmds = cmds_binary_arch)
+ makefile.add("build_%s_%s_%s" % (arch, featureset, flavour),
cmds = cmds_build)
+ makefile.add("setup_%s_%s_%s" % (arch, featureset, flavour),
cmds = cmds_setup)
def process_changelog(self):
changelog = Changelog(version = VersionXen)
Modified: trunk/xen-3/debian/rules
=============================================================================---
trunk/xen-3/debian/rules (original)
+++ trunk/xen-3/debian/rules Thu Feb 7 15:49:11 2008
@@ -15,13 +15,13 @@
setup: $(STAMPS_DIR)/setup-base
$(STAMPS_DIR)/setup-base: debian/control $(BUILD_DIR) $(STAMPS_DIR)
dh_testdir
- $(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
touch $@
build: debian/control $(STAMPS_DIR)/build-base
$(STAMPS_DIR)/build-base: $(STAMPS_DIR)/setup-base
dh_testdir
- $(MAKE) -f debian/rules.gen build-$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen build_$(DEB_HOST_ARCH)
touch $@
$(BUILD_DIR) $(STAMPS_DIR):
@@ -42,7 +42,7 @@
binary-arch:
dh_testdir
- $(MAKE) -f debian/rules.gen binary-arch-$(DEB_HOST_ARCH)
+ $(MAKE) -f debian/rules.gen binary-arch_$(DEB_HOST_ARCH)
binary: binary-indep binary-arch
Modified: trunk/xen-3/debian/rules.defs
=============================================================================---
trunk/xen-3/debian/rules.defs (original)
+++ trunk/xen-3/debian/rules.defs Thu Feb 7 15:49:11 2008
@@ -1,4 +1,4 @@
-KERNELVERSION := 2.6.22-3
+KERNELVERSION := 2.6.24-1
BUILD_DIR = debian/build
STAMPS_DIR = debian/stamps
TEMPLATES_DIR = debian/templates