ase_contains -> bb.utils.contains (master branch only)
cover ase_contains -> bb.utils.contains (master branch only)
The following changes since commit 9838f8d077d16e52ad592879d65a9e8350b93075:
build-appliance-image: Update to krogoth head revision (2016-04-19 21:25:53 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/warn
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/warn
Robert Yang (2):
directfb/pango/webkit: base_contains -> bb.utils.contains utils.bbclass: warn for deprecated base_contains
meta/classes/utils.bbclass | 1 + meta/recipes-graphics/directfb/directfb.inc | 2 +- meta/recipes-graphics/pango/pango_1.38.1.bb | 2 +- meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.8.0
PATCH 1/2 directfb/pango/webkit: base_contains -> bb.utils.contains
--- meta/recipes-graphics/directfb/directfb.inc | 2 +- meta/recipes-graphics/pango/pango_1.38.1.bb | 2 +- meta/recipes-sato/webkit/webkitgtk_2.10.7.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
meta/recipes-graphics/directfb/directfb.inc +1 -1
@@ -26,7 +26,7 @@ S = "${WORKDIR}/DirectFB-${PV}" LDFLAGS_append =" -lts -lm" # Workaround for linking issues seen with armv7a + gold -LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS_append_arm = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" BINCONFIG = "${bindir}/directfb-config"
meta/recipes-graphics/pango/pango_1.38.1.bb +1 -1
@@ -36,7 +36,7 @@ LIBV = "1.8.0" # This binary needs to be compiled for the host architecture. This isn't pretty! do_compile_prepend_class-target () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode fi }
meta/recipes-sato/webkit/webkitgtk_2.10.7.bb +2 -2
@@ -34,8 +34,8 @@ DEPENDS = "zlib libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ ruby-native libnotify gstreamer1.0-plugins-bad \ " -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'wayland' ,d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'webgl', '' ,d)} \ enchant \ gtk2 \ libsecret \
Signature · 1 line
2.8.0
PATCH 2/2 utils.bbclass: warn for deprecated base_contains
In reply to Robert Yang--- meta/classes/utils.bbclass | 1 + 1 file changed, 1 insertion(+)
meta/classes/utils.bbclass +1 -0
@@ -24,6 +24,7 @@ def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): return oe.utils.version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d) def base_contains(variable, checkvalues, truevalue, falsevalue, d): + bb.warn('base_contains is depracated, please use bb.utils.contains instead.') return bb.utils.contains(variable, checkvalues, truevalue, falsevalue, d) def base_both_contain(variable1, variable2, checkvalue, d):
Signature · 1 line
2.8.0
Re: [PATCH 2/2] utils.bbclass: warn for deprecated base_contains
Quoted 3 lines · Robert Yang
+ bb.warn('base_contains is depracated, please use bb.utils.contains
instead.')
WARN seems a bit excessive. Would a NOTE be visible in the output?
Also typo, "deprecated".
Ross
Re: [PATCH 2/2] utils.bbclass: warn for deprecated base_contains
Quoted 9 lines · Ross
On 22 April 2016 at 06:44, Robert Yang <[email protected] <mailto:[email protected]>> wrote:
+ bb.warn('base_contains is depracated, please use bb.utils.contains
instead.')WARN seems a bit excessive. Would a NOTE be visible in the output?
Yes, it is visible since it is happened in parsing.
Quoted 2 lines
Also typo, "deprecated".
Sorry, updated in the repo:
* warn -> note
* depracated -> deprecated
git://git.openembedded.org/openembedded-core-contrib rbt/warn
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/warn
Robert Yang (2):
directfb/pango/webkit: base_contains -> bb.utils.contains utils.bbclass: warn for deprecated base_contains
Author: Robert Yang <[email protected]> Date: Thu Apr 21 20:21:22 2016 -0700
utils.bbclass: note for deprecated base_contains
meta/classes/utils.bbclass +0 -0
@@ -24,6 +24,7 @@ def base_version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): return oe.utils.version_less_or_equal(variable, checkvalue, truevalue,
falsevalue, d)
def base_contains(variable, checkvalues, truevalue, falsevalue, d):
+ bb.note('base_contains is deprecated, please use bb.utils.contains instead.')
return bb.utils.contains(variable, checkvalues, truevalue, falsevalue, d)
def base_both_contain(variable1, variable2, checkvalue, d):
// Robert
Quoted 2 lines
Ross