From 008d6ed05548f4f38af831fc0b4b778eec512d9a Mon Sep 17 00:00:00 2001 From: Khang Nguyen Date: Thu, 26 Dec 2019 09:08:02 +0700 Subject: rcar-gen3: Replace deprecated bbclass distro_features_check.bbclass is deprecated, this commit updates recipes to use features_check.bbclass instead. Signed-off-by: Khang Nguyen Signed-off-by: Takamitsu Honda Change-Id: Id8a4848dbfd53ecb7033fdfff0459fd520a892d3 --- meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.inc | 2 +- meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- .../recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb | 2 +- .../recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb | 2 +- .../recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb | 2 +- .../recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb | 2 +- .../recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb | 2 +- meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb | 2 +- meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb | 2 +- meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb | 2 +- .../kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb | 2 +- .../recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb | 2 +- meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb | 2 +- meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb | 2 +- meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc | 2 +- meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb | 2 +- meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb | 2 +- meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.inc b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.inc index 96caa77..e9945ce 100644 --- a/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.inc +++ b/meta-rcar-gen3/recipes-connectivity/iccom-module/iccom-user-module.inc @@ -1,7 +1,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=442d4e9f738ff4d05ae6215ae20caa6c" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "iccom" diff --git a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg.inc index 89318e5..3a6d2ae 100644 --- a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -23,7 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "x11" PROTO_DEPS = "xorgproto" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb index 62f10d6..5b7ec89 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-adsp/kernel-module-xtensa-hifi.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://MIT-COPYING;md5=f932f6ad0feea4f97b6e8316e172070e \ " -inherit module distro_features_check +inherit module features_check REQUIRED_DISTRO_FEATURES = "adsp" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb index 092d44a..8423642 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mch.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://MIT-COPYING;md5=96e553279b3fff0d6168dafe0b596197 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb index e7609c1..4dd910a 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-mse.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://MIT-COPYING;md5=98449101c5d5452a9429b88d6ead1ba4 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas kernel-module-avb-streaming kernel-module-avb-mch" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb index 5087449..fc3ddf4 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-avb/kernel-module-avb-streaming.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://MIT-COPYING;md5=704e38c3a28fde2e7fa153d3e0e787a4 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb index 42f4f85..64da9c4 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-scu-src.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://scu_src_drv/include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" PN = "kernel-module-scu-src" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb index 4b1408e..b741a88 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-ssp.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://ssp_drv/include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" PN = "kernel-module-ssp" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb index 55c5690..42e0d01 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tddmac.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://tddmac_drv/include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ " -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" PN = "kernel-module-tddmac" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb index f93db45..001f9b7 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-dtv/kernel-module-tsif.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \ file://tsif_drv/include/MIT-COPYING;md5=fea016ce2bdf2ec10080f69e9381d378 \ " -inherit module distro_features_check +inherit module features_check PN = "kernel-module-tsif" PR = "r0" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb index d7b230a..b63f393 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-hwspinlock-sample.bb @@ -5,7 +5,7 @@ require include/rcar-gen3-modules-common.inc LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" PN = "kernel-module-iccom-hwspinlock-sample" diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb index 47d37eb..24a2048 100644 --- a/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb +++ b/meta-rcar-gen3/recipes-kernel/kernel-module-iccom/kernel-module-iccom-mfis.bb @@ -5,7 +5,7 @@ require include/rcar-gen3-modules-common.inc LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit module distro_features_check +inherit module features_check DEPENDS = "linux-renesas" PN = "kernel-module-iccom-mfis" 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 737a2a0..2a7e37a 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,7 +1,7 @@ DESCRIPTION = "ADSP Framework for Linux" LICENSE = "CLOSED" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "adsp" COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)" 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 b814960..ea12f56 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,7 +1,7 @@ DESCRIPTION = "ADSP Interface for Linux" LICENSE = "CLOSED" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "adsp" diff --git a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc index 55bd13d..1a82eed 100644 --- a/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc +++ b/meta-rcar-gen3/recipes-multimedia/avb-applications/avb-applications.inc @@ -1,6 +1,6 @@ require include/rcar-gen3-modules-common.inc -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "avb" diff --git a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb index a3553b5..a5b8645 100644 --- a/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/dtv-module/dtv-user-module.bb @@ -4,7 +4,7 @@ LICENSE = "CLOSED" require include/rcar-gen3-modules-common.inc require include/dtv-dvd-control.inc -inherit distro_features_check +inherit features_check DEPENDS = " \ kernel-module-vspmif mmngr-user-module \ diff --git a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb index 5730124..8651b4f 100644 --- a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb @@ -3,7 +3,7 @@ LICENSE = "CLOSED" require include/rcar-gen3-path-common.inc -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "dvd_encryption_library" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb index f3d0b13..3590807 100644 --- a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb +++ b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-user-module.bb @@ -4,7 +4,7 @@ LICENSE = "CLOSED" require include/rcar-gen3-modules-common.inc require include/dtv-dvd-control.inc -inherit distro_features_check +inherit features_check DEPENDS = " \ kernel-module-vspmif mmngr-user-module \ -- cgit 1.2.3-korg