diff options
author | 2018-10-29 17:38:10 +0900 | |
---|---|---|
committer | 2019-09-23 11:16:37 +0700 | |
commit | 905d0f09cfeb79553fd8f3a15696006a2ce20c97 (patch) | |
tree | 9899710250a405a2f4df809d68035f478c75eba6 /meta-rcar-gen3/recipes-graphics/images | |
parent | ad3a8cfee5b6a6fab17cf1c6e5af851eaec75bd7 (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: Khang Nguyen <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Change-Id: Iee8ccb134de4b955032427bd06c230c32c7084cf
Diffstat (limited to 'meta-rcar-gen3/recipes-graphics/images')
-rw-r--r-- | meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc | 4 | ||||
-rw-r--r-- | meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc | 32 |
2 files changed, 18 insertions, 18 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc index 013cf2c..67615b1 100644 --- a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc +++ b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc @@ -39,7 +39,7 @@ BASIC_32BIT_PKGS = " \ # Installation for 32bit packages IMAGE_INSTALL_append = " \ - ${@base_conditional("USE_32BIT_PKGS", "1", "${BASIC_32BIT_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_32BIT_PKGS", "1", "${BASIC_32BIT_PKGS}", "", d)} \ " # Kernel modules of ICCOM @@ -63,5 +63,5 @@ ICCOM_PKGS = " \ # Installation for ICCOM Packages IMAGE_INSTALL_append = " \ - ${@base_conditional("USE_ICCOM", "1", " ${ICCOM_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_ICCOM", "1", " ${ICCOM_PKGS}", "", d)} \ " diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc index b559a0b..8806220 100644 --- a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc +++ b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-mmp-base.inc @@ -79,24 +79,24 @@ AVB_PKGS = " \ # Renesas MMP 32bit packages MMP_32BIT_PKGS = " \ - ${@base_conditional("USE_MULTIMEDIA", "1", "lib32-packagegroup-multimedia-libs lib32-omx-user-module", "", d)} \ - ${@base_conditional("USE_MULTIMEDIA_TP", "1", "lib32-vspmif-tp-user-module", "", d)} \ - ${@base_conditional("USE_CMS", "1", "lib32-cms-user-module", "", d)} \ - ${@base_conditional("USE_DTV", "1", "lib32-dtv-user-module", "", d)} \ - ${@base_conditional("USE_DVD", "1", "lib32-dvd-user-module", "", d)} \ - ${@base_conditional("USE_ADSP", "1", "lib32-adsp-if-module", "", d)} \ + ${@oe.utils.conditional("USE_MULTIMEDIA", "1", "lib32-packagegroup-multimedia-libs lib32-omx-user-module", "", d)} \ + ${@oe.utils.conditional("USE_MULTIMEDIA_TP", "1", "lib32-vspmif-tp-user-module", "", d)} \ + ${@oe.utils.conditional("USE_CMS", "1", "lib32-cms-user-module", "", d)} \ + ${@oe.utils.conditional("USE_DTV", "1", "lib32-dtv-user-module", "", d)} \ + ${@oe.utils.conditional("USE_DVD", "1", "lib32-dvd-user-module", "", d)} \ + ${@oe.utils.conditional("USE_ADSP", "1", "lib32-adsp-if-module", "", d)} \ " # Install pkg selection IMAGE_INSTALL_append = " \ - ${@base_conditional("USE_MULTIMEDIA", "1", " ${MULTIMEDIA_PKGS}", "", d)} \ - ${@base_conditional("USE_MULTIMEDIA_TP", "1", " ${MULTIMEDIA_TP_PKGS}", "", d)} \ - ${@base_conditional("USE_OMX_USER_MODULE", "1", " ${OMX_MULTIMEDIA_PKGS}", "", d)} \ - ${@base_conditional("USE_CMS", "1", " ${CMS_MULTIMEDIA_PKGS}", "", d)} \ - ${@base_conditional("USE_DTV", "1", " ${DTV_PKGS}", "", d)} \ - ${@base_conditional("USE_DVD", "1", " ${DVD_PKGS}", "", d)} \ - ${@base_conditional("USE_DVD_ENCRYPTION_LIB", "1", " ${DVD_ENCRYPTION_PKGS}", "", d)} \ - ${@base_conditional("USE_ADSP", "1", " ${ADSP_PKGS}", "", d)} \ - ${@base_conditional("USE_AVB", "1", " ${AVB_PKGS}", "", d)} \ - ${@base_conditional("USE_32BIT_MMP", "1", " ${MMP_32BIT_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_MULTIMEDIA", "1", " ${MULTIMEDIA_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_MULTIMEDIA_TP", "1", " ${MULTIMEDIA_TP_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_OMX_USER_MODULE", "1", " ${OMX_MULTIMEDIA_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_CMS", "1", " ${CMS_MULTIMEDIA_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_DTV", "1", " ${DTV_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_DVD", "1", " ${DVD_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_DVD_ENCRYPTION_LIB", "1", " ${DVD_ENCRYPTION_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_ADSP", "1", " ${ADSP_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_AVB", "1", " ${AVB_PKGS}", "", d)} \ + ${@oe.utils.conditional("USE_32BIT_MMP", "1", " ${MMP_32BIT_PKGS}", "", d)} \ " |