leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Browse Source 
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
This commit is contained in:
Linus Torvalds 2013-09-13 07:30:17 -07:00
commit 183c420323
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/config
View File

@ -82,7 +82,7 @@ txt_subst() {
local infile="$3" local infile="$3"
local tmpfile="$infile.swp" 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 # replace original file with the edited one
mv "$tmpfile" "$infile" mv "$tmpfile" "$infile"
} }