From 261a46449cb98975851968fb2b7a285b7f8c16f1 Mon Sep 17 00:00:00 2001 From: lisa neigut Date: Fri, 1 May 2020 18:24:39 -0500 Subject: [PATCH] wire: suppress printout from patch command We were using patch's '--silent' flag, but that broke on the busybox implementation of `patch`, since they don't support it. Instead, we use the universally supported "pipe to /dev/null" approach Suggested-By: @rustyrussell Changelog-None --- wire/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wire/Makefile b/wire/Makefile index 92bec190b..651a4dfda 100644 --- a/wire/Makefile +++ b/wire/Makefile @@ -53,10 +53,10 @@ EXPERIMENTAL_PEER_PATCHES := $(wildcard wire/extracted_peer_experimental_*) EXPERIMENTAL_ONION_PATCHES := $(wildcard wire/extracted_onion_experimental_*) wire/gen_peer_wire_csv: wire/extracted_peer_wire_csv $(EXPERIMENTAL_PEER_PATCHES) - @set -e; trap "rm -f $@.$$$$" 0; cp $< $@.$$$$; for exp in $(EXPERIMENTAL_PEER_PATCHES); do patch $@.$$$$ $$exp; done; mv $@.$$$$ $@ + @set -e; trap "rm -f $@.$$$$" 0; cp $< $@.$$$$; for exp in $(EXPERIMENTAL_PEER_PATCHES); do patch $@.$$$$ $$exp >/dev/null ; done; mv $@.$$$$ $@ wire/gen_onion_wire_csv: wire/extracted_onion_wire_csv $(EXPERIMENTAL_ONION_PATCHES) - @set -e; trap "rm -f $@.$$$$" 0; cp $< $@.$$$$; for exp in $(EXPERIMENTAL_ONION_PATCHES); do patch $@.$$$$ $$exp; done; mv $@.$$$$ $@ + @set -e; trap "rm -f $@.$$$$" 0; cp $< $@.$$$$; for exp in $(EXPERIMENTAL_ONION_PATCHES); do patch $@.$$$$ $$exp; done >/dev/null ; mv $@.$$$$ $@ else # /* EXPERIMENTAL_FEATURES */ wire/gen_peer_wire_csv: wire/extracted_peer_wire_csv