[PATCH 0/2] ase_contains -> bb.utils.contains (master branch only)

[PATCH 0/2] ase_contains -> bb.utils.contains (master branch only)

[Robert Yang]

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(-)

-- 
2.8.0

[PATCH 1/2] directfb/pango/webkit: base_contains -> bb.utils.contains

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 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(-)

diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index f6b7cbe..46748988 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -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"
 
diff --git a/meta/recipes-graphics/pango/pango_1.38.1.bb b/meta/recipes-graphics/pango/pango_1.38.1.bb
index 7fc65fd..756dac4 100644
--- a/meta/recipes-graphics/pango/pango_1.38.1.bb
+++ b/meta/recipes-graphics/pango/pango_1.38.1.bb
@@ -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
 }
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
index 8eb6b9f..d4f1d3b 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
@@ -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 \
-- 
2.8.0

[PATCH 2/2] utils.bbclass: warn for deprecated base_contains

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/utils.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 81b92cb..cf4bd25 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -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):
-- 
2.8.0

Re: [PATCH 2/2] utils.bbclass: warn for deprecated base_contains

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

On 22 April 2016 at 06:44, Robert Yang <liezhi.yang@windriver.com> 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?

Also typo, "deprecated".

Ross

[-- Attachment #2: Type: text/html, Size: 749 bytes --]

Re: [PATCH 2/2] utils.bbclass: warn for deprecated base_contains

[Robert Yang]

On 04/22/2016 07:15 PM, Burton, Ross wrote:
>
> On 22 April 2016 at 06:44, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> 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.

>
> 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 <liezhi.yang@windriver.com>
Date:   Thu Apr 21 20:21:22 2016 -0700

     utils.bbclass: note for deprecated base_contains

     Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index 81b92cb..ce639b2 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -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

>
> Ross