[4/7] builddeb: avoid invoking sub-shells where possible
diff mbox series

Message ID 20200113064841.3946-4-masahiroy@kernel.org
State New
Headers show
Series
  • [1/7] builddeb: remove unneeded files in hdrobjfiles for headers package
Related show

Commit Message

Masahiro Yamada Jan. 13, 2020, 6:48 a.m. UTC
The commands surrounded by ( ... ) is run in a sub-shell, but you do
not have to invoke it for every single line.

Use just one ( ... ) for creating debian/hdrsrcfiles.

For tar, use -C option instead.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/builddeb | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

Comments

Ben Hutchings Jan. 13, 2020, 5:21 p.m. UTC | #1
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
Masahiro Yamada Jan. 14, 2020, 8:04 a.m. UTC | #2
Hi Ben,

On Tue, Jan 14, 2020 at 2:21 AM Ben Hutchings <ben@decadent.org.uk> wrote:
> > +(
> > +     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.

Thank you for catching these.

I made a mistake somehow
when I inserted the patch 1, and then
rebased the others on top of it.

I will fix it in v2.

Patch
diff mbox series

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 9b92745bf13a..7c561ffe1de0 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 -name include -type f
+
+	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
+} > 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