From: Ben Hutchings <ben@decadent.org.uk>
To: Masahiro Yamada <masahiroy@kernel.org>, linux-kbuild@vger.kernel.org
Cc: Riku Voipio <riku.voipio@linaro.org>,
Michal Marek <michal.lkml@markovi.net>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 4/7] builddeb: avoid invoking sub-shells where possible
Date: Mon, 13 Jan 2020 17:21:42 +0000 [thread overview]
Message-ID: <7da5750c40489dcb6cd8eef0307ee8d8df2e134e.camel@decadent.org.uk> (raw)
In-Reply-To: <20200113064841.3946-4-masahiroy@kernel.org>
[-- Attachment #1: Type: text/plain, Size: 2656 bytes --]
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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-01-13 17:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 6:48 [PATCH 1/7] builddeb: remove unneeded files in hdrobjfiles for headers package Masahiro Yamada
2020-01-13 6:48 ` [PATCH 2/7] builddeb: match temporary directory name to the package name Masahiro Yamada
2020-01-13 6:48 ` [PATCH 3/7] builddeb: remove redundant $objtree/ Masahiro Yamada
2020-01-13 6:48 ` [PATCH 4/7] builddeb: avoid invoking sub-shells where possible Masahiro Yamada
2020-01-13 17:21 ` Ben Hutchings [this message]
2020-01-14 8:04 ` Masahiro Yamada
2020-01-13 6:48 ` [PATCH 5/7] builddeb: remove redundant make for ARCH=um Masahiro Yamada
2020-01-13 6:48 ` [PATCH 6/7] builddeb: split kernel headers deployment out into a function Masahiro Yamada
2020-01-13 6:48 ` [PATCH 7/7] builddeb: split libc " Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7da5750c40489dcb6cd8eef0307ee8d8df2e134e.camel@decadent.org.uk \
--to=ben@decadent.org.uk \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=riku.voipio@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®