From d8fca165d6e047046bf171160ccc1f61598f0ba8 Mon Sep 17 00:00:00 2001 From: Duy Dang Date: Mon, 30 Jul 2018 02:29:58 -0400 Subject: rcar-gen3: adsp-module: Use distro features check This commit changes to use distro_features_check class to show the correct error message when building adsp modules without its distro feature in local.conf: | ERROR: Nothing PROVIDES 'adsp-fw-module' | adsp-fw-module was skipped: missing required distro feature 'adsp' (not in DISTRO_FEATURES) The USE_ADSP variable is not used anymore in the recipes. It is safe to remove adsp-control.inc requirement. Signed-off-by: Duy Dang Signed-off-by: Takamitsu Honda --- meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb | 6 ++++-- meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb index 8849b4c..b264cbb 100644 --- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb @@ -1,9 +1,11 @@ DESCRIPTION = "ADSP Framework for Linux" LICENSE = "CLOSED" -require include/adsp-control.inc +inherit distro_features_check -SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHFWN0201ZDP.tar.gz', '', d )}" +REQUIRED_DISTRO_FEATURES = "adsp" + +SRC_URI = "file://RCG3AHFWN0201ZDP.tar.gz" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb index 4983e75..1689746 100644 --- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb @@ -1,11 +1,13 @@ DESCRIPTION = "ADSP Interface for Linux" LICENSE = "CLOSED" -require include/adsp-control.inc +inherit distro_features_check + +REQUIRED_DISTRO_FEATURES = "adsp" DEPENDS += "kernel-module-xtensa-hifi" -SRC_URI = "${@base_conditional('USE_ADSP', '1', 'file://RCG3AHIFL4101ZDP.tar.gz', '', d )}" +SRC_URI = "file://RCG3AHIFL4101ZDP.tar.gz" S = "${WORKDIR}/RCG3AHIFL4101ZDP" -- cgit 1.2.3-korg