diff options
| author |   Ronan <ronan.lemartret@iot.bzh> | 2017-01-13 15:28:04 +0100 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-01-16 12:25:42 +0000 |
| commit | 35289ad4e94bbabf1dfa88e71d5d8bd05964aaa4 (patch) | |
| tree | f876d1fd6b9b76d67177abcf99a9b52ac699535a /meta-rcar-gen2/recipes-graphics | |
| parent | 30ed2cf421f8e817e3c93fc095b5fbd34deff2ad (diff) | |
replace deprecated function base_contains
* replace base_contains by bb.utils.contains
* base_contains is deprecated use bb.utils.contains instead
* yocto version: 2.2
Change-Id: Ida44a8ded5040cb8bcc1e6140dcbdc795463ce9a
Signed-off-by: Ronan <ronan.lemartret@iot.bzh>
Diffstat (limited to 'meta-rcar-gen2/recipes-graphics')
3 files changed, 11 insertions, 11 deletions
diff --git a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb index 8a72b12..37e8052 100644 --- a/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb +++ b/meta-rcar-gen2/recipes-graphics/gles-module/gles-user-module.bb @@ -26,23 +26,23 @@ OPENGLES3 ?= "0" SRC_URI_r8a7790 = '${@base_conditional( "OPENGLES3", "1", \ "file://r8a7790_linux_rgx_binaries_gles3.tar.bz2", \ "file://r8a7790_linux_rgx_binaries_gles2.tar.bz2", d )}' -SRC_URI_append_r8a7790 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7790 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ file://change-shell.patch \ ", "", d)}" SRC_URI_r8a7791 = "file://r8a7791_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7791 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7791 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" SRC_URI_r8a7793 = "file://r8a7791_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7793 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7793 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" SRC_URI_r8a7794 = "file://r8a7794_linux_sgx_binaries_gles2.tar.bz2" -SRC_URI_append_r8a7794 = " ${@base_contains("DISTRO_FEATURES", "wayland", " \ +SRC_URI_append_r8a7794 = " ${@bb.utils.contains("DISTRO_FEATURES", "wayland", " \ file://EGL_headers_for_wayland.patch \ ", "", d)}" @@ -100,7 +100,7 @@ FILES_${PN}-dev = " \ " PROVIDES = "virtual/libgles2" -PROVIDES_append = "${@base_contains("DISTRO_FEATURES", "wayland", "", " virtual/egl", d)}" +PROVIDES_append = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "", " virtual/egl", d)}" RPROVIDES_${PN} += "${GLES}-user-module libgles2-mesa libgles2-mesa-dev libgles2 libgles2-dev" INSANE_SKIP_${PN} += "ldflags already-stripped" INSANE_SKIP_${PN}-dev += "ldflags" diff --git a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc index bea1510..ee20a28 100644 --- a/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc +++ b/meta-rcar-gen2/recipes-graphics/images/core-image-renesas-base.inc @@ -27,18 +27,18 @@ IMAGE_INSTALL_append_rcar-gen2 = '${@base_conditional("USE_GLES", "1", \ "gles-kernel-module gles-user-module", "", d)}' # pkg groups for multimedia -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_MULTIMEDIA", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_MULTIMEDIA", "1", " \ packagegroup-rcar-gen2-multimedia \ ", "", d)}' # pkg groups for multimedia test program -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_MULTIMEDIA_TEST", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_MULTIMEDIA_TEST", "1", " \ packagegroup-rcar-gen2-multimedia-tp \ ", "", d)}' # pkg groups for dtv -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_DTV", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_DTV", "1", " \ packagegroup-rcar-gen2-dtv \ ", "", d)}' # pkg groups for graphic test program -IMAGE_INSTALL_append_rcar-gen2 = ' ${@base_contains("USE_GLES_TEST", "1", " \ +IMAGE_INSTALL_append_rcar-gen2 = ' ${@bb.utils.contains("USE_GLES_TEST", "1", " \ gles-test-module \ ", "", d)}' diff --git a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb index 5fffe16..b53b2a3 100644 --- a/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb +++ b/meta-rcar-gen2/recipes-graphics/wayland/libegl.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://egl.c;beginline=5;endline=15;md5=3677623633a6e459b1f6 COMPATIBLE_MACHINE = "(r8a7790|r8a7791|r8a7793|r8a7794)" -RPROVIDES_${PN} = "${@base_contains("DISTRO_FEATURES", "wayland", "libEGL.so", "", d)}" -PROVIDES = "${@base_contains("DISTRO_FEATURES", "wayland", "virtual/egl", "", d)}" +RPROVIDES_${PN} = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "libEGL.so", "", d)}" +PROVIDES = "${@bb.utils.contains("DISTRO_FEATURES", "wayland", "virtual/egl", "", d)}" SRCREV = "7b09cce97e8658ba927e71f1af43360c4cc392b7" SRC_URI = "git://github.com/thayama/libegl;protocol=git;branch=master \ file://0001-libegl-Remove-duplicate-header-files-of-gles-user-mo.patch" |