3 files changed, 35 insertions, 47 deletions

diff --git a/meta-oe/recipes-extended/valkey/valkey/0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch b/meta-oe/recipes-extended/valkey/valkey/0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch
new file mode 100644
index 0000000000..464fa60ee5
--- /dev/null
+++ b/meta-oe/recipes-extended/valkey/valkey/0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch
@@ -0,0 +1,31 @@
+From b15bcea48132bb8e8c1c2a4a05860cd5b73db5fd Mon Sep 17 00:00:00 2001
+From: Leon Anavi <leon.anavi@konsulko.com>
+Date: Tue, 25 Nov 2025 08:56:49 +0000
+Subject: [PATCH] src/config.h: Enable HAVE_ARM_NEON on AArch64
+
+Only enable HAVE_ARM_NEON on AArch64 because it supports vaddvq and
+all needed compiler intrinsics.
+
+Upstream-Status: Submitted [https://github.com/valkey-io/valkey/pull/2873]
+
+Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
+---
+ src/config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/config.h b/src/config.h
+index de0c24dcc..0c6b111a9 100644
+--- a/src/config.h
++++ b/src/config.h
+@@ -392,7 +392,7 @@ void setcpuaffinity(const char *cpulist);
+ #endif
+ 
+ /* Check if we can compile ARM SIMD code */
+-#if defined(__ARM_NEON) || defined(__ARM_NEON__)
++#if defined(__aarch64__) && (defined(__ARM_NEON) || defined(__ARM_NEON__))
+ #define HAVE_ARM_NEON 1
+ #else
+ #define HAVE_ARM_NEON 0
+-- 
+2.47.3
+
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
deleted file mode 100644
index ffb365f371..0000000000
--- a/meta-oe/recipes-extended/valkey/valkey/hiredis-use-default-CC-if-it-is-set.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a5bcf56630df520040076dd14c3c54fef0785ceb Mon Sep 17 00:00:00 2001
-From: Venture Research <tech@ventureresearch.com>
-Date: Fri, 8 Feb 2013 17:39:52 -0600
-Subject: [PATCH] hiredis: use default CC if it is set
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Instead of trying to automagically figure out CC, which breaks with OE
-as CC has spaces in it, just skip it if one was already passed in.
-
-Signed-off-by: Venture Research <tech@ventureresearch.com>
-
-Update to work with 4.0.8
-Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-
-Reworked for 6.0.4
-Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
-
-Reworked for 8.0.0
-Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
-
-Reworked for 8.1.0
-Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
-
-Upstream-Status: Inappropriate [OE-specifc]
----
- deps/hiredis/Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
-index 4a3de1f6e..49bb525cd 100644
---- a/deps/hiredis/Makefile
-+++ b/deps/hiredis/Makefile
-@@ -36,8 +36,6 @@ endef
- export REDIS_TEST_CONFIG
- 
- # Fallback to gcc when $CC is not in $PATH.
--CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
--CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
- OPTIMIZATION?=-O3
- WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
- DEBUG_FLAGS?= -g -ggdb
diff --git a/meta-oe/recipes-extended/valkey/valkey_8.1.4.bb b/meta-oe/recipes-extended/valkey/valkey_9.0.0.bb
index 9947a9299c..77f2551261 100644
--- a/meta-oe/recipes-extended/valkey/valkey_8.1.4.bb
+++ b/meta-oe/recipes-extended/valkey/valkey_9.0.0.bb
@@ -7,17 +7,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e"
 DEPENDS = "readline lua ncurses"
 
 SRC_URI = " \
-        git://github.com/valkey-io/valkey.git;branch=8.1;protocol=https \
+        git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https \
         file://valkey.conf \
         file://init-valkey-server \
         file://valkey.service \
-        file://hiredis-use-default-CC-if-it-is-set.patch \
         file://lua-update-Makefile-to-use-environment-build-setting.patch \
         file://oe-use-libc-malloc.patch \
         file://0001-src-Do-not-reset-FINAL_LIBS.patch \
         file://GNU_SOURCE-7.patch \
+        file://0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch \
 "
-SRCREV = "5f4bae3ea10174a7c872cc099c953b0e91afa93a"
+SRCREV = "5018b12b0de2d2322a1bbf6b041c43740587c0f2"
 
 RPROVIDES:${PN} = "virtual-redis"
 
@@ -41,7 +41,7 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
 EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
 
 do_compile() {
-    oe_runmake -C deps hiredis lua linenoise
+    oe_runmake -C deps libvalkey lua linenoise
     oe_runmake
 }