diff mbox series

[meta-oe,050/128] redis: upgrade 8.0.6 -> 8.8.0

Message ID 20260628081122.178348-50-khem.raj@oss.qualcomm.com
State New
Headers show
Series [meta-filesystems,001/128] ifuse: upgrade 1.2.0 -> 1.2.1 | expand

Commit Message

Khem Raj June 28, 2026, 8:10 a.m. UTC 
Regenerate 0001-hiredis-use-default-CC and
0004-src-Do-not-reset-FINAL_LIBS so they apply without fuzz (patch-fuzz
is a fatal QA error).

Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
 .../0001-hiredis-use-default-CC-if-it-is-set.patch     |  5 ++---
 ...ate-Makefile-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             | 10 +++++-----
 ...-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch |  0
 .../{redis-8.0.6 => redis-8.8.0}/init-redis-server     |  0
 .../redis/{redis-8.0.6 => redis-8.8.0}/redis.conf      |  0
 .../redis/{redis-8.0.6 => redis-8.8.0}/redis.service   |  0
 .../redis/{redis_8.0.6.bb => redis_8.8.0.bb}           |  2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/0001-hiredis-use-default-CC-if-it-is-set.patch (94%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/0002-lua-update-Makefile-to-use-environment-build-setting.patch (100%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/0003-hack-to-force-use-of-libc-malloc.patch (100%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/0004-src-Do-not-reset-FINAL_LIBS.patch (91%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch (100%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/init-redis-server (100%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/redis.conf (100%)
 rename meta-oe/recipes-extended/redis/{redis-8.0.6 => redis-8.8.0}/redis.service (100%)
 rename meta-oe/recipes-extended/redis/{redis_8.0.6.bb => redis_8.8.0.bb} (97%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-8.8.0/0001-hiredis-use-default-CC-if-it-is-set.patch
similarity index 94%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/0001-hiredis-use-default-CC-if-it-is-set.patch
rename to meta-oe/recipes-extended/redis/redis-8.8.0/0001-hiredis-use-default-CC-if-it-is-set.patch
index a176f7c14e..8e1985b726 100644
--- a/meta-oe/recipes-extended/redis/redis-8.0.6/0001-hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.8.0/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -31,11 +31,10 @@  Signed-off-by: Eric Meyers <eric.meyers@arthrex.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index bd2106b..9ce768d 100644
 --- a/deps/hiredis/Makefile
 +++ b/deps/hiredis/Makefile
-@@ -36,8 +36,6 @@ endef
- export REDIS_TEST_CONFIG
+@@ -41,8 +41,6 @@
+ HIREDIS_LDFLAGS=
  
  # Fallback to gcc when $CC is not in $PATH.
 -CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-8.8.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/0002-lua-update-Makefile-to-use-environment-build-setting.patch
rename to meta-oe/recipes-extended/redis/redis-8.8.0/0002-lua-update-Makefile-to-use-environment-build-setting.patch
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-8.8.0/0003-hack-to-force-use-of-libc-malloc.patch
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/0003-hack-to-force-use-of-libc-malloc.patch
rename to meta-oe/recipes-extended/redis/redis-8.8.0/0003-hack-to-force-use-of-libc-malloc.patch
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-8.8.0/0004-src-Do-not-reset-FINAL_LIBS.patch
similarity index 91%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/0004-src-Do-not-reset-FINAL_LIBS.patch
rename to meta-oe/recipes-extended/redis/redis-8.8.0/0004-src-Do-not-reset-FINAL_LIBS.patch
index 5b8616c652..a8a13de83e 100644
--- a/meta-oe/recipes-extended/redis/redis-8.0.6/0004-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-8.8.0/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -23,12 +23,12 @@  diff --git a/src/Makefile b/src/Makefile
 index 5dbbefc..15fbe09 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -131,7 +131,7 @@ endif
- 
+@@ -152,7 +152,7 @@ endif
+
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG)
--FINAL_LIBS=-lm -lstdc++
-+FINAL_LIBS+=-lm -lstdc++
+-FINAL_LIBS=-lm
++FINAL_LIBS+=-lm
  DEBUG=-g -ggdb
- 
+
  # Linux ARM32 needs -latomic at linking time
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-8.8.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
rename to meta-oe/recipes-extended/redis/redis-8.8.0/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/init-redis-server b/meta-oe/recipes-extended/redis/redis-8.8.0/init-redis-server
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/init-redis-server
rename to meta-oe/recipes-extended/redis/redis-8.8.0/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/redis.conf b/meta-oe/recipes-extended/redis/redis-8.8.0/redis.conf
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/redis.conf
rename to meta-oe/recipes-extended/redis/redis-8.8.0/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-8.0.6/redis.service b/meta-oe/recipes-extended/redis/redis-8.8.0/redis.service
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-8.0.6/redis.service
rename to meta-oe/recipes-extended/redis/redis-8.8.0/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis_8.0.6.bb b/meta-oe/recipes-extended/redis/redis_8.8.0.bb
similarity index 97%
rename from meta-oe/recipes-extended/redis/redis_8.0.6.bb
rename to meta-oe/recipes-extended/redis/redis_8.8.0.bb
index f6866747eb..865ebd47b6 100644
--- a/meta-oe/recipes-extended/redis/redis_8.0.6.bb
+++ b/meta-oe/recipes-extended/redis/redis_8.8.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] = "6d0a9913887a4972536f9da226f1575859c34d86354129163260a5f9c6bd4229"
+SRC_URI[sha256sum] = "88422181efb0c9c0abba332e3e391d409e1e13714b838931669235e5796f704b"
 
 RPROVIDES:${PN} = "virtual-redis"