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

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

Commit Message

Masahiro Yamada Jan. 15, 2020, 4:25 p.m. UTC
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@kernel.org>
---

Changes in v2:
 - fix misconversion pointed out by Ben

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

Comments

Ben Hutchings Jan. 21, 2020, 7:21 p.m. UTC | #1
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@kernel.org>
> ---
> 
> 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 Jan. 21, 2020, 7:24 p.m. UTC | #2
On Thu, 2020-01-16 at 01:25 +0900, Masahiro Yamada wrote:
[...]
> -if is_enabled CONFIG_STACK_VALIDATION; then
> -	echo tools/objtool/objtool >> debian/hdrobjfiles
> -fi
[...]
> +{
> +	if is_enabled CONFIG_STACK_VALIDATION; then
> +		find tools/objtool -type f -executable
> +	fi
[...]

And this is still undoing part of patch 1.

Ben.
Masahiro Yamada Jan. 25, 2020, 4:05 a.m. UTC | #3
Hi Ben,

On Wed, Jan 22, 2020 at 4:21 AM Ben Hutchings <ben@decadent.org.uk> wrote:
>
> 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@kernel.org>
> > ---
> >
> > 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.


Sorry, I missed your comment in v1.

I will keep the original code here.
Masahiro Yamada Jan. 25, 2020, 4:06 a.m. UTC | #4
Hi Ben,

On Wed, Jan 22, 2020 at 4:24 AM Ben Hutchings <ben@decadent.org.uk> wrote:
>
> On Thu, 2020-01-16 at 01:25 +0900, Masahiro Yamada wrote:
> [...]
> > -if is_enabled CONFIG_STACK_VALIDATION; then
> > -     echo tools/objtool/objtool >> debian/hdrobjfiles
> > -fi
> [...]
> > +{
> > +     if is_enabled CONFIG_STACK_VALIDATION; then
> > +             find tools/objtool -type f -executable
> > +     fi
> [...]
>
> And this is still undoing part of patch 1.
>

You are right. I will fix it.

Patch
diff mbox series

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
+
+	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
+	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