diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2025-03-11 22:54:27 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-03-11 19:34:55 -0700 |
| commit | 59b904920b49a0f583039e11ce1c5b190e116c07 (patch) | |
| tree | 731763b6d1fc48593807fc4cce683c99042a5920 | |
| parent | c08b0046f4ea977f61955504741f64b6c12d1e04 (diff) | |
| download | meta-openembedded-59b904920b49a0f583039e11ce1c5b190e116c07.tar.gz | |
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>
| -rw-r--r-- | meta-oe/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/redis/redis_7.2.7.bb | 2 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/valkey/valkey_8.0.2.bb | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf index b75a3ccaf9..d3fd49cf6b 100644 --- a/meta-oe/conf/layer.conf +++ b/meta-oe/conf/layer.conf | |||
| @@ -60,6 +60,7 @@ PREFERRED_PROVIDER_android-tools-conf ?= "android-tools-conf" | |||
| 60 | PREFERRED_PROVIDER_coreutils = "coreutils" | 60 | PREFERRED_PROVIDER_coreutils = "coreutils" |
| 61 | PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" | 61 | PREFERRED_PROVIDER_virtual/opencl-icd ?= "opencl-icd-loader" |
| 62 | PREFERRED_RPROVIDER_virtual-opencl-icd ?= "opencl-icd-loader" | 62 | PREFERRED_RPROVIDER_virtual-opencl-icd ?= "opencl-icd-loader" |
| 63 | PREFERRED_RPROVIDER_virtual-redis ?= "redis" | ||
| 63 | 64 | ||
| 64 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ | 65 | SIGGEN_EXCLUDERECIPES_ABISAFE += " \ |
| 65 | fbset-modes \ | 66 | fbset-modes \ |
diff --git a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb index d081242736..dfabbb91a6 100644 --- a/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb +++ b/meta-oe/recipes-extended/hiredis/hiredis_1.2.0.bb | |||
| @@ -35,5 +35,5 @@ do_install_ptest() { | |||
| 35 | 35 | ||
| 36 | FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build" | 36 | FILES:${PN}-dev += "${datadir}/hiredis_ssl ${prefix}/build" |
| 37 | 37 | ||
| 38 | RDEPENDS:${PN} = "redis" | 38 | RDEPENDS:${PN} = "virtual-redis" |
| 39 | RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}" | 39 | RDEPENDS:${PN}-ptest = "${@bb.utils.contains('PACKAGECONFIG', 'testssl', 'openssl-bin', '', d)}" |
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.7.bb b/meta-oe/recipes-extended/redis/redis_7.2.7.bb index 4f768acd1d..7efdebd905 100644 --- a/meta-oe/recipes-extended/redis/redis_7.2.7.bb +++ b/meta-oe/recipes-extended/redis/redis_7.2.7.bb | |||
| @@ -20,6 +20,8 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ | |||
| 20 | 20 | ||
| 21 | SRC_URI[sha256sum] = "72c081e3b8cfae7144273d26d76736f08319000af46c01515cad5d29765cead5" | 21 | SRC_URI[sha256sum] = "72c081e3b8cfae7144273d26d76736f08319000af46c01515cad5d29765cead5" |
| 22 | 22 | ||
| 23 | RPROVIDES:${PN} = "virtual-redis" | ||
| 24 | |||
| 23 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd | 25 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd |
| 24 | 26 | ||
| 25 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 27 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb index 5f05f227c6..af56e54590 100644 --- a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb +++ b/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb | |||
| @@ -21,6 +21,8 @@ SRCREV = "d6a2f561e2751d4ab246ad084e4fa185526fa479" | |||
| 21 | 21 | ||
| 22 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
| 23 | 23 | ||
| 24 | RPROVIDES:${PN} = "virtual-redis" | ||
| 25 | |||
| 24 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd | 26 | inherit autotools-brokensep pkgconfig update-rc.d systemd useradd |
| 25 | 27 | ||
| 26 | FINAL_LIBS:x86:toolchain-clang = "-latomic" | 28 | FINAL_LIBS:x86:toolchain-clang = "-latomic" |
