tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

kbuild: simplify rules of data compression with size appending

All the callers of size_append pass $(filter-out FORCE,$^).
Move $(filter-out FORCE,$^) to the definition of size_append.

This makes the callers cleaner because $(call ...) is unneeded
for a macro with no argument.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Masahiro Yamada ecbd10d9 d151e971

+7 -11
+7 -11
scripts/Makefile.lib
··· 321 321 # append the size as a 32-bit littleendian number as gzip does. 322 322 size_append = printf $(shell \ 323 323 dec_size=0; \ 324 - for F in $1; do \ 324 + for F in $(filter-out FORCE,$^); do \ 325 325 fsize=$$($(CONFIG_SHELL) $(srctree)/scripts/file-size.sh $$F); \ 326 326 dec_size=$$(expr $$dec_size + $$fsize); \ 327 327 done; \ ··· 335 335 ) 336 336 337 337 quiet_cmd_bzip2 = BZIP2 $@ 338 - cmd_bzip2 = (cat $(filter-out FORCE,$^) | \ 339 - bzip2 -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 338 + cmd_bzip2 = (cat $(filter-out FORCE,$^) | bzip2 -9 && $(size_append)) > $@ 340 339 341 340 # Lzma 342 341 # --------------------------------------------------------------------------- 343 342 344 343 quiet_cmd_lzma = LZMA $@ 345 - cmd_lzma = (cat $(filter-out FORCE,$^) | \ 346 - lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 344 + cmd_lzma = (cat $(filter-out FORCE,$^) | lzma -9 && $(size_append)) > $@ 347 345 348 346 quiet_cmd_lzo = LZO $@ 349 - cmd_lzo = (cat $(filter-out FORCE,$^) | \ 350 - lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ 347 + cmd_lzo = (cat $(filter-out FORCE,$^) | lzop -9 && $(size_append)) > $@ 351 348 352 349 quiet_cmd_lz4 = LZ4 $@ 353 - cmd_lz4 = (cat $(filter-out FORCE,$^) | \ 354 - lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ 350 + cmd_lz4 = (cat $(filter-out FORCE,$^) | lz4c -l -c1 stdin stdout && \ 351 + $(size_append)) > $@ 355 352 356 353 # U-Boot mkimage 357 354 # --------------------------------------------------------------------------- ··· 391 394 # decompression mode. A BCJ filter isn't used either. 392 395 quiet_cmd_xzkern = XZKERN $@ 393 396 cmd_xzkern = (cat $(filter-out FORCE,$^) | \ 394 - sh $(srctree)/scripts/xz_wrap.sh && \ 395 - $(call size_append, $(filter-out FORCE,$^))) > $@ 397 + sh $(srctree)/scripts/xz_wrap.sh && $(size_append)) > $@ 396 398 397 399 quiet_cmd_xzmisc = XZMISC $@ 398 400 cmd_xzmisc = (cat $(filter-out FORCE,$^) | \