Commit 183c4203 authored Sep 13, 2013 by Linus Torvalds

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

parents 951a730a 86eb7818

scripts/config

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"
		}