From da06a2df8837c4682b3a9d41a65e548bd62b64a3 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sat, 13 Jan 2024 19:15:59 +0100 Subject: [PATCH] Makefile: fix pipefail In the commit d68b4f8930dc47ca23c0d88347a8c33472a9b930 ("Makefile: Add logging.") I forgot to add the SHELL := $(shell which bash) line that is mentionned in the commit to the Makefile. So now the Makefile targets are actually broken: $ make release echo 'Makefile: running release target' >> make-1705163885.log set -o pipefail ; ./build release src | tee -a make-1705163885.log /bin/sh: 1: set: Illegal option -o pipefail make: *** [Makefile:59: release] Error 2 Since 'SHELL := bash' also works on PureOS 10 and Trisquel 10, I'll use that instead as it is more simple. The path of bash is not hardcoded to respect users decisions to use the bash they want, and also to work better with non-FHS distributions. Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Adrien 'neox' Bourmault --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 47d8c4d..7cc850e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,9 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# + +# For making pipefail work. +SHELL := bash .PHONY: all check download modules ich9m-descriptors payloads roms release \ clean crossgcc-clean install-dependencies-ubuntu \