From 260178fbdf182355e3e9d59ab7b86aba0c951230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 21 Jun 2020 11:42:59 +0200 Subject: [PATCH] recipes-kde: Fix warnings for improper features_check usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-kde/kf5/tier2/kauth/kauth.bb | 2 +- recipes-kde/kf5/tier2/kcontacts/kcontacts.bb | 2 +- recipes-kde/kf5/tier2/kcrash/kcrash.bb | 2 +- recipes-kde/kf5/tier2/syndication/syndication.bb | 2 +- recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb | 2 +- recipes-kde/packagegroups/kde-world.bb | 2 +- .../plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb index db3db027..c29584d1 100644 --- a/recipes-kde/kf5/tier2/kauth/kauth.bb +++ b/recipes-kde/kf5/tier2/kauth/kauth.bb @@ -4,7 +4,7 @@ inherit cmake_lib features_check DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1" -REQUIRED_DISTRO_FEATURE = "polkit" +REQUIRED_DISTRO_FEATURES = "polkit" EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1" # executables diff --git a/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb b/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb index b0b43503..813d2f06 100644 --- a/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb +++ b/recipes-kde/kf5/tier2/kcontacts/kcontacts.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 gettext features_check -REQUIRED_DISTRO_FEATURE = "x11" +REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += " \ kconfig-native \ diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb index 8674c0fe..c7269f6a 100644 --- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb +++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 features_check -REQUIRED_DISTRO_FEATURE = "x11" +REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11" diff --git a/recipes-kde/kf5/tier2/syndication/syndication.bb b/recipes-kde/kf5/tier2/syndication/syndication.bb index 94782323..f852c44f 100644 --- a/recipes-kde/kf5/tier2/syndication/syndication.bb +++ b/recipes-kde/kf5/tier2/syndication/syndication.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 features_check -REQUIRED_DISTRO_FEATURE = "x11" +REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += " \ kcodecs \ diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb index 4635f1e4..2a46e78b 100644 --- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb +++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7dbc59dc445b2261c4fb2f9466e3446a" inherit kde-base cmake_lib features_check -REQUIRED_DISTRO_FEATURE = "polkit" +REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS += "polkit glib-2.0" diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb index fa09ea56..71dbd9b1 100644 --- a/recipes-kde/packagegroups/kde-world.bb +++ b/recipes-kde/packagegroups/kde-world.bb @@ -2,7 +2,7 @@ SUMMARY = "All kde packages - just for build test" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -inherit packagegroup features_check +inherit packagegroup RDEPENDS_${PN} = " \ kf5-world \ diff --git a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb index 39ce1363..daeba00f 100644 --- a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb +++ b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma gettext features_check -REQUIRED_DISTRO_FEATURE = "polkit" +REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS += " \ ki18n \