[meta-oe][PATCH 081/109] redis: upgrade 8.8.1 -> 8.10.0
Khem Raj <[email protected]>
| Newsgroups | org.openembedded.lists.openembedded-devel |
|---|---|
| Message-ID | <[email protected]> |
8.10.0's default "all"/"build" goal also builds the bundled modules (redisbloom, redisearch, redisjson, redistimeseries), which pull in their own vendored build systems and a python3 interpreter this recipe has never needed. Restrict do_compile to the core server only, the way scripts/build.sh does it internally (oe_runmake -C src all). Rebase 0004-src-Do-not-reset-FINAL_LIBS.patch for the shifted context. Build-verified for qemux86-64 (do_package_qa green). AI-Generated: Uses Claude Code Signed-off-by: Khem Raj <[email protected]> --- ...0001-hiredis-use-default-CC-if-it-is-set.patch | 0 ...akefile-to-use-environment-build-setting.patch | 0 .../0003-hack-to-force-use-of-libc-malloc.patch | 0 .../0004-src-Do-not-reset-FINAL_LIBS.patch | 15 +++++++++------ ..._SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch | 0 .../init-redis-server | 0 .../{redis-8.8.1 => redis-8.10.0}/redis.conf | 0 .../{redis-8.8.1 => redis-8.10.0}/redis.service | 0 .../redis/{redis_8.8.1.bb => redis_8.10.0.bb} | 10 +++++++++- 9 files changed, 18 insertions(+), 7 deletions(-) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/0001-hiredis-use-default-CC-if-it-is-set.patch (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/0002-lua-update-Makefile-to-use-environment-build-setting.patch (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/0003-hack-to-force-use-of-libc-malloc.patch (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/0004-src-Do-not-reset-FINAL_LIBS.patch (76%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/init-redis-server (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/redis.conf (100%) rename meta-oe/recipes-extended/redis/{redis-8.8.1 => redis-8.10.0}/redis.service (100%) rename meta-oe/recipes-extended/redis/{redis_8.8.1.bb => redis_8.10.0.bb} (88%) diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-8.10.0/0001-hiredis-use-default-CC-if-it-is-set.patch similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/0001-hiredis-use-default-CC-if-it-is-set.patch rename to meta-oe/recipes-extended/redis/redis-8.10.0/0001-hiredis-use-default-CC-if-it-is-set.patch diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-8.10.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/0002-lua-update-Makefile-to-use-environment-build-setting.patch rename to meta-oe/recipes-extended/redis/redis-8.10.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-8.10.0/0003-hack-to-force-use-of-libc-malloc.patch similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/0003-hack-to-force-use-of-libc-malloc.patch rename to meta-oe/recipes-extended/redis/redis-8.10.0/0003-hack-to-force-use-of-libc-malloc.patch diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-8.10.0/0004-src-Do-not-reset-FINAL_LIBS.patch similarity index 76% rename from meta-oe/recipes-extended/redis/redis-8.8.1/0004-src-Do-not-reset-FINAL_LIBS.patch rename to meta-oe/recipes-extended/redis/redis-8.10.0/0004-src-Do-not-reset-FINAL_LIBS.patch index a8a13de83e..d6dff5f853 100644 --- a/meta-oe/recipes-extended/redis/redis-8.8.1/0004-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/redis/redis-8.10.0/0004-src-Do-not-reset-FINAL_LIBS.patch @@ -15,20 +15,23 @@ Signed-off-by: Khem Raj <[email protected]> Reworked for 8.0.0 Signed-off-by: Eric Meyers <[email protected]> +Rebased on 8.10.0: context shifted by 1 line (offset only). + --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 5dbbefc..15fbe09 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -152,7 +152,7 @@ endif - +@@ -152,7 +152,7 @@ + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) -FINAL_LIBS=-lm +FINAL_LIBS+=-lm - DEBUG=-g -ggdb - - # Linux ARM32 needs -latomic at linking time + + # Replication compression (opt-in via BUILD_COMPRESSION=yes). When enabled the + # replication stream can be compressed with libzstd; when disabled libzstd is +-- +2.34.1 diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-8.10.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch rename to meta-oe/recipes-extended/redis/redis-8.10.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/init-redis-server b/meta-oe/recipes-extended/redis/redis-8.10.0/init-redis-server similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/init-redis-server rename to meta-oe/recipes-extended/redis/redis-8.10.0/init-redis-server diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/redis.conf b/meta-oe/recipes-extended/redis/redis-8.10.0/redis.conf similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/redis.conf rename to meta-oe/recipes-extended/redis/redis-8.10.0/redis.conf diff --git a/meta-oe/recipes-extended/redis/redis-8.8.1/redis.service b/meta-oe/recipes-extended/redis/redis-8.10.0/redis.service similarity index 100% rename from meta-oe/recipes-extended/redis/redis-8.8.1/redis.service rename to meta-oe/recipes-extended/redis/redis-8.10.0/redis.service diff --git a/meta-oe/recipes-extended/redis/redis_8.8.1.bb b/meta-oe/recipes-extended/redis/redis_8.10.0.bb similarity index 88% rename from meta-oe/recipes-extended/redis/redis_8.8.1.bb rename to meta-oe/recipes-extended/redis/redis_8.10.0.bb index 09a7c3aeac..6176dc45be 100644 --- a/meta-oe/recipes-extended/redis/redis_8.8.1.bb +++ b/meta-oe/recipes-extended/redis/redis_8.10.0.bb @@ -16,7 +16,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \ file://0004-src-Do-not-reset-FINAL_LIBS.patch \ file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \ " -SRC_URI[sha256sum] = "1d1e423c9c808de3cb01dd3300d2b8d305b7691382e31a847ec17b66d3157477" +SRC_URI[sha256sum] = "f1baa4b28befd417aa6577ebeedde9e9fc7814cfcc299b2a6d2fd99ef7420a6c" RPROVIDES:${PN} = "virtual-redis" @@ -47,6 +47,14 @@ do_compile:prepend() { oe_runmake -C deps hdr_histogram fpconv hiredis lua linenoise } +# 8.10.0's default "all"/"build" goal also builds the bundled modules +# (redisbloom, redisearch, redisjson, redistimeseries), which pull in their own +# vendored build systems and a python3 interpreter this recipe has never needed. +# Build the core server only, the way scripts/build.sh does it internally. +do_compile() { + oe_runmake -C src all +} + do_install() { export PREFIX=${D}/${prefix} oe_runmake install