[SRU][H][PATCH 1/2] UBUNTU: [Packaging] Skip d-i code if udebs are disabled

[Juerg Haefliger]

There is some d-i specific code scathered around that doesn't need to be
called if udebs are disabled.

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian/rules                    |  2 ++
 debian/rules.d/2-binary-arch.mk | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index bedcd4f60a52..f66052e74a1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -135,10 +135,12 @@ clean: debian/control debian/canonical-certs.pem
 	dh_testroot
 	dh_clean
 
+ifeq ($(disable_d_i),)
 	# d-i stuff
 	rm -rf $(DEBIAN)/d-i-$(arch)
 	# Generated on the fly.
 	rm -f $(DEBIAN)/d-i/firmware/$(arch)/kernel-image
+endif
 
 	# normal build junk
 	rm -rf $(DEBIAN)/abi/$(release)-$(revision)
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 47efcbd612c9..0b008df5a853 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -175,14 +175,18 @@ endif
 		$(pkgdir)/boot/config-$(abi_release)-$*
 	install -m600 $(builddir)/build-$*/System.map \
 		$(pkgdir)/boot/System.map-$(abi_release)-$*
-	if [ "$(filter true,$(do_dtbs))" ]; then \
-		$(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \
-			INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \
-		( cd $(pkgdir)/lib/firmware/$(abi_release)-$*/ && find device-tree -print ) | \
-		while read dtb_file; do \
-			echo "$$dtb_file ?" >> $(DEBIAN)/d-i/firmware/$(arch)/kernel-image; \
-		done; \
-	fi
+
+ifeq ($(do_dtbs),true)
+	$(build_cd) $(kmake) $(build_O) $(conc_level) dtbs_install \
+		INSTALL_DTBS_PATH=$(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree
+ifeq ($(disable_d_i),)
+	( cd $(pkgdir)/lib/firmware/$(abi_release)-$*/ && find device-tree -print ) | \
+	while read dtb_file; do \
+		echo "$$dtb_file ?" >> $(DEBIAN)/d-i/firmware/$(arch)/kernel-image; \
+	done
+endif
+endif
+
 ifeq ($(no_dumpfile),)
 	makedumpfile -g $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* \
 		-x $(builddir)/build-$*/vmlinux
-- 
2.27.0