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

torvalds · torvalds · commit 183c420323a9 · 2013-09-13T07:30:17.000-07:00
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
diff --git 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"
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ txt_subst() {`
`82`	`82`	`local infile="$3"`
`83`	`83`	`local tmpfile="$infile.swp"`
`84`	`84`
`85`		`- sed -e "s/$before/$after/" "$infile" >"$tmpfile"`
	`85`	`+ sed -e "s:$before:$after:" "$infile" >"$tmpfile"`
`86`	`86`	`# replace original file with the edited one`
`87`	`87`	`mv "$tmpfile" "$infile"`
`88`	`88`	`}`