@@ -34,12 +34,13 @@ upstream_tag := "v$(upstream_version).$(upstream_patchlevel)"
raw_kernelversion=$(shell make kernelversion)
#
-# full_build -- are we doing a full buildd style build
+# do_full_build -- are we doing a full buildd style build, i.e., are we
+# building in a PPA
#
ifeq ($(wildcard /CurrentlyBuilding),)
-full_build?=false
+ do_full_build ?= false
else
-full_build?=true
+ do_full_build ?= true
endif
#
@@ -47,7 +48,7 @@ endif
# building them (as a developer).
#
do_dbgsym_package = true
-ifeq ($(full_build),false)
+ifeq ($(do_full_build),false)
do_dbgsym_package = false
endif
@@ -56,7 +57,7 @@ prev_abinum := $(firstword $(subst .,$(space),$(prev_revision)))
abi_release := $(release)-$(abinum)
uploadnum := $(patsubst $(abinum).%,%,$(revision))
-ifneq ($(full_build),false)
+ifneq ($(do_full_build),false)
uploadnum := $(uploadnum)-Ubuntu
endif
@@ -127,7 +128,7 @@ else
do_doc_package=false
endif
do_doc_package_content=false
-ifeq ($(full_build),false)
+ifeq ($(do_full_build),false)
do_doc_package_content=false
endif
doc_pkg_name=$(src_pkg_name)-doc
@@ -138,7 +139,7 @@ doc_pkg_name=$(src_pkg_name)-doc
#
do_source_package=true
do_source_package_content=true
-ifeq ($(full_build),false)
+ifeq ($(do_full_build),false)
do_source_package_content=false
endif
@@ -110,7 +110,7 @@ printenv:
@echo " uefi_signed = $(uefi_signed)"
@echo " opal_signed = $(opal_signed)"
@echo " sipl_signed = $(sipl_signed)"
- @echo "full_build = $(full_build)"
+ @echo "do_full_build = $(do_full_build)"
@echo "libc_dev_version = $(libc_dev_version)"
@echo "DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE)"
@echo "DEB_BUILD_GNU_TYPE = $(DEB_BUILD_GNU_TYPE)"
@@ -544,7 +544,7 @@ endif
install -m644 $(DROOT)/canonical-certs.pem $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/canonical-certs.pem
install -m644 $(DROOT)/canonical-revoked-certs.pem $(pkgdir_bldinfo)/usr/lib/linux/$(abi_release)-$*/canonical-revoked-certs.pem
-ifneq ($(full_build),false)
+ifneq ($(do_full_build),false)
# Clean out this flavours build directory.
rm -rf $(builddir)/build-$*
endif
@@ -687,7 +687,7 @@ ifeq ($(do_cloud_tools),true)
$(call dh_all,$(pkgcloud))
endif
-ifneq ($(full_build),false)
+ifneq ($(do_full_build),false)
# Clean out the debugging package source directory.
rm -rf $(dbgpkgdir)
endif
Flag variables (that can take true/false values and drive different build behaviors) are named 'do_<foo>'. Rename 'full_build' to follow that convention. While at it, clarify the comment. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- debian/rules.d/0-common-vars.mk | 15 ++++++++------- debian/rules.d/1-maintainer.mk | 2 +- debian/rules.d/2-binary-arch.mk | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-)