[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.18] build: Replace `which` with `command -v`
commit 006764b871db75d5d025500a079ad246d1d418a1 Author: Anthony PERARD <anthony.perard@xxxxxxxxxx> AuthorDate: Tue Feb 27 13:56:25 2024 +0100 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Tue Feb 27 13:56:25 2024 +0100 build: Replace `which` with `command -v` The `which` command is not standard, may not exist on the build host, or may not behave as expected by the build system. It is recommended to use `command -v` to find out if a command exist and have its path, and it's part of a POSIX shell standard (at least, it seems to be mandatory since IEEE Std 1003.1-2008, but was optional before). Fixes: c8a8645f1efe ("xen/build: Automatically locate a suitable python interpreter") Fixes: 3b47bcdb6d38 ("xen/build: Use a distro version of figlet") Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> Tested-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx> Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx> master commit: f93629b18b528a5ab1b1092949c5420069c7226c master date: 2024-02-19 12:45:48 +0100 --- xen/Makefile | 4 ++-- xen/build.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index a92709b43e..59d368e4d8 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -25,8 +25,8 @@ export XEN_BUILD_HOST := $(shell hostname) endif # Best effort attempt to find a python interpreter, defaulting to Python 3 if -# available. Fall back to just `python` if `which` is nowhere to be found. -PYTHON_INTERPRETER := $(word 1,$(shell which python3 python python2 2>/dev/null) python) +# available. Fall back to just `python`. +PYTHON_INTERPRETER := $(word 1,$(shell command -v python3 || command -v python || command -v python2) python) export PYTHON ?= $(PYTHON_INTERPRETER) export CHECKPOLICY ?= checkpolicy diff --git a/xen/build.mk b/xen/build.mk index 26dd5a8e87..0f490ca71b 100644 --- a/xen/build.mk +++ b/xen/build.mk @@ -1,6 +1,6 @@ quiet_cmd_banner = BANNER $@ define cmd_banner - if which figlet >/dev/null 2>&1 ; then \ + if command -v figlet >/dev/null 2>&1 ; then \ echo " Xen $(XEN_FULLVERSION)" | figlet -f $< > $@.tmp; \ else \ echo " Xen $(XEN_FULLVERSION)" > $@.tmp; \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.18
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |