From fc17e4713425b4f65b0eb1423a0283d9c9684080 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Wed, 2 Apr 2025 10:24:24 -0400 Subject: [PATCH] valkey: update from 8.0.2 -> 8.1.0 Release notes: https://github.com/valkey-io/valkey/releases/tag/8.1.0 The license file checksum changed because upstream added the line: SPDX-License-Identifier: BSD-3-Clause Adjust the patches using devtool and manually munge the Upstream-Status-es. Signed-off-by: Randy MacLeod Signed-off-by: Khem Raj --- .../valkey/0001-src-Do-not-reset-FINAL_LIBS.patch | 13 +++++-------- .../valkey/valkey/GNU_SOURCE-7.patch | 4 ++-- .../hiredis-use-default-CC-if-it-is-set.patch | 8 +++++--- ...Makefile-to-use-environment-build-setting.patch | 14 +++++++++----- .../valkey/valkey/oe-use-libc-malloc.patch | 11 +++++++---- .../valkey/{valkey_8.0.2.bb => valkey_8.1.0.bb} | 6 +++--- 6 files changed, 31 insertions(+), 25 deletions(-) rename meta-oe/recipes-extended/valkey/{valkey_8.0.2.bb => valkey_8.1.0.bb} (92%) diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch index ab2265bdba..7dd064fc03 100644 --- a/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch +++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-Do-not-reset-FINAL_LIBS.patch @@ -1,4 +1,4 @@ -From b4cf6e677cec75a0d2b57dcb2960ad1e16908c82 Mon Sep 17 00:00:00 2001 +From a657a3c88488e761c05011400fcee5328fc797e1 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 10 Sep 2019 20:04:26 -0700 Subject: [PATCH] src: Do not reset FINAL_LIBS @@ -16,18 +16,15 @@ Signed-off-by: Leon Anavi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index e0b1d2722..48988e271 100644 +index 5919f01e9..e95050376 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -145,7 +145,7 @@ ifeq ($(SERVER_TEST),yes) - FINAL_CFLAGS +=-DSERVER_TEST=1 - endif +@@ -138,7 +138,7 @@ endif + + FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS) FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(SERVER_LDFLAGS) $(DEBUG) -FINAL_LIBS=-lm +FINAL_LIBS+=-lm DEBUG=-g -ggdb # Linux ARM32 needs -latomic at linking time --- -2.39.5 - diff --git a/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch index fa11d058ff..bf6fc9ab24 100644 --- a/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch +++ b/meta-oe/recipes-extended/valkey/valkey/GNU_SOURCE-7.patch @@ -1,4 +1,4 @@ -From f3dd59789e4a8b06777be2725c6c3e36050fd6ec Mon Sep 17 00:00:00 2001 +From 6414a404c3216e654cc6583ebda0c7b3bd304ecf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 21 Dec 2019 12:09:51 -0800 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER @@ -16,7 +16,7 @@ Signed-off-by: Leon Anavi 1 file changed, 1 insertion(+) diff --git a/src/zmalloc.c b/src/zmalloc.c -index 7b19107b6..bd365c11c 100644 +index 3abf9a31a..fa2f25c07 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -33,6 +33,7 @@ diff --git a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch index 3168c5860e..ffb365f371 100644 --- a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch +++ b/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch @@ -1,4 +1,4 @@ -From 5e6c3052930f1d831d3479cb59533c08277700ff Mon Sep 17 00:00:00 2001 +From a5bcf56630df520040076dd14c3c54fef0785ceb Mon Sep 17 00:00:00 2001 From: Venture Research Date: Fri, 8 Feb 2013 17:39:52 -0600 Subject: [PATCH] hiredis: use default CC if it is set @@ -20,9 +20,11 @@ Signed-off-by: Andreas Müller Reworked for 8.0.0 Signed-off-by: Leon Anavi ---- -Upstream-Status: Pending +Reworked for 8.1.0 +Signed-off-by: Randy MacLeod +Upstream-Status: Inappropriate [OE-specifc] +--- deps/hiredis/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch index 1c37626381..b91684afd6 100644 --- a/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch +++ b/meta-oe/recipes-extended/valkey/valkey/lua-update-Makefile-to-use-environment-build-setting.patch @@ -1,4 +1,4 @@ -From 892225f5101b1131434d323c55e79a93dc189609 Mon Sep 17 00:00:00 2001 +From 60487572d23cb374f8eb6b6560c385ecf6ad417e Mon Sep 17 00:00:00 2001 From: Venture Research Date: Fri, 8 Feb 2013 20:22:19 -0600 Subject: [PATCH] lua: update Makefile to use environment build settings @@ -15,19 +15,23 @@ Signed-off-by: Armin Kuster updated to work wtih 6.2.1 Signed-off-by: Yi Fan Yu Signed-off-by: Leon Anavi ---- -Upstream-Status: Pending +Updated to work with 8.1.x +Signed-off-by: Randy MacLeod + +Upstream-Status: Inappropriate [OE-specific] + +--- deps/Makefile | 1 - deps/lua/Makefile | 1 - deps/lua/src/Makefile | 16 ++++++---------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index f1e4bd6ce..b9e50d049 100644 +index 72389def9..5d3ade528 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -94,7 +94,6 @@ endif +@@ -95,7 +95,6 @@ endif # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more # challenging to cross-compile lua (and redis). These defines make it easier # to fit redis into cross-compilation environments, which typically set AR. diff --git a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch index 3bab01e3fb..a711830e41 100644 --- a/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch +++ b/meta-oe/recipes-extended/valkey/valkey/oe-use-libc-malloc.patch @@ -1,4 +1,4 @@ -From ad79a81d6582555e580bdba42c959477e7d35ae7 Mon Sep 17 00:00:00 2001 +From 87bbb65c3c5fb7d248871d9c3bcbd3d27c781449 Mon Sep 17 00:00:00 2001 From: Venture Research Date: Wed, 6 Feb 2013 20:51:02 -0600 Subject: [PATCH] hack to force use of libc malloc @@ -17,14 +17,17 @@ Signed-off-by: Alistair Francis Update to work with 8.0.0 Signed-off-by: Leon Anavi ---- -Upstream-Status: Pending +Update to work with 8.1.0 +Signed-off-by: Randy MacLeod +Upstream-Status: Inappropriate [Embedded specific] + +--- src/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile -index 13fa1c027..e0b1d2722 100644 +index 1437f41bd..5919f01e9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ diff --git a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb b/meta-oe/recipes-extended/valkey/valkey_8.1.0.bb similarity index 92% rename from meta-oe/recipes-extended/valkey/valkey_8.0.2.bb rename to meta-oe/recipes-extended/valkey/valkey_8.1.0.bb index 04ed342556..8662221ca4 100644 --- a/meta-oe/recipes-extended/valkey/valkey_8.0.2.bb +++ b/meta-oe/recipes-extended/valkey/valkey_8.1.0.bb @@ -3,11 +3,11 @@ DESCRIPTION = "A flexible distributed key-value datastore that supports both cac HOMEPAGE = "http://valkey.io" SECTION = "libs" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=f924153a31f3091d2c9c500317d53425" +LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e" DEPENDS = "readline lua ncurses" SRC_URI = " \ - git://github.com/valkey-io/valkey.git;branch=8.0;protocol=https \ + git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \ file://valkey.conf \ file://init-valkey-server \ file://valkey.service \ @@ -17,7 +17,7 @@ SRC_URI = " \ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE-7.patch \ " -SRCREV = "d6a2f561e2751d4ab246ad084e4fa185526fa479" +SRCREV = "67c8683792fc9ab7e295f833478eca180c5e4691" S = "${WORKDIR}/git"