Backport kernel changes

commit b79c6aa6a1f1 ("kbuild: remove unnecessary in-subshell execution")

Signed-off-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
---
 scripts/Makefile.lib | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 4861b1332c3c..28295c7ff125 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -324,7 +324,7 @@ DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), 
$(base-dtb-y)), -@)
 quiet_cmd_dt_S_dtb= DTBS    $@
 # Modified for U-Boot
 cmd_dt_S_dtb=                                          \
-(                                                      \
+{                                                      \
        echo '.section .dtb.init.rodata,"a"';           \
        echo '.balign 16';                              \
        echo '.global __dtb_$(subst -,_,$(*F))_begin';  \
@@ -333,7 +333,7 @@ cmd_dt_S_dtb=                                               
\
        echo '__dtb_$(subst -,_,$(*F))_end:';           \
        echo '.global __dtb_$(subst -,_,$(*F))_end';    \
        echo '.balign 16';                              \
-) > $@
+} > $@
 
 $(obj)/%.dtb.S: $(obj)/%.dtb
        $(call cmd,dt_S_dtb)
@@ -560,20 +560,20 @@ printf "%08x\n" $$dec_size |                              
                \
 )
 
 quiet_cmd_bzip2 = BZIP2   $@
-cmd_bzip2 = (cat $(real-prereqs) | bzip2 -9 && $(size_append)) > $@
+cmd_bzip2 = { cat $(real-prereqs) | bzip2 -9 && $(size_append); } > $@
 
 # Lzma
 # ---------------------------------------------------------------------------
 
 quiet_cmd_lzma = LZMA    $@
-cmd_lzma = (cat $(real-prereqs) | lzma -9 && $(size_append)) > $@
+cmd_lzma = { cat $(real-prereqs) | lzma -9 && $(size_append); } > $@
 
 quiet_cmd_lzo = LZO     $@
-cmd_lzo = (cat $(real-prereqs) | lzop -9 && $(size_append)) > $@
+cmd_lzo = { cat $(real-prereqs) | lzop -9 && $(size_append); } > $@
 
 quiet_cmd_lz4 = LZ4     $@
-cmd_lz4 = (cat $(real-prereqs) | lz4c -l -c1 stdin stdout && \
-       $(size_append)) > $@
+cmd_lz4 = { cat $(real-prereqs) | lz4c -l -c1 stdin stdout && \
+       $(size_append); } > $@
 
 # U-Boot mkimage
 # ---------------------------------------------------------------------------
@@ -617,12 +617,11 @@ quiet_cmd_uimage = UIMAGE  $(UIMAGE_OUT)
 # big dictionary would increase the memory usage too much in the multi-call
 # decompression mode. A BCJ filter isn't used either.
 quiet_cmd_xzkern = XZKERN  $@
-cmd_xzkern = (cat $(filter-out FORCE,$^) | \
-       sh $(srctree)/scripts/xz_wrap.sh && $(size_append)) > $@
+cmd_xzkern = { cat $(filter-out FORCE,$^) | \
+       sh $(srctree)/scripts/xz_wrap.sh && $(size_append); } > $@
 
 quiet_cmd_xzmisc = XZMISC  $@
-cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
-       xz --check=crc32 --lzma2=dict=1MiB) > $@
+cmd_xzmisc = cat $(real-prereqs) | xz --check=crc32 --lzma2=dict=1MiB > $@
 
 # Additional commands for U-Boot
 #
-- 
2.49.0

Reply via email to