浏览代码

hiredis: set rdepends on virtual-redis

Now hiredis can be used not only with Redis, but also with Valkey, an
open source key/value datastore that is fully compatible with Redis. As
Redis changed its license, many users have switched to Valkey. Add
RPROVIDES virtual-redis in both redis and valkey, and set it as the
runtime dependency of hiredis.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Yi Zhao 2 月之前
父节点
当前提交
59b904920b

+ 1 - 0
meta-oe/conf/layer.conf

@@ -60,6 +60,7 @@ PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf"
 PREFERRED_PROVIDER_coreutils = "coreutils"
 PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader"
 PREFERRED_RPROVIDER_virtual-opencl-icd ?= "opencl-icd-loader"
+PREFERRED_RPROVIDER_virtual-redis ?= "redis"
 
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   fbset-modes \

+ 1 - 1
meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb

@@ -35,5 +35,5 @@ do_install_ptest() {
 
 FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build"
 
-RDEPENDS:${PN} = "redis"
+RDEPENDS:${PN} = "virtual-redis"
 RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}"

+ 2 - 0
meta-oe/recipes-extended/redis/redis_7.2.7.bb

@@ -20,6 +20,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
 
 SRC_URI[sha256sum] = "72c081e3b8cfae7144273d26d76736f08319000af46c01515cad5d29765cead5"
 
+RPROVIDES:${PN} = "virtual-redis"
+
 inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"

+ 2 - 0
meta-oe/recipes-extended/valkey/valkey_8.0.2.bb

@@ -21,6 +21,8 @@ SRCREV = "d6a2f561e2751d4ab246ad084e4fa185526fa479"
 
 S = "${WORKDIR}/git"
 
+RPROVIDES:${PN} = "virtual-redis"
+
 inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
 
 FINAL_LIBS:x86:toolchain-clang = "-latomic"