[kernel] r4806 - in people/waldi/linux-2.6/debian: bin
lib/python/debian_linux
Bastian Blank
waldi at costa.debian.org
Sun Nov 13 15:55:51 UTC 2005
Author: waldi
Date: Sun Nov 13 15:55:48 2005
New Revision: 4806
Modified:
people/waldi/linux-2.6/debian/bin/gencontrol.py
people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/bin/gencontrol.py: Move linux-2.6 specific code from
debian/lib/python/debian_linux/gencontrol.py.
Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py Sun Nov 13 15:55:48 2005
@@ -4,7 +4,83 @@
import debian_linux.gencontrol
class gencontrol(debian_linux.gencontrol.gencontrol):
- pass
+ def do_subarch_makeflags(self, makeflags, arch, subarch):
+ config_entry = self.config[arch, subarch]
+ for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
+ if config_entry.has_key(i[0]):
+ makeflags[i[1]] = config_entry[i[0]]
+
+ def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
+ headers_subarch = self.templates["control.headers.subarch"]
+ package_headers = self.process_package(headers_subarch[0], vars)
+
+ name = package_headers['Package']
+ if packages.has_key(name):
+ package_headers = packages.get(name)
+ package_headers['Architecture'][1].append(arch)
+ else:
+ package_headers['Architecture'] = (' ', [arch])
+ packages.append(package_headers)
+
+ makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
+ cmds_binary_arch = []
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags_string,))
+ cmds_setup = []
+ cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % makeflags_string,))
+ makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
+ makefile.append("build-%s-%s-real:" % (arch, subarch))
+ makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
+
+ def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
+ config_entry = self.config[arch, subarch, flavour]
+ makeflags['TYPE'] = 'kernel-package'
+ for i in (
+ ('compiler', 'COMPILER'),
+ ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
+ ('kpkg-subarch', 'KPKG_SUBARCH'),
+ ('type', 'TYPE'),
+ ):
+ if config_entry.has_key(i[0]):
+ makeflags[i[1]] = config_entry[i[0]]
+
+ def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
+ image = self.templates["control.image"]
+ headers = self.templates["control.headers"]
+ image_latest = self.templates["control.image.latest"]
+ headers_latest = self.templates["control.headers.latest"]
+
+ packages_own = []
+ packages_dummy = []
+ packages_own.append(self.process_real_image(image[0], vars))
+ packages_own.append(self.process_package(headers[0], vars))
+ packages_dummy.extend(self.process_packages(image_latest, vars))
+ packages_dummy.append(self.process_package(headers_latest[0], vars))
+
+ for package in packages_own + packages_dummy:
+ name = package['Package']
+ if packages.has_key(name):
+ package = packages.get(name)
+ package['Architecture'][1].append(arch)
+ else:
+ package['Architecture'] = (' ', [arch])
+ packages.append(package)
+
+ package_headers_arch_depends.append(packages_own[1]['Package'])
+
+ makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
+
+ cmds_binary_arch = []
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
+ cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
+ cmds_build = []
+ cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
+ cmds_setup = []
+ cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
+ makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
+ makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
+ makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
+
if __name__ == '__main__':
gencontrol()()
Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py (original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py Sun Nov 13 15:55:48 2005
@@ -148,10 +148,7 @@
self.do_flavour(packages, makefile, arch, subarch, flavour, vars.copy(), makeflags.copy(), package_headers_arch_depends)
def do_subarch_makeflags(self, makeflags, arch, subarch):
- config_entry = self.config[arch, subarch]
- for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
- if config_entry.has_key(i[0]):
- makeflags[i[1]] = config_entry[i[0]]
+ pass
def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
for i in ('binary-arch', 'build', 'setup'):
@@ -161,29 +158,7 @@
makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch))
def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
- headers_subarch = self.templates["control.headers.subarch"]
- package_headers = self.process_package(headers_subarch[0], vars)
-
- name = package_headers['Package']
- if packages.has_key(name):
- package_headers = packages.get(name)
- package_headers['Architecture'][1].append(arch)
- else:
- package_headers['Architecture'] = (' ', [arch])
- packages.append(package_headers)
-
- self.do_subarch_packages_makefile(makefile, arch, subarch, makeflags)
-
- def do_subarch_packages_makefile(self, makefile, arch, subarch, makeflags):
- makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-subarch %s" % makeflags_string,))
- cmds_setup = []
- cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % makeflags_string,))
- makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
- makefile.append("build-%s-%s-real:" % (arch, subarch))
- makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
+ pass
def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
config_entry = self.config[arch, subarch, flavour]
@@ -201,16 +176,7 @@
self.do_flavour_packages(packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends)
def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
- config_entry = self.config[arch, subarch, flavour]
- makeflags['TYPE'] = 'kernel-package'
- for i in (
- ('compiler', 'COMPILER'),
- ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),
- ('kpkg-subarch', 'KPKG_SUBARCH'),
- ('type', 'TYPE'),
- ):
- if config_entry.has_key(i[0]):
- makeflags[i[1]] = config_entry[i[0]]
+ pass
def do_flavour_makefile(self, makefile, arch, subarch, flavour, makeflags):
for i in ('binary-arch', 'build', 'setup'):
@@ -218,41 +184,7 @@
makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour))
def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
- image = self.templates["control.image"]
- headers = self.templates["control.headers"]
- image_latest = self.templates["control.image.latest"]
- headers_latest = self.templates["control.headers.latest"]
-
- packages_own = []
- packages_dummy = []
- packages_own.append(self.process_real_image(image[0], vars))
- packages_own.append(self.process_package(headers[0], vars))
- packages_dummy.extend(self.process_packages(image_latest, vars))
- packages_dummy.append(self.process_package(headers_latest[0], vars))
-
- for package in packages_own + packages_dummy:
- name = package['Package']
- if packages.has_key(name):
- package = packages.get(name)
- package['Architecture'][1].append(arch)
- else:
- package['Architecture'] = (' ', [arch])
- packages.append(package)
-
- package_headers_arch_depends.append(packages_own[1]['Package'])
-
- makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
-
- cmds_binary_arch = []
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real binary-arch-flavour %s" % makeflags_string,))
- cmds_binary_arch.append(("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s'" % ' '.join(["-p%s" % i['Package'] for i in packages_dummy]),))
- cmds_build = []
- cmds_build.append(("$(MAKE) -f debian/rules.real build %s" % makeflags_string,))
- cmds_setup = []
- cmds_setup.append(("$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string,))
- makefile.append(("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_binary_arch))
- makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
- makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
+ pass
def process_changelog(self, in_vars):
ret = [None, None, None, None]
More information about the Kernel-svn-changes
mailing list