* debian/bin/gencontrol.py: Use modules setting in build section.
* debian/config/s390/defines, debian/config/s390x/defines: Adopt changes. svn path=/dists/trunk/linux-2.6/; revision=18502
This commit is contained in:
parent
6a75386bae
commit
2ca47caafc
|
@ -18,11 +18,9 @@ class Gencontrol(Base):
|
|||
'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 @@ class Gencontrol(Base):
|
|||
|
||||
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 @@ class Gencontrol(Base):
|
|||
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)
|
||||
|
|
|
@ -16,7 +16,7 @@ bootloaders: s390-tools
|
|||
hardware: IBM S/390
|
||||
parts: reader
|
||||
|
||||
[s390-tape_base]
|
||||
[s390-tape_build]
|
||||
modules: false
|
||||
|
||||
[s390-tape_description]
|
||||
|
@ -32,7 +32,7 @@ type: plain-s390-tape
|
|||
hardware: IBM zSeries
|
||||
parts: reader
|
||||
|
||||
[s390x-tape_base]
|
||||
[s390x-tape_build]
|
||||
modules: false
|
||||
|
||||
[s390x-tape_description]
|
||||
|
|
|
@ -20,7 +20,7 @@ parts: reader
|
|||
[s390x_image]
|
||||
configs: s390/config.s390x
|
||||
|
||||
[s390x-tape_base]
|
||||
[s390x-tape_build]
|
||||
modules: false
|
||||
|
||||
[s390x-tape_description]
|
||||
|
|
Loading…
Reference in New Issue