From 905d0f09cfeb79553fd8f3a15696006a2ce20c97 Mon Sep 17 00:00:00 2001 From: Thuy Tran Date: Mon, 29 Oct 2018 17:38:10 +0900 Subject: 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 Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Iee8ccb134de4b955032427bd06c230c32c7084cf --- meta-rcar-gen3/recipes-graphics/wayland/weston.inc | 8 ++++---- meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'meta-rcar-gen3/recipes-graphics/wayland') diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston.inc b/meta-rcar-gen3/recipes-graphics/wayland/weston.inc index e475aea..c1cc206 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston.inc +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston.inc @@ -3,14 +3,14 @@ require include/multimedia-control.inc PACKAGECONFIG_remove_virtclass-multilib-lib32 = "launch" DEPENDS_append = " \ - ${@base_conditional('USE_GLES', '1', ' libgbm', '', d)}" + ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)}" RDEPENDS_${PN}_append = " \ - ${@base_conditional('USE_GLES', '1', ' libgbm', '', d)} \ + ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)} \ " RDEPENDS_${PN}-examples_append = " \ - ${@base_conditional('USE_GLES', '1', ' libgbm', '', d)}" + ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)}" EXTRA_OECONF_append = " \ - ${@base_conditional('USE_GLES', '1', '', \ + ${@oe.utils.conditional('USE_GLES', '1', '', \ ' WESTON_NATIVE_BACKEND="fbdev-backend.so"', d)}" diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend index a261745..fced56c 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston_2.0.0.bbappend @@ -21,7 +21,7 @@ SRC_URI_append = " \ S = "${WORKDIR}/git" PACKAGECONFIG_append = " \ - ${@base_conditional('USE_MULTIMEDIA', '1', ' v4l2', '', d)} \ + ${@oe.utils.conditional('USE_MULTIMEDIA', '1', ' v4l2', '', d)} \ " PACKAGECONFIG[v4l2] = " --enable-v4l2, --disable-v4l2,,kernel-module-vsp2driver" -- cgit 1.2.3-korg