switch out to explicit command for printing

canonical · Oct 18, 2023 · f0be594 · f0be594
1 parent 415f3a3
commit f0be594
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 28 deletions.
diff --git a/centos6/Makefile b/centos6/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: centos6.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 centos6.tar.gz: check-deps clean http/centos6.ks
 	${PACKER} init centos6.pkr.hcl && ${PACKER} build centos6.pkr.hcl

diff --git a/centos7/Makefile b/centos7/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: centos7.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 centos7.tar.gz: clean check-deps http/centos7.ks
 	${PACKER} init centos7.pkr.hcl && ${PACKER} build centos7.pkr.hcl

diff --git a/centos8-stream/Makefile b/centos8-stream/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: centos8-stream.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 centos8-stream.tar.gz: check-deps clean http/centos8-stream.ks
 	${PACKER} init centos8-stream.pkr.hcl && ${PACKER} build centos8-stream.pkr.hcl

diff --git a/centos8/Makefile b/centos8/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: centos8.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 centos8.tar.gz: check-deps clean http/centos8.ks
 	${PACKER} init centos8.pkr.hcl && ${PACKER} build centos8.pkr.hcl

diff --git a/rhel7/Makefile b/rhel7/Makefile
@@ -12,8 +12,7 @@ export PACKER_LOG KS_PROXY
 
 all: rhel7.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 rhel7.tar.gz: check-deps clean http/rhel7.ks
 	${PACKER} init rhel7.pkr.hcl && ${PACKER} build -var "rhel7_iso_path=${ISO}" rhel7.pkr.hcl

diff --git a/rhel8/Makefile b/rhel8/Makefile
@@ -12,8 +12,7 @@ export PACKER_LOG KS_PROXY
 
 all: rhel8.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 rhel8.tar.gz: check-deps clean http/rhel8.ks
 	${PACKER} init rhel8.pkr.hcl && ${PACKER} build -var "rhel8_iso_path=${ISO}" rhel8.pkr.hcl

diff --git a/rhel9/Makefile b/rhel9/Makefile
@@ -12,8 +12,7 @@ export PACKER_LOG KS_PROXY
 
 all: rhel9.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 rhel9.tar.gz: check-deps clean http/rhel9.ks
 	${PACKER} init rhel9.pkr.hcl && ${PACKER} build -var "rhel9_iso_path=${ISO}" rhel9.pkr.hcl

diff --git a/rocky8/Makefile b/rocky8/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: rocky8.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 rocky8.tar.gz: check-deps clean http/rocky.ks
 	${PACKER} init rocky8.pkr.hcl && ${PACKER} build rocky8.pkr.hcl

diff --git a/rocky9/Makefile b/rocky9/Makefile
@@ -11,8 +11,7 @@ export PACKER_LOG KS_PROXY
 
 all: rocky9.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 rocky9.tar.gz: check-deps clean http/rocky.ks
 	${PACKER} init rocky9.pkr.hcl && ${PACKER} build rocky9.pkr.hcl

diff --git a/scripts/check.mk b/scripts/check.mk
@@ -1,7 +1,18 @@
 define check_packages_deps
+_current_deps := libnbd-bin nbdkit packer fuse2fs $(1)
+_focal_deps := libnbd0 nbdkit packer fuse2fs $(2)
+
+print-deps:
 	@if [ $(shell lsb_release -sr|cut -d. -f1) -ge 22 ];then \
-		dpkg -s libnbd-bin nbdkit packer fuse2fs $(1); \
+		echo $$(_current_deps); \
 	else \
-		dpkg -s libnbd0 nbdkit packer fuse2fs $(2); \
+		echo $$(_focal_deps); \
+	fi
+
+check-deps:
+	@if [ $(shell lsb_release -sr|cut -d. -f1) -ge 22 ];then \
+		dpkg -s $$(_current_deps) > /dev/null; \
+	else \
+		dpkg -s $$(_focal_deps) > /dev/null; \
 	fi
 endef
diff --git a/sles12/Makefile b/sles12/Makefile
@@ -11,8 +11,7 @@ ISO ?= SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2
 
 all: sles12.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 sles12.tar.gz: check-deps clean
 	${PACKER} init sles.pkr.hcl && ${PACKER} build -var "sles12_iso_path=${ISO}" -on-error=ask sles.pkr.hcl

diff --git a/sles15/Makefile b/sles15/Makefile
@@ -11,8 +11,7 @@ ISO ?= SLE-15-SP4-Full-x86_64-GM-Media1.iso
 
 all: sles15.tar.gz
 
-check-deps:
-	$(call check_packages_deps)
+$(eval $(call check_packages_deps))
 
 sles15.tar.gz: check-deps clean
 	${PACKER} init sles.pkr.hcl && ${PACKER} build -var "sles15_iso_path=${ISO}" -on-error=ask sles.pkr.hcl

diff --git a/ubuntu/Makefile b/ubuntu/Makefile
@@ -10,8 +10,7 @@ export PACKER_LOG
 
 all: custom-cloudimg.tar.gz
 
-check-deps:
-	$(call check_packages_deps,cloud-image-utils ovmf,cloud-image-utils ovmf)
+$(eval $(call check_packages_deps,cloud-image-utils ovmf,cloud-image-utils ovmf))
 
 lint:
 	packer validate .

diff --git a/vmware-esxi/Makefile b/vmware-esxi/Makefile
@@ -13,8 +13,7 @@ VENV := .ve
 
 all: vmware-esxi.dd.gz
 
-check-deps:
-	$(call check_packages_deps,fusefat,fusefat )
+$(eval $(call check_packages_deps,fusefat,fusefat ))
 
 scripts.tar.xz:
 	export TMP_DIR=$$(mktemp -d /tmp/packer-maas-XXXX);\