diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:30:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 07:30:17 -0700 |
| commit | 183c420323a9e45af0d995d7cbf416221698cbe4 (patch) | |
| tree | ffb834a92fa4d2cc446872cc784888a6b6d2885c /scripts | |
| parent | 951a730af4053f4d95214c492df25e2b4592ce93 (diff) | |
| parent | 86eb781889ec31f6421b86ab252ea609d456322d (diff) | |
| download | linux-183c420323a9e45af0d995d7cbf416221698cbe4.tar.gz linux-183c420323a9e45af0d995d7cbf416221698cbe4.tar.bz2 linux-183c420323a9e45af0d995d7cbf416221698cbe4.zip | |
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kconfig fix from Michal Marek:
"This is a fix for a regression caused by my previous pull request.
A sed command in scripts/config that used colons as separator was
accidentally changed to use slashes, which fails when you use slashes
in a value. Changing it back to colons is of course not a proper fix,
but at least it will be broken in the same way it had been for four
years. A proper fix is pending"
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/config: fix variable substitution command
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/config b/scripts/config index 2283be2bb62c..68041793698c 100755 --- a/scripts/config +++ b/scripts/config @@ -82,7 +82,7 @@ txt_subst() { local infile="$3" local tmpfile="$infile.swp" - sed -e "s/$before/$after/" "$infile" >"$tmpfile" + sed -e "s:$before:$after:" "$infile" >"$tmpfile" # replace original file with the edited one mv "$tmpfile" "$infile" } |