diff options
| author | Jessica Yu <jeyu@kernel.org> | 2019-10-21 15:34:26 +0200 |
|---|---|---|
| committer | Jessica Yu <jeyu@kernel.org> | 2019-10-23 11:21:06 +0200 |
| commit | 09684950050be09ed6cd591e6fbf0c71d3473237 (patch) | |
| tree | 6865eaec7baa64a82bff5e30d335a387a24d15f3 /scripts/nsdeps | |
| parent | 69923208431e097ce3830647aee98e5bd3e889c8 (diff) | |
| download | linux-09684950050be09ed6cd591e6fbf0c71d3473237.tar.gz linux-09684950050be09ed6cd591e6fbf0c71d3473237.tar.bz2 linux-09684950050be09ed6cd591e6fbf0c71d3473237.zip | |
scripts/nsdeps: use alternative sed delimiter
When doing an out of tree build with O=, the nsdeps script constructs
the absolute pathname of the module source file so that it can insert
MODULE_IMPORT_NS statements in the right place. However, ${srctree}
contains an unescaped path to the source tree, which, when used in a sed
substitution, makes sed complain:
++ sed 's/[^ ]* *//home/jeyu/jeyu-linux\/&/g'
sed: -e expression #1, char 12: unknown option to `s'
The sed substitution command 's' ends prematurely with the forward
slashes in the pathname, and sed errors out when it encounters the 'h',
which is an invalid sed substitution option. To avoid escaping forward
slashes ${srctree}, we can use '|' as an alternative delimiter for
sed instead to avoid this error.
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Matthias Maennich <maennich@google.com>
Tested-by: Matthias Maennich <maennich@google.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
Diffstat (limited to 'scripts/nsdeps')
| -rw-r--r-- | scripts/nsdeps | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/nsdeps b/scripts/nsdeps index 3754dac13b31..dda6fbac016e 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 "s|[^ ]* *|${srctree}/&|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 |