diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 18:12:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-05 00:14:37 +0100 |
| commit | bf8dcb43432004328162ddad3c8b38eaab6ab5ce (patch) | |
| tree | be2d0a7393bc18370b8f6e92ce21afe551d207b4 | |
| parent | d62302f219547336af8109dd5876ab4b30164c07 (diff) | |
| download | poky-bf8dcb43432004328162ddad3c8b38eaab6ab5ce.tar.gz | |
siteconfig: Unbreak after sstate changes some time ago
Some time ago, the sstate name field was dropped. This code wouldn't have
worked since then. Makes me wonder if we really need it.
Anyhow, my last patch properly breaks it. This fixes the naming so
it works as designed again.
(From OE-Core rev: d282b276aa5e58d306be1c8ef9a985f2267a612b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/siteconfig.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass index 3701b7cd81..9a4d03b887 100644 --- a/meta/classes/siteconfig.bbclass +++ b/meta/classes/siteconfig.bbclass | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | python siteconfig_do_siteconfig () { | 1 | python siteconfig_do_siteconfig () { |
| 2 | shared_state = sstate_state_fromvars(d) | 2 | shared_state = sstate_state_fromvars(d) |
| 3 | if shared_state['name'] != 'populate-sysroot': | 3 | if shared_state['task'] != 'populate_sysroot': |
| 4 | return | 4 | return |
| 5 | if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME', True), 'site_config')): | 5 | if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME', True), 'site_config')): |
| 6 | bb.debug(1, "No site_config directory, skipping do_siteconfig") | 6 | bb.debug(1, "No site_config directory, skipping do_siteconfig") |