diff options
| author | Ben Hutchings <benh@debian.org> | 2020-09-17 19:07:36 +0100 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2020-09-17 19:10:43 +0100 |
| commit | 36f061ce80471a0203c174c4e241b70af913c260 (patch) | |
| tree | 35ecd385d9811796201b0498ea0dab486a3063e1 /debian/bin | |
| parent | a6397344573761c9706749e7612c948314043587 (diff) | |
| download | kernel_replicant_linux-36f061ce80471a0203c174c4e241b70af913c260.tar.gz kernel_replicant_linux-36f061ce80471a0203c174c4e241b70af913c260.tar.bz2 kernel_replicant_linux-36f061ce80471a0203c174c4e241b70af913c260.zip | |
debian/bin/gencontrol.py: Fix handling of debug info switches
Setting $DEBIAN_KERNEL_DISABLE_DEBUG or clearing the [build]debug-info
config variable should disable generation of debug info and associated
packages. However the recent refactoring of the handling of such
environment variables resulted in different switches being obeyed in
different places.
Set the build_debug variable based on both switches and then use that
consistently.
Diffstat (limited to 'debian/bin')
| -rwxr-xr-x | debian/bin/gencontrol.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 6cbb77ac8bd4..c17be37030e6 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -543,9 +543,12 @@ class Gencontrol(Base): if config_entry_build.get('vdso', False): makeflags['VDSO'] = True - build_debug = config_entry_build.get('debug-info') - if not self.disable_debug: + build_debug = config_entry_build.get('debug-info') + else: + build_debug = False + + if build_debug: makeflags['DEBUG'] = True packages_own.extend(self.process_packages( self.templates['control.image-dbg'], vars)) |