debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

gencontrol.py: rename docs section to packages 

prelude to adding more options to disable some packages
This commit is contained in:
Yves-Alexis Perez 2015-11-12 21:17:54 +01:00
parent 757098d2d7
commit 91d01a70ac
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/bin/gencontrol.py vendored
View File

@ -42,8 +42,8 @@ class Gencontrol(Base):
'flavours': config.SchemaItemList(), 'flavours': config.SchemaItemList(),
'versions': config.SchemaItemList(), 'versions': config.SchemaItemList(),
}, },
'docs': { 'packages': {
'enabled': config.SchemaItemBoolean(), 'docs': config.SchemaItemBoolean(),
} }
} }
@ -109,7 +109,7 @@ class Gencontrol(Base):
makeflags = makeflags.copy() makeflags = makeflags.copy()
makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled) makeflags['ALL_FEATURESETS'] = ' '.join(fs_enabled)
makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled) makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
if not self.config.merge('docs').get('enabled', True): if not self.config.merge('packages').get('docs', True):
makeflags['DO_DOCS'] = False makeflags['DO_DOCS'] = False
super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra) super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
@ -118,7 +118,7 @@ class Gencontrol(Base):
def do_main_packages(self, packages, vars, makeflags, extra): def do_main_packages(self, packages, vars, makeflags, extra):
packages.extend(self.process_packages(self.templates["control.main"], self.vars)) packages.extend(self.process_packages(self.templates["control.main"], self.vars))
if self.config.merge('docs').get('enabled', True): if self.config.merge('packages').get('docs', True):
packages.extend(self.process_packages(self.templates["control.docs"], self.vars)) packages.extend(self.process_packages(self.templates["control.docs"], self.vars))
arch_makeflags = ( arch_makeflags = (