diff options
author | Koen Kooi <koen@openembedded.org> | 2007-04-26 16:54:16 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2007-04-26 16:54:16 +0000 |
commit | 0f8454ab7f54dbc0867fa8722034630654ce2a87 (patch) | |
tree | 8ff02762adcd8546398394fec08e36d8d2cafeff /classes | |
parent | 908abeae497d81c0afd6381c08311aa45555157b (diff) | |
parent | 5df246428e3dda8ebfb5b7c46ff4ba42d291d54c (diff) |
merge of '038bc21b349c21561050092a7a6d68a019b921e1'
and '72018d16d4bf3617a2f7efda54bde7f5b784e01a'
Diffstat (limited to 'classes')
-rw-r--r-- | classes/base.bbclass | 4 | ||||
-rw-r--r-- | classes/gconf.bbclass | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 36ccbd6438..9752a1116c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -807,6 +807,10 @@ def base_after_parse(d): pn = bb.data.getVar('PN', d, 1) + # OBSOLETE in bitbake 1.7.4 + srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) + if srcdate != None: + bb.data.setVar('SRCDATE', srcdate, d) use_nls = bb.data.getVar('USE_NLS_%s' % pn, d, 1) if use_nls != None: diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 686f8e6596..99f33e433a 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -1,4 +1,4 @@ -DEPENDS += "gconf" +DEPENDS += "gconf gconf-native" gconf_postinst() { if [ "$1" = configure ]; then |