diff options
author | Thuy Tran <thuy.tran.xh@renesas.com> | 2018-12-05 14:54:28 +0700 |
---|---|---|
committer | Thuy Tran <thuy.tran.xh@renesas.com> | 2019-02-28 09:43:53 +0700 |
commit | 0311c6b1a02611971c9ed5a18fb5ce0fe21c5e22 (patch) | |
tree | cf95d3f079e0f9571afd8f05412ff8148e019e77 /meta-rcar-gen3/recipes-multimedia/packagegroups | |
parent | ee2c656b3eb98bc426ffb27e4d3d1479de7028d9 (diff) |
rcar-gen3: Change base_conditional to oe.utils.conditional
This commit changes to use oe.utils.conditional because these base_*
functions were removed in meta/lib/oe from YP2.5.
(From Poky rev: 58449f0e9cc4a05c88204cf8ba887b55467d886e)
Signed-off-by: Thuy Tran <thuy.tran.xh@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3/recipes-multimedia/packagegroups')
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb | 10 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb index b57b5b2..e689440 100644 --- a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb +++ b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb @@ -6,7 +6,7 @@ require include/omx-control.inc DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good" DEPENDS += "gstreamer1.0-plugins-bad" DEPENDS += "gstreamer1.0-plugins-ugly" -DEPENDS += "${@base_conditional("USE_OMX_COMMON", "1", "gstreamer1.0-omx", "", d)}" +DEPENDS += "${@oe.utils.conditional("USE_OMX_COMMON", "1", "gstreamer1.0-omx", "", d)}" LIC_FILES_CHKSUM = " \ file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ @@ -21,7 +21,7 @@ PACKAGES = " \ packagegroup-gstreamer1.0-plugins-base \ packagegroup-gstreamer1.0-plugins-audio \ packagegroup-gstreamer1.0-plugins-video \ - ${@base_conditional("USE_OMX_COMMON", "1", "packagegroup-gstreamer1.0-omx", "", d)} \ + ${@oe.utils.conditional("USE_OMX_COMMON", "1", "packagegroup-gstreamer1.0-omx", "", d)} \ packagegroup-gstreamer1.0-plugins-debug \ " @@ -29,7 +29,7 @@ RDEPENDS_packagegroup-gstreamer1.0-plugins = " \ packagegroup-gstreamer1.0-plugins-base \ packagegroup-gstreamer1.0-plugins-audio \ packagegroup-gstreamer1.0-plugins-video \ - ${@base_conditional("USE_OMX_COMMON", "1", "packagegroup-gstreamer1.0-omx", "", d)} \ + ${@oe.utils.conditional("USE_OMX_COMMON", "1", "packagegroup-gstreamer1.0-omx", "", d)} \ packagegroup-gstreamer1.0-plugins-debug \ " @@ -38,7 +38,7 @@ RDEPENDS_packagegroup-gstreamer1.0-plugins-base = " \ gstreamer1.0-plugins-base-typefindfunctions \ gstreamer1.0-plugins-good-id3demux \ gstreamer1.0-plugins-good-autodetect \ - ${@base_conditional("USE_OMX_COMMON", "1", "gstreamer1.0-plugin-vspfilter", "", d)} \ + ${@oe.utils.conditional("USE_OMX_COMMON", "1", "gstreamer1.0-plugin-vspfilter", "", d)} \ " RDEPENDS_packagegroup-gstreamer1.0-plugins-audio = " \ @@ -77,7 +77,7 @@ RDEPENDS_packagegroup-gstreamer1.0-plugins-video = " \ " RDEPENDS_packagegroup-gstreamer1.0-omx = " \ - ${@base_conditional("USE_OMX_COMMON", "1", "gstreamer1.0-omx", "", d)} \ + ${@oe.utils.conditional("USE_OMX_COMMON", "1", "gstreamer1.0-omx", "", d)} \ " RDEPENDS_packagegroup-gstreamer1.0-plugins-debug = " \ diff --git a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb index 8d62972..7e8e7e4 100644 --- a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb +++ b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb @@ -8,7 +8,7 @@ DEPENDS = "kernel-module-mmngr kernel-module-mmngrbuf \ kernel-module-vsp2driver \ " -DEPENDS += '${@base_conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv", "", d )}' +DEPENDS += '${@oe.utils.conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv", "", d )}' PR = "r0" @@ -27,5 +27,5 @@ RDEPENDS_packagegroup-multimedia-kernel-modules = " \ " RDEPENDS_packagegroup-multimedia-kernel-modules += " \ - ${@base_conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv", "", d )} \ + ${@oe.utils.conditional("USE_VIDEO_OMX", "1", "kernel-module-uvcs-drv", "", d )} \ " |