From 62722de6d0ec00608eacc2cb0396362aced00047 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 12 Sep 2014 02:54:18 -0700 Subject: sstate.bbclass: fix sstate_hardcode_path() The "grep -e (x|y)" doesn't work, for example: $ echo xy | grep -e '(x|y)' No output We can use "grep -E" (extended regexp) or "grep -e x -e y" to fix it. It only affected the cross recipes. Signed-off-by: Robert Yang Signed-off-by: Ross Burton --- meta/classes/sstate.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 2d8db57c81..6f1cfb27d9 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -418,7 +418,7 @@ python sstate_hardcode_path () { sstate_grep_cmd = "grep -l -e '%s'" % (staging) sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging) elif bb.data.inherits_class('cross', d): - sstate_grep_cmd = "grep -l -e '(%s|%s)'" % (staging_target, staging) + sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, staging) sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging) else: sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) -- cgit 1.2.3-korg