@@ -60,6 +60,11 @@ PREFERRED_PROVIDER_nativesdk-coreutils = "nativesdk-coreutils"
PREFERRED_PROVIDER_virtual/libopencl1 ?= "opencl-icd-loader"
PREFERRED_RPROVIDER_virtual-redis ?= "redis"
+# We have two providers (polkit/smolkit) for polkit now, continue
+# to use smolkit as the default, as smolkit does only implements a subset
+# of features.
+PREFERRED_PROVIDER_polkit ?= "polkit"
+
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
fbset-modes \
gpsd-machine-conf \
@@ -1,4 +1,4 @@
-SUMMARY = "low-footprint drop-in polkit replacement"
+SUMMARY = "low-footprint polkit replacement"
HOMEPAGE = "https://github.com/bmwcarit/smolkit"
DESCRIPTION = "\
Service that implements a subset of polkit's D-Bus interface with a static configuration language. \
@@ -7,21 +7,20 @@ DESCRIPTION = "\
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-inherit cmake features_check pkgconfig
+inherit cmake pkgconfig
DEPENDS = "\
rapidjson \
sdbus-c++ \
"
-CONFLICT_DISTRO_FEATURES = "polkit"
-REQUIRED_DISTRO_FEATURES = "smolkit"
+PROVIDES += "polkit"
+RPROVIDES:${PN} = "polkit"
-PV = "0.2+git"
+VERSION = "0.3.0"
+PV = "${VERSION}+git"
SRC_URI = "\
- git://github.com/bmwcarit/${BPN}.git;protocol=https;branch=main \
+ git://github.com/bmwcarit/${BPN}.git;protocol=https;branch=main;tag=v${VERSION} \
"
SRCREV = "46bbfd5c922a8d03a534398ee129ded822dfcafe"
-
-S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
smolkit so far only implements a subset of polkit's features, so this adapts the claim of the "drop-in replacement" in the recipe. Additionally, smolkit now PROVIDES/RPROVIDES polkit, a PREFERRED_PROVIDER is set up for polkit in meta-oe/conf/layer.conf as well. The now obsolete features_check is removed, as we do not use DISTRO_FEATURES any longer. Upstream has added a new tag for version 0.3.0, which is now also reflected in the SRC_URI. The unnecessary line setting `S` is also removed. Signed-off-by: Tillmann Severin <tillmann.severin@bmw.de> --- meta-oe/conf/layer.conf | 5 +++++ meta-oe/recipes-extended/smolkit/smolkit.bb | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-)