Skip to content

Commit

Permalink
builddeb: avoid invoking sub-shells where possible
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
masahir0y committed Jan 28, 2020
1 parent f9a4711 commit 9a92eee
Showing 1 changed file with 22 additions and 13 deletions.
35 changes: 22 additions & 13 deletions scripts/package/builddeb
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,30 @@ 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 $(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
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
Expand Down

0 comments on commit 9a92eee

Please sign in to comment.