From 96e3ed26a7c60908bf0f75f2a7b110a4b02cd723 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 4 Mar 2019 04:14:17 +0000
Subject: [PATCH] debian/bin/gencontrol.py: Add rules to build
 debian/build/config.*

It is no longer possible to run the "setup" rules without a compiler,
because Kconfig symbols can depend on compiler properties.  Add a way
to invoke just the first step of setup, which merges the kconfig files
and overrides together.
---
 debian/bin/gencontrol.py | 6 ++++++
 debian/changelog         | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index d815027aa..96d0dba07 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -580,6 +580,12 @@ class Gencontrol(Base):
         makefile.add('setup_%s_%s_%s_real' % (arch, featureset, flavour),
                      cmds=cmds_setup)
 
+        merged_config = ('debian/build/config.%s_%s_%s' %
+                         (arch, featureset, flavour))
+        makefile.add(merged_config,
+                     cmds=["$(MAKE) -f debian/rules.real %s %s" %
+                           (merged_config, makeflags)])
+
         # Substitute kernel version etc. into maintainer scripts,
         # translations and lintian overrides
         self._substitute_file('headers.postinst', vars,
diff --git a/debian/changelog b/debian/changelog
index 2807301e2..50ae8cb60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ linux (4.19.20-2) UNRELEASED; urgency=medium
   * udeb: Move basic PV modules from {hyperv,virtio}-modules to kernel-image
   * udeb: Move drivers from {hyperv,virtio}-modules to
     {fb,input,nic,scsi}-modules
+  * debian/bin/gencontrol.py: Add rules to build debian/build/config.*
 
   [ Wookey ]
   * linux-perf: Enable coresight trace (libopencsd) support in perf