diff --git a/package/redis/Config.in b/package/redis/Config.in index a2239b4a54..ed11ce8c2e 100644 --- a/package/redis/Config.in +++ b/package/redis/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_REDIS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # _Atomic keyword depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_setname_np() + depends on BR2_INSTALL_LIBSTDCPP # fastfloat bundled dep is in C++ help Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message @@ -15,8 +16,8 @@ config BR2_PACKAGE_REDIS http://www.redis.io -comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl" +comment "redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl, C++" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_INSTALL_LIBSTDCPP diff --git a/package/redis/redis.hash b/package/redis/redis.hash index e01fc6a601..13845bd7a2 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 72c081e3b8cfae7144273d26d76736f08319000af46c01515cad5d29765cead5 redis-7.2.7.tar.gz +sha256 cf395665ba5fcecc4ef7aed1d8ab19c268619d98595827565c82344160171262 redis-8.0.0.tar.gz # Locally calculated -sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING +sha256 a797fcaa899397001f7fb0097583db96bcc74e9b0606c95435d8a293d84cdb76 LICENSE.txt diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 7eb30abc4c..7ef4401123 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,10 +4,12 @@ # ################################################################################ -REDIS_VERSION = 7.2.7 +REDIS_VERSION = 8.0.0 REDIS_SITE = http://download.redis.io/releases -REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) -REDIS_LICENSE_FILES = COPYING +REDIS_LICENSE = \ + AGPL-3.0 or SSPL-1.0 or RSAL-2.0 (core); \ + MIT and BSD family licenses (Bundled components) +REDIS_LICENSE_FILES = LICENSE.txt REDIS_CPE_ID_VENDOR = redislabs REDIS_SELINUX_MODULES = redis