From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 12 Sep 2014 09:54:18 +0000 (-0700)
Subject: sstate.bbclass: fix sstate_hardcode_path()
X-Git-Tag: yocto-4.0~27939
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62722de6d0ec00608eacc2cb0396362aced00047;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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>
---

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 2d8db57c812..6f1cfb27d99 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)