diff options
author | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-04-26 16:54:23 +0000 |
---|---|---|
committer | Leon Woestenberg <leon.woestenberg@gmail.com> | 2007-04-26 16:54:23 +0000 |
commit | f85eb47f08abf99f426e0d533b0f4f05886775c0 (patch) | |
tree | 18979e455f1c2a49a9125a7903b1b74b3a027432 /classes | |
parent | 7b5dda2b674bff1ec9bf0f58bbbf402b8a66d481 (diff) | |
parent | 0f8454ab7f54dbc0867fa8722034630654ce2a87 (diff) |
merge of '0a4ab83c5e46677b239452867d3205ca5843586f'
and '6a5c817d2f11720452c0b470075091121ce6ab96'
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 |