aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastian Blank <waldi@debian.org>2021-07-29 15:07:02 +0200
committerBastian Blank <waldi@debian.org>2021-07-29 15:07:02 +0200
commitcc417b4263e98b0db49ce37160408b8e42bc7af9 (patch)
tree346cdcc7b1f900e3a13a08ed59a4e2533662a3ec
parentdc601b255f6dd8fa819d718960c00c23174f3c24 (diff)
downloadkernel_replicant_linux-cc417b4263e98b0db49ce37160408b8e42bc7af9.tar.gz
kernel_replicant_linux-cc417b4263e98b0db49ce37160408b8e42bc7af9.tar.bz2
kernel_replicant_linux-cc417b4263e98b0db49ce37160408b8e42bc7af9.zip
Allow to override top-level config
Including kernelarch-X configs is kind of a special case. This config was dropped if someone ever wanted to override config files for the top-level config.
-rwxr-xr-xdebian/bin/gencontrol.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 3afe38e94f02..fd45693e735d 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -608,9 +608,9 @@ class Gencontrol(Base):
return check_config_files(configs)
kconfig = check_config('config', True)
- kconfig.extend(check_config("kernelarch-%s/config" %
- config_entry_base['kernel-arch'],
- False))
+ # XXX: We have no way to override kernelarch-X configs
+ kconfig.extend(check_config_default(False,
+ "kernelarch-%s/config" % config_entry_base['kernel-arch']))
kconfig.extend(check_config("%s/config" % arch, True, arch))
kconfig.extend(check_config("%s/config.%s" % (arch, flavour), False,
arch, None, flavour))