Merge branch 'source_disable' into 'sid'

Don't add linux-source to d/control when source: false

See merge request kernel-team/linux!104

debian/README.source

@@ -238,6 +238,7 @@ Several build profiles are understood and supported:
 - pkg.linux.notools: Exclude userland tool packages (linux-kbuild-<version>,
   linux-perf-<version>, etc.)
 - pkg.linux.nokernel: Exclude kernel image and header packages
+- pkg.linux.nosource: Exclude source binary package (linux-source-<version>)
 - cross: Needed when cross-building.  Currently this must be used together
   with nopython as the build-dependencies will be unsatisfiable otherwise.
 - nopython: Disable Python bindings.  This currently disables building the

debian/bin/gencontrol.py

@@ -177,6 +177,9 @@ class Gencontrol(Base):
         if self.config.merge('packages').get('tools-versioned', True):
             packages.extend(self.process_packages(
                 self.templates["control.tools-versioned"], self.vars))
+        if self.config.merge('packages').get('source', True):
+            packages.extend(self.process_packages(
+                self.templates["control.sourcebin"], self.vars))
 
         self._substitute_file('perf.lintian-overrides', self.vars,
                               'debian/linux-perf-%s.lintian-overrides' %

debian/changelog

@@ -1,3 +1,12 @@
+linux (4.19.16-2) UNRELEASED; urgency=medium
+
+  * Do not generate linux-source-$ver stanza in debian/control if
+    source is set to disabled in debian/config/defines.
+  * linux-perf: explicitly disable the jvmti feature and shared library.
+  * Document pkg.linux.nosource in debian/README.source.
+
+ -- Luca Boccassi <bluca@debian.org>  Fri, 18 Jan 2019 19:09:06 +0000
+
 linux (4.19.16-1) unstable; urgency=medium
 
   * New upstream stable update:

debian/rules.d/tools/perf/Makefile

@@ -21,6 +21,9 @@ MAKE_PERF := $(MAKE) O=$(CURDIR) prefix=/usr V=1 VF=1 ARCH=$(KERNEL_ARCH) WERROR
 # Disable Gtk UI until it's more usable
 MAKE_PERF += NO_GTK2=1
 
+# Do not build the unversioned jvmti library
+MAKE_PERF += feature-jvmti=0
+
 # Include version in all directory names
 MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) perf_include_dir=include/perf_$(VERSION) perf_examples_dir=share/doc/linux-perf-$(VERSION)/examples
 

debian/templates/control.main.in

@@ -1,19 +1,3 @@
-Package: @source_basename@-source-@version@
-Build-Profiles: <!stage1 !pkg.linux.nosource>
-Architecture: all
-Section: kernel
-Build-Depends: patchutils
-Depends: binutils, xz-utils, ${misc:Depends}
-Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@
-Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
-Multi-Arch: foreign
-Description: Linux kernel source for version @version@ with Debian patches
- This package provides source code for the Linux kernel version @version@.
- This source closely tracks official Linux kernel releases.  Debian's
- modifications to that source consist of security fixes, bug fixes, and
- features that have already been (or are believed to be) accepted by the
- upstream maintainers.
-
 Package: @source_basename@-support-@abiname@
 Build-Profiles: <!stage1>
 Architecture: all

debian/templates/control.sourcebin.in

@@ -0,0 +1,15 @@
+Package: @source_basename@-source-@version@
+Build-Profiles: <!stage1 !pkg.linux.nosource>
+Architecture: all
+Section: kernel
+Build-Depends: patchutils
+Depends: binutils, xz-utils, ${misc:Depends}
+Recommends: libc6-dev | libc-dev, gcc, make, bc, @source_basename@-config-@version@
+Suggests: libncurses-dev | ncurses-dev, libqt4-dev, pkg-config
+Multi-Arch: foreign
+Description: Linux kernel source for version @version@ with Debian patches
+ This package provides source code for the Linux kernel version @version@.
+ This source closely tracks official Linux kernel releases.  Debian's
+ modifications to that source consist of security fixes, bug fixes, and
+ features that have already been (or are believed to be) accepted by the
+ upstream maintainers.