From 4342546a01865b6cc253c983678d0cc33c9dab3a Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 23 Apr 2021 17:55:08 +0200 Subject: [PATCH] gatesgarth migration: features_check class replaces distro_features_check The 'distro_features_check' class has had its functionality expanded, as a result the class has now been renamed to 'features_check' https://jira.digi.com/browse/DEL-7508 Signed-off-by: Arturo Buzarra --- .../recipes-browser/wpewebkit/wpewebkit_2.28.1.bbappend | 2 +- meta-digi-dey/recipes-connectivity/bluez/bluez5.inc | 2 +- meta-digi-dey/recipes-core/images/dey-image-graphical.inc | 2 +- meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc | 2 +- .../recipes-graphics/vulkan/vulkan-headers_1.1.121.bb | 2 +- .../recipes-graphics/vulkan/vulkan-loader_1.1.121.bb | 4 ++-- .../vulkan/vulkan-validationlayers_1.1.121.bb | 2 +- meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.28.1.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.28.1.bbappend index 3bd4f2170..d1b173163 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.28.1.bbappend +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.28.1.bbappend @@ -10,6 +10,6 @@ PACKAGECONFIG_remove = "qtwpe" # We can't build the WebKit with fb images, so force wayland as a required # distro feature. -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "wayland" diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc b/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc index ff812a689..2cc31b86d 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5.inc @@ -27,7 +27,7 @@ SRC_URI = "\ " S = "${WORKDIR}/bluez-${PV}" -inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest +inherit autotools pkgconfig systemd update-rc.d features_check ptest EXTRA_OECONF = "\ --enable-tools \ diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc index 1542bc7f7..6b3afb103 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc @@ -45,7 +45,7 @@ IMAGE_LINGUAS = "" inherit core-image inherit dey-image -inherit distro_features_check +inherit features_check CONFLICT_DISTRO_FEATURES = "directfb" diff --git a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc index c10bd2184..dcf637b57 100644 --- a/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc +++ b/meta-digi-dey/recipes-graphics/imx-gpu-viv/imx-gpu-viv-6.inc @@ -53,7 +53,7 @@ RPROVIDES_${PN}_imxgpu3d += "imx-gpu-viv" PE = "1" -inherit fsl-eula-unpack distro_features_check +inherit fsl-eula-unpack features_check REQUIRED_DISTRO_FEATURES_mx8 = "wayland" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-headers_1.1.121.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-headers_1.1.121.bb index 225ff3939..ac1165f98 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-headers_1.1.121.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-headers_1.1.121.bb @@ -14,7 +14,7 @@ S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" -inherit cmake distro_features_check +inherit cmake features_check ANY_OF_DISTRO_FEATURES = "x11 wayland" FILES_${PN} += "${datadir}/vulkan/registry" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bb index 56ad6d34b..b2c19079a 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-loader_1.1.121.bb @@ -16,7 +16,7 @@ S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" -inherit cmake distro_features_check python3native lib_package +inherit cmake features_check python3native lib_package ANY_OF_DISTRO_FEATURES = "x11 wayland" DEPENDS += "vulkan-headers" @@ -35,4 +35,4 @@ UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" # instead of -dev FILES_SOLIBSDEV = "" FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}" -INSANE_SKIP_${PN} += "dev-so" \ No newline at end of file +INSANE_SKIP_${PN} += "dev-so" diff --git a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.1.121.bb b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.1.121.bb index 296b73285..3c528ed84 100644 --- a/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.1.121.bb +++ b/meta-digi-dey/recipes-graphics/vulkan/vulkan-validationlayers_1.1.121.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}/git" REQUIRED_DISTRO_FEATURES = "vulkan" -inherit cmake python3native lib_package distro_features_check +inherit cmake python3native lib_package features_check ANY_OF_DISTRO_FEATURES = "x11 wayland" DEPENDS = "vulkan-headers vulkan-loader" diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg.inc index e69fa88e2..b3e03744c 100644 --- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta-digi-dey/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" LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"