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

[Ben Hutchings]

On Mon, 2020-01-13 at 15:48 +0900, Masahiro Yamada wrote:
[...]
> --- 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 -name include -type f

This command is wrong.  We currently find all files under all
directories named "include" under arch/$SRCARCH.  (arc, arm and xtensa
have some per-platform include directories in additional to the per-
architecture include directory.)

> +
> +	if [ -d arch/$SRCARCH/scripts ]; then
> +		find arch/$SRCARCH/scripts -type f
> +	fi
> +) > debian/hdrsrcfiles
> +
> +{
> +	if is_enabled CONFIG_STACK_VALIDATION; then
> +		find tools/objtool -type f -executable
> +	fi
> +
> +	find arch/$SRCARCH/include Module.symvers include scripts -type f
> +
> +	if is_enabled CONFIG_GCC_PLUGINS; then
> +		find scripts/gcc-plugins -name \*.so -o -name gcc-common.h
> +	fi

This is reverting patch 1.

Ben.

> +} > debian/hdrobjfiles
> +
>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>  mkdir -p "$destdir"
> -(cd $srctree; tar -c -f - -T -) < debian/hdrsrcfiles | (cd $destdir; tar -xf -)
> -tar -c -f - -T - < debian/hdrobjfiles | (cd $destdir; tar -xf -)
> +tar -c -f - -C $srctree -T debian/hdrsrcfiles | tar -xf - -C $destdir
> +tar -c -f - -T debian/hdrobjfiles | tar -xf - -C $destdir
>  cp $KCONFIG_CONFIG $destdir/.config # copy .config manually to be where it's expected to be
>  ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
>  rm -f debian/hdrsrcfiles debian/hdrobjfiles
-- 
Ben Hutchings
Unix is many things to many people,
but it's never been everything to anybody.

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