summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-09-12 02:54:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-16 22:12:29 +0100
commit62722de6d0ec00608eacc2cb0396362aced00047 (patch)
tree2c65e23e0f3ffe29037761b6e41f25fb6a5d6429
parentfe00d4f479c4fb5e4be5dda616a4de0a257ef6c3 (diff)
downloadopenembedded-core-contrib-62722de6d0ec00608eacc2cb0396362aced00047.tar.gz
openembedded-core-contrib-62722de6d0ec00608eacc2cb0396362aced00047.tar.bz2
openembedded-core-contrib-62722de6d0ec00608eacc2cb0396362aced00047.zip
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 <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/sstate.bbclass2
1 files changed, 1 insertions, 1 deletions
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)