diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2014-09-12 02:54:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-16 22:13:52 +0100 |
commit | 563ea5b3d9cf5fbf480564703f581ba5fb2f2fd6 (patch) | |
tree | 07b70eb54ac72fb5001fb2a024b1b7f40907b48a /meta/classes | |
parent | 40e1c38dbf636f54175814343c017d42c6f25bf5 (diff) | |
download | poky-563ea5b3d9cf5fbf480564703f581ba5fb2f2fd6.tar.gz |
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.
(From OE-Core rev: 62722de6d0ec00608eacc2cb0396362aced00047)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/sstate.bbclass | 2 |
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 () { | |||
418 | sstate_grep_cmd = "grep -l -e '%s'" % (staging) | 418 | sstate_grep_cmd = "grep -l -e '%s'" % (staging) |
419 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging) | 419 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIR:g'" % (staging) |
420 | elif bb.data.inherits_class('cross', d): | 420 | elif bb.data.inherits_class('cross', d): |
421 | sstate_grep_cmd = "grep -l -e '(%s|%s)'" % (staging_target, staging) | 421 | sstate_grep_cmd = "grep -l -e '%s' -e '%s'" % (staging_target, staging) |
422 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging) | 422 | sstate_sed_cmd = "sed -i -e 's:%s:FIXMESTAGINGDIRTARGET:g; s:%s:FIXMESTAGINGDIR:g'" % (staging_target, staging) |
423 | else: | 423 | else: |
424 | sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) | 424 | sstate_grep_cmd = "grep -l -e '%s'" % (staging_host) |