@@ -46,8 +46,9 @@ endif
# The debug packages are ginormous, so you probably want to skip
# building them (as a developer).
#
+do_dbgsym_package = true
ifeq ($(full_build),false)
-skipdbg=true
+ do_dbgsym_package = false
endif
abinum := $(firstword $(subst .,$(space),$(revision)))
@@ -80,7 +80,7 @@ printenv:
@echo "variants = $(variants)"
@echo "flavours = $(flavours)"
@echo "skip_checks = $(skip_checks)"
- @echo "skipdbg = $(skipdbg)"
+ @echo "do_dbgsym_package = $(do_dbgsym_package)"
@echo "CONCURRENCY_LEVEL = $(CONCURRENCY_LEVEL)"
@echo "ubuntu_selftests = $(ubuntu_selftests)"
@echo "bin package name = $(bin_pkg_name)"
@@ -53,7 +53,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-%
@echo Debug: $@ build_image $(build_image) bldimg $(bldimg)
$(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(filter true,$(do_dtbs)),dtbs)
-ifneq ($(skipdbg),true)
+ifeq ($(do_dbgsym_package),true)
# The target scripts_gdb is part of "all", so we need to call it manually
if grep -q CONFIG_GDB_SCRIPTS=y $(builddir)/build-$*/.config; then \
$(build_cd) $(kmake) $(build_O) $(conc_level) scripts_gdb ; \
@@ -122,7 +122,7 @@ $(foreach _m,$(all_dkms_modules), \
$(eval $$(stampdir)/stamp-install-%: enable_$(_m) = $$(filter true,$$(call custom_override,do_$(_m),$$*))) \
$(eval $$(stampdir)/stamp-install-%: dkms_$(_m)_pkgdir = $$(CURDIR)/debian/$(dkms_$(_m)_pkg_name)-$$*) \
)
-$(stampdir)/stamp-install-%: dbgpkgdir_dkms = $(if $(filter true,$(skipdbg)),"",$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel)
+$(stampdir)/stamp-install-%: dbgpkgdir_dkms = $(if $(filter true,$(do_dbgsym_package)),$(dbgpkgdir)/usr/lib/debug/lib/modules/$(abi_release)-$*/kernel,"")
$(stampdir)/stamp-install-%: $(stampdir)/stamp-build-% $(stampdir)/stamp-install-headers
@echo Debug: $@ kernel_file $(kernel_file) kernfile $(kernfile) install_file $(install_file) instfile $(instfile)
dh_testdir
@@ -132,7 +132,7 @@ $(stampdir)/stamp-install-%: $(stampdir)/stamp-build-% $(stampdir)/stamp-install
$(foreach _m,$(all_standalone_dkms_modules), \
$(if $(enable_$(_m)),dh_prep -p$(dkms_$(_m)_pkg_name)-$*;)\
)
-ifneq ($(skipdbg),true)
+ifeq ($(do_dbgsym_package),true)
dh_prep -p$(bin_pkg_name)-$*-dbgsym
endif
ifeq ($(do_extras_package),true)
@@ -297,7 +297,7 @@ ifneq ($(skipsub),true)
done
endif
-ifneq ($(skipdbg),true)
+ifeq ($(do_dbgsym_package),true)
# Debug image is simple
install -m644 -D $(builddir)/build-$*/vmlinux \
$(dbgpkgdir)/usr/lib/debug/boot/vmlinux-$(abi_release)-$*
@@ -444,7 +444,7 @@ endif
)
-ifneq ($(skipdbg),true)
+ifeq ($(do_dbgsym_package),true)
# Add .gnu_debuglink sections to each stripped .ko
# pointing to unstripped verson
find $(pkgdir) \
@@ -655,7 +655,7 @@ ifneq ($(skipsub),true)
done
endif
-ifneq ($(skipdbg),true)
+ifeq ($(do_dbgsym_package),true)
$(call dh_all,$(dbgpkg)) -- -Zxz
# Hokay...here's where we do a little twiddling...
Rename the variable skipdbg' to 'do_dbgsym_package' to match the naming convention of the 'do_<foo>' variables, since that is what it really does. Obvioulsy inverse the logic. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/0-common-vars.mk | 3 ++- debian/rules.d/1-maintainer.mk | 2 +- debian/rules.d/2-binary-arch.mk | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-)