Patchwork siteconfig: Unbreak after sstate changes some time ago

login
register
mail settings
Submitter Richard Purdie
Date April 4, 2014, 5:12 p.m.
Message ID <1396631578.13862.23.camel@ted>
Download mbox | patch
Permalink /patch/70147/
State New
Headers show

Comments

Richard Purdie - April 4, 2014, 5:12 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass
index 3701b7c..9a4d03b 100644
--- a/meta/classes/siteconfig.bbclass
+++ b/meta/classes/siteconfig.bbclass
@@ -1,6 +1,6 @@ 
 python siteconfig_do_siteconfig () {
 	shared_state = sstate_state_fromvars(d)
-	if shared_state['name'] != 'populate-sysroot':
+	if shared_state['task'] != 'populate_sysroot':
 		return
 	if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME', True), 'site_config')):
 		bb.debug(1, "No site_config directory, skipping do_siteconfig")