Commit eb659db2 authored by Ben Hutchings's avatar Ben Hutchings

Merge branch 'linux_source_option' into 'master'

Add source config/defines option to allow disabling linux-source

See merge request kernel-team/linux!13
parents 923552dc b3be4507
...@@ -48,6 +48,7 @@ class Gencontrol(Base): ...@@ -48,6 +48,7 @@ class Gencontrol(Base):
'libc-dev': config.SchemaItemBoolean(), 'libc-dev': config.SchemaItemBoolean(),
'tools-unversioned': config.SchemaItemBoolean(), 'tools-unversioned': config.SchemaItemBoolean(),
'tools-versioned': config.SchemaItemBoolean(), 'tools-versioned': config.SchemaItemBoolean(),
'source': config.SchemaItemBoolean(),
} }
} }
...@@ -111,6 +112,8 @@ class Gencontrol(Base): ...@@ -111,6 +112,8 @@ class Gencontrol(Base):
makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled) makeflags['ALL_TRIPLETS'] = ' '.join(triplet_enabled)
if not self.config.merge('packages').get('docs', True): if not self.config.merge('packages').get('docs', True):
makeflags['DO_DOCS'] = False makeflags['DO_DOCS'] = False
if not self.config.merge('packages').get('source', True):
makeflags['DO_SOURCE'] = False
super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra) super(Gencontrol, self).do_main_makefile(makefile, makeflags, extra)
# linux-source-$UPSTREAMVERSION will contain all kconfig files # linux-source-$UPSTREAMVERSION will contain all kconfig files
......
...@@ -3,6 +3,9 @@ linux (4.17~rc3-1~exp2) UNRELEASED; urgency=medium ...@@ -3,6 +3,9 @@ linux (4.17~rc3-1~exp2) UNRELEASED; urgency=medium
[ Luca Boccassi ] [ Luca Boccassi ]
* Disable building linux-doc-* and tools documentation when the "nodoc" * Disable building linux-doc-* and tools documentation when the "nodoc"
build profile is used. build profile is used.
* Add new "pkg.linux.nosource" build profile that disables building the
linux-source-* package, and a "[packages] source" option for the
debian/config/defines file that defines the default behaviour.
[ John Paul Adrian Glaubitz ] [ John Paul Adrian Glaubitz ]
* [m68k] Enable CONFIG_PATA_GAYLE as module. * [m68k] Enable CONFIG_PATA_GAYLE as module.
...@@ -71,7 +71,11 @@ ifneq ($(DO_DOCS),False) ...@@ -71,7 +71,11 @@ ifneq ($(DO_DOCS),False)
build-indep: $(STAMPS_DIR)/build-doc build-indep: $(STAMPS_DIR)/build-doc
endif endif
endif endif
binary-indep: install-source ifeq (,$(filter pkg.linux.nosource,$(DEB_BUILD_PROFILES)))
ifneq ($(DO_SOURCE),False)
binary-indep: install-source
endif
endif
binary-indep: install-support binary-indep: install-support
ifneq ($(DO_TOOLS_VERSIONED),False) ifneq ($(DO_TOOLS_VERSIONED),False)
......
Package: @source_basename@-source-@version@ Package: @source_basename@-source-@version@
Build-Profiles: <!stage1> Build-Profiles: <!stage1 !pkg.linux.nosource>
Architecture: all Architecture: all
Section: kernel Section: kernel
Depends: binutils, xz-utils, ${misc:Depends} Depends: binutils, xz-utils, ${misc:Depends}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment