From 52fc40a9cb30bd47d19b988eb29d429a4021a2da Mon Sep 17 00:00:00 2001
From: Ryan Lee <ryan.lee@canonical.com>
Date: Tue, 11 Mar 2025 17:18:35 -0700
Subject: [PATCH] regression: replace command -v with which in Makefile

The command shell builtin is not recognized by older versions of make, so
switch back to using the which binary instead.

Signed-off-by: Ryan Lee <ryan.lee@canonical.com>
---
 common/Make.rules                     |  2 +-
 tests/regression/apparmor/Makefile    | 10 +++++-----
 tests/regression/apparmor/complain.sh |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/Make.rules b/common/Make.rules
index 842789616..4194ddf85 100644
--- a/common/Make.rules
+++ b/common/Make.rules
@@ -35,7 +35,7 @@ VERSION=$(shell cat $(COMMONDIR)/Version)
 pathsearch = $(firstword $(wildcard $(addsuffix /$(1),$(subst :, ,$(PATH)))))
 map = $(foreach a,$(2),$(call $(1),$(a)))
 
-AWK?=$(or $(shell command -v awk),$(error awk utility required for build but not available))
+AWK?=$(or $(shell which awk),$(error awk utility required for build but not available))
 
 define nl
 
diff --git a/tests/regression/apparmor/Makefile b/tests/regression/apparmor/Makefile
index 91ea0e71b..f8bf34d92 100644
--- a/tests/regression/apparmor/Makefile
+++ b/tests/regression/apparmor/Makefile
@@ -27,7 +27,7 @@ manually, or build against in-tree libapparmor.${nl}\
   endif # LIBAPPARMOR not set
   LDLIBS += $(LIBAPPARMOR)
 
-  AA_EXEC = $(shell command -v aa-exec)
+  AA_EXEC = $(shell which aa-exec)
   ifeq ($(AA_EXEC),)
     AA_EXEC_ERROR_MESSAGE = $(error ${nl}\
 ************************************************************************${nl}\
@@ -188,7 +188,7 @@ SRC+=syscall_sysctl.c
 endif
 
 # Only do xattrs_profile test if we have the required setfattr binary
-ifneq (,$(shell command -v setfattr))
+ifneq (,$(shell which setfattr > /dev/null && echo TRUE))
 SRC+=xattrs_profile.c
 else
 $(warning ${nl}\
@@ -199,7 +199,7 @@ Install attr or equivalent package to build and run this test${nl}\
 endif
 
 # Only do overlayfs_fuse test if we have the required fuse-overlayfs binary
-ifeq (,$(shell command -v fuse-overlayfs))
+ifeq (,$(shell which fuse-overlayfs > /dev/null && echo TRUE))
 $(warning ${nl}\
 ************************************************************************${nl}\
 No fuse-overlayfs skipping overlayfs_fuse tests ...${nl}\
@@ -328,12 +328,12 @@ TESTS=aa_exec \
       nfs
 
 # Only do overlayfs_fuse test if we have the required fuse-overlayfs binary
-ifneq (,$(shell command -v fuse-overlayfs))
+ifneq (,$(shell which fuse-overlayfs > /dev/null && echo TRUE))
 TESTS+=overlayfs_fuse
 endif
 
 # Only do xattrs_profile test if we have the required setfattr binary
-ifneq (,$(shell command -v setfattr))
+ifneq (,$(shell which setfattr > /dev/null && echo TRUE))
 TESTS+=xattrs_profile
 endif
 
diff --git a/tests/regression/apparmor/complain.sh b/tests/regression/apparmor/complain.sh
index 6b9b137d6..ffca342e7 100644
--- a/tests/regression/apparmor/complain.sh
+++ b/tests/regression/apparmor/complain.sh
@@ -29,5 +29,5 @@ runchecktest "Complain mode profile (file exec no permission entry)" pass exec e
 
 # This test will fail on a kernel that doesn't have
 # https://lists.ubuntu.com/archives/apparmor/2024-August/013338.html applied
-genprofile -C $(command -v echo):cx
+genprofile -C $(which echo):cx
 runchecktest "Complain mode profile (file exec cx permission entry)" pass exec echo PASS