[kernel] r18502 - in dists/trunk/linux-2.6/debian: bin config/s390 config/s390x
Bastian Blank
waldi at alioth.debian.org
Wed Jan 11 21:02:21 UTC 2012
Author: waldi
Date: Wed Jan 11 21:02:19 2012
New Revision: 18502
Log:
* debian/bin/gencontrol.py: Use modules setting in build section.
* debian/config/s390/defines, debian/config/s390x/defines: Adopt changes.
Modified:
dists/trunk/linux-2.6/debian/bin/gencontrol.py
dists/trunk/linux-2.6/debian/config/s390/defines
dists/trunk/linux-2.6/debian/config/s390x/defines
Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 20:55:10 2012 (r18501)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py Wed Jan 11 21:02:19 2012 (r18502)
@@ -18,11 +18,9 @@
'abi': {
'ignore-changes': config.SchemaItemList(),
},
- 'base': {
- 'modules': config.SchemaItemBoolean(),
- },
'build': {
'debug-info': config.SchemaItemBoolean(),
+ 'modules': config.SchemaItemBoolean(),
},
'description': {
'parts': config.SchemaItemList(),
@@ -245,9 +243,7 @@
if config_entry_image['type'] == 'plain-s390-tape':
image = self.templates["control.image.type-standalone"]
- build_modules = False
else:
- build_modules = True
image = self.templates["control.image.type-%s" % config_entry_image['type']]
config_entry_xen = self.config.merge('xen', arch, featureset, flavour)
@@ -264,7 +260,7 @@
packages_own.append(self.process_real_image(image[0], image_fields, vars))
packages_own.extend(self.process_packages(image[1:], vars))
- if build_modules:
+ if config_entry_build.get('modules', True):
makeflags['MODULES'] = True
package_headers = self.process_package(headers[0], vars)
package_headers['Depends'].extend(relations_compiler)
Modified: dists/trunk/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/defines Wed Jan 11 20:55:10 2012 (r18501)
+++ dists/trunk/linux-2.6/debian/config/s390/defines Wed Jan 11 21:02:19 2012 (r18502)
@@ -16,7 +16,7 @@
hardware: IBM S/390
parts: reader
-[s390-tape_base]
+[s390-tape_build]
modules: false
[s390-tape_description]
@@ -32,7 +32,7 @@
hardware: IBM zSeries
parts: reader
-[s390x-tape_base]
+[s390x-tape_build]
modules: false
[s390x-tape_description]
Modified: dists/trunk/linux-2.6/debian/config/s390x/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390x/defines Wed Jan 11 20:55:10 2012 (r18501)
+++ dists/trunk/linux-2.6/debian/config/s390x/defines Wed Jan 11 21:02:19 2012 (r18502)
@@ -20,7 +20,7 @@
[s390x_image]
configs: s390/config.s390x
-[s390x-tape_base]
+[s390x-tape_build]
modules: false
[s390x-tape_description]
More information about the Kernel-svn-changes
mailing list