diff options
-rw-r--r-- | meta/classes/externalsrc.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass index b00fdba8e9..aedd78a03a 100644 --- a/meta/classes/externalsrc.bbclass +++ b/meta/classes/externalsrc.bbclass | |||
@@ -75,6 +75,8 @@ python () { | |||
75 | 75 | ||
76 | # Dummy value because the default function can't be called with blank SRC_URI | 76 | # Dummy value because the default function can't be called with blank SRC_URI |
77 | d.setVar('SRCPV', '999') | 77 | d.setVar('SRCPV', '999') |
78 | # sstate is never going to work for external source trees, disable it | ||
79 | d.setVar('SSTATE_SKIP_CREATION', '1') | ||
78 | 80 | ||
79 | if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking': | 81 | if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking': |
80 | d.setVar('CONFIGUREOPT_DEPTRACK', '') | 82 | d.setVar('CONFIGUREOPT_DEPTRACK', '') |
@@ -82,10 +84,7 @@ python () { | |||
82 | tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys()) | 84 | tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys()) |
83 | 85 | ||
84 | for task in tasks: | 86 | for task in tasks: |
85 | if task.endswith("_setscene"): | 87 | if os.path.realpath(d.getVar('S')) == os.path.realpath(d.getVar('B')): |
86 | # sstate is never going to work for external source trees, disable it | ||
87 | bb.build.deltask(task, d) | ||
88 | elif os.path.realpath(d.getVar('S')) == os.path.realpath(d.getVar('B')): | ||
89 | # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time | 88 | # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time |
90 | d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock") | 89 | d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock") |
91 | 90 | ||