gnuboot-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] Makefile: fix pipefail.


From: Denis 'GNUtoo' Carikli
Subject: [PATCH] Makefile: fix pipefail.
Date: Sat, 13 Jan 2024 17:41:49 +0100

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 <GNUtoo@cyberdimension.org>
---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 47d8c4d5..7cc850e7 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 <http://www.gnu.org/licenses/>.
-#
+
+# For making pipefail work.
+SHELL := bash
 
 .PHONY: all check download modules ich9m-descriptors payloads roms release \
        clean crossgcc-clean install-dependencies-ubuntu \

base-commit: 526761153a2c6cb377cf6a5c6f1f9af45b38ab92
-- 
2.41.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]