Re: [PATCH v2 4/7] builddeb: avoid invoking sub-shells where possible

From: Ben Hutchings
Date: Tue Jan 21 2020 - 14:21:53 EST


On Thu, 2020-01-16 at 01:25 +0900, Masahiro Yamada wrote:
> The commands surrounded by ( ... ) is run in a sub-shell, but you do
> not have to spawn a sub-shell for every single line.
>
> Use just one ( ... ) for creating debian/hdrsrcfiles.
>
> For tar, use -C option instead.
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> ---
>
> Changes in v2:
> - fix misconversion pointed out by Ben
>
> scripts/package/builddeb | 39 ++++++++++++++++++++++++++-------------
> 1 file changed, 26 insertions(+), 13 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 9b92745bf13a..7d7e0abe62b6 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -165,21 +165,34 @@ EOF
> done
>
> # Build kernel header package
> -(cd $srctree; find . arch/$SRCARCH -maxdepth 1 -name Makefile\*) > debian/hdrsrcfiles
> -(cd $srctree; find include scripts -type f -o -type l) >> debian/hdrsrcfiles
> -(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform) >> debian/hdrsrcfiles
> -(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f) >> debian/hdrsrcfiles
> -if is_enabled CONFIG_STACK_VALIDATION; then
> - echo tools/objtool/objtool >> debian/hdrobjfiles
> -fi
> -find arch/$SRCARCH/include Module.symvers include scripts -type f >> debian/hdrobjfiles
> -if is_enabled CONFIG_GCC_PLUGINS; then
> - find scripts/gcc-plugins -name \*.so >> debian/hdrobjfiles
> -fi
> +(
> + cd $srctree
> + find . arch/$SRCARCH -maxdepth 1 -name Makefile\*
> + find include scripts -type f -o -type l
> + find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform
> + find arch/$SRCARCH/include -type f
[...]

This last command is still wrong as I commented on v1. I think it
should be:

find $(find arch/$SRCARCH -name include -type d) -type f

Ben.

--
Ben Hutchings
If God had intended Man to program,
we'd have been born with serial I/O ports.

Attachment: signature.asc
Description: This is a digitally signed message part