debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

debian/rules.real: Fix build conditions for headers, debug and signed templates 

The REAL_VERSION and PACKAGE_NAME variables aren't defined at the
point where we use them to check whether the package is enabled.
Replace them with their intended expansions to avoid this problem.
This commit is contained in:
Ben Hutchings 2019-01-17 18:51:43 +00:00
parent a54836a8ea
commit bd07300128
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/rules.real vendored
View File

@ -92,8 +92,8 @@ binary-indep: \
binary-arch-flavour: \
$(call if_package, $(IMAGE_PACKAGE_NAME), install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)) \
$(call if_package, linux-image-$(REAL_VERSION)-dbg, install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR)) \
$(call if_package, linux-headers-$(REAL_VERSION), install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR))
$(call if_package, linux-image-$(ABINAME)$(LOCALVERSION)-dbg, install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR)) \
$(call if_package, linux-headers-$(ABINAME)$(LOCALVERSION), install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR))
binary-indep-featureset: \
$(call if_package, linux-headers-$(ABINAME)-common$(LOCALVERSION), install-common-headers_$(FEATURESET))
@ -521,7 +521,7 @@ install-signed-template_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME)
install-signed-template_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME)
install-signed-template_$(ARCH): CODE_SIGNING_DIR = $(PACKAGE_DIR)/usr/share/code-signing/$(PACKAGE_NAME)
install-signed-template_$(ARCH):
ifneq (,$(filter $(PACKAGE_NAME),$(packages_enabled)))
ifneq (,$(filter linux-image-$(ARCH)-signed-template,$(packages_enabled)))
dh_testdir
dh_testroot
dh_prep