From: Masahiro Yamada <yamada.masahiro@socionext.com>
To: Jessica Yu <jeyu@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Matthias Maennich <maennich@google.com>
Subject: Re: [PATCH 2/4] scripts/nsdeps: don't prepend $srctree if *.mod already contains full paths
Date: Tue, 29 Oct 2019 17:59:41 +0900 [thread overview]
Message-ID: <CAK7LNAQkqWjhseHzW56GOvCaYS7D_kPrN8nsWGEL2+HYw3G-0A@mail.gmail.com> (raw)
In-Reply-To: <20191028151427.31612-2-jeyu@kernel.org>
On Tue, Oct 29, 2019 at 12:14 AM Jessica Yu <jeyu@kernel.org> wrote:
>
> When building in-tree modules, the *.mod file contains relative paths.
> When building external modules, the resulting *.mod file contains absolute
> paths.
Not necessarily true.
Kbuild does not impose any restriction about absolute/relative path.
M= can be a relative path.
> Allow for the nsdeps script to account for both types of paths and
> only prepend $srctree in the case of relative paths. Otherwise, the script
> will append $srctree to the path regardless and it will error out with file
> not found errors if the path was already absolute to begin with.
>
> Signed-off-by: Jessica Yu <jeyu@kernel.org>
> ---
>
> The sed regex is getting more ugly. It's not my strong point :/ If anyone
> has a better regex to prepend $srctree for every relative path encountered
> while ignoring absolute paths, I'm all ears.
It is not the problem of sed regex ugliness.
You can prefix $srctree/
unlesss building external modules.
if [ "$KBUILD_EXTMOD" ]; then
src_prefix=
else
src_prefix=$srctree/
fi
Then,
sed "s|[^ ]* *|${src_prefix}&|g"`
Caution: not tested at all
> scripts/nsdeps | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/nsdeps b/scripts/nsdeps
> index 54d2ab8f9e5c..9ddcd5cb96b1 100644
> --- a/scripts/nsdeps
> +++ b/scripts/nsdeps
> @@ -33,7 +33,7 @@ generate_deps() {
> if [ ! -f "$ns_deps_file" ]; then return; fi
> local mod_source_files=`cat $mod_file | sed -n 1p \
> | sed -e 's/\.o/\.c/g' \
> - | sed "s|[^ ]* *|${srctree}/&|g"`
> + | sed -E "s%(^|\s)([^/][^ ]*)%\1$srctree/\2%g"`
> for ns in `cat $ns_deps_file`; do
> echo "Adding namespace $ns to module $mod_name (if needed)."
> generate_deps_for_ns $ns $mod_source_files
> --
> 2.16.4
>
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2019-10-29 9:00 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-28 15:14 [PATCH 1/4] scripts/nsdeps: use $MODORDER to obtain correct modules.order path Jessica Yu
2019-10-28 15:14 ` [PATCH 2/4] scripts/nsdeps: don't prepend $srctree if *.mod already contains full paths Jessica Yu
2019-10-29 8:59 ` Masahiro Yamada [this message]
2019-10-28 15:14 ` [PATCH 3/4] nsdeps: remove stale .ns_deps files before generating new ones Jessica Yu
2019-10-29 10:45 ` Masahiro Yamada
2019-10-28 15:14 ` [PATCH 4/4] scripts/nsdeps: make sure to pass all module source files to spatch Jessica Yu
2019-10-29 12:57 ` Masahiro Yamada
2019-10-30 16:17 ` Jessica Yu
2019-10-31 12:27 ` Masahiro Yamada
2019-10-31 13:41 ` Jessica Yu
2019-11-01 5:56 ` Masahiro Yamada
2019-11-05 12:52 ` Jessica Yu
2019-11-05 12:57 ` Masahiro Yamada
2019-10-29 12:48 ` [PATCH 1/4] scripts/nsdeps: use $MODORDER to obtain correct modules.order path 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=CAK7LNAQkqWjhseHzW56GOvCaYS7D_kPrN8nsWGEL2+HYw3G-0A@mail.gmail.com \
--to=yamada.masahiro@socionext.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maennich@google.com \
/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;
as well as URLs for NNTP newsgroup(s).