From 31b3c8bec5ec8474dc9ae56b01666f5840fe8f55 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 18 Dec 2025 17:03:46 +0800 Subject: valkey: upgrade 9.0.0 -> 9.0.1 0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch removed since it's included in 9.0.1 Changelog: =========== - Authenticate slot migration client on source node to internal user - Bug fix: reset io_last_written on c->buf resize to prevent stale pointers - Sentinel: fix regression requiring "+failover" ACL in failover path - Cluster: Avoid usage of light weight messages to nodes with not ready bidirectional links - Send duplicate multi meet packet only for node which supports it in mixed clusters - Fix: LTRIM should not call signalModifiedKey when no elements are removed - Fix build on some 32-bit ARM by only using NEON on AArch64 - Fix deadlock in IO-thread shutdown during panic - Fix COMMANDLOG large-reply when using reply copy avoidance - Fix CLUSTER SLOTS crash when called from module timer callback Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch | 31 --------- meta-oe/recipes-extended/valkey/valkey_9.0.0.bb | 75 ---------------------- meta-oe/recipes-extended/valkey/valkey_9.0.1.bb | 73 +++++++++++++++++++++ 3 files changed, 73 insertions(+), 106 deletions(-) delete mode 100644 meta-oe/recipes-extended/valkey/valkey/0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch delete mode 100644 meta-oe/recipes-extended/valkey/valkey_9.0.0.bb create mode 100644 meta-oe/recipes-extended/valkey/valkey_9.0.1.bb 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 deleted file mode 100644 index 464fa60ee5..0000000000 --- a/meta-oe/recipes-extended/valkey/valkey/0001-src-config.h-Enable-HAVE_ARM_NEON-on-AArch64.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b15bcea48132bb8e8c1c2a4a05860cd5b73db5fd Mon Sep 17 00:00:00 2001 -From: Leon Anavi -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 ---- - 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_9.0.0.bb b/meta-oe/recipes-extended/valkey/valkey_9.0.0.bb deleted file mode 100644 index 77f2551261..0000000000 --- a/meta-oe/recipes-extended/valkey/valkey_9.0.0.bb +++ /dev/null @@ -1,75 +0,0 @@ -SUMMARY = "Valkey key-value store" -DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads." -HOMEPAGE = "http://valkey.io" -SECTION = "libs" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e" -DEPENDS = "readline lua ncurses" - -SRC_URI = " \ - git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https \ - file://valkey.conf \ - file://init-valkey-server \ - file://valkey.service \ - 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 = "5018b12b0de2d2322a1bbf6b041c43740587c0f2" - -RPROVIDES:${PN} = "virtual-redis" - -inherit pkgconfig update-rc.d systemd useradd - -FINAL_LIBS:x86:toolchain-clang = "-latomic" -FINAL_LIBS:riscv32 = "-latomic" -FINAL_LIBS:mips = "-latomic" -FINAL_LIBS:arm = "-latomic" -FINAL_LIBS:powerpc = "-latomic" - -export FINAL_LIBS - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey" -GROUPADD_PARAM:${PN} = "--system valkey" - -PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" - -EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" - -do_compile() { - oe_runmake -C deps libvalkey lua linenoise - oe_runmake -} - -do_install() { - export PREFIX=${D}/${prefix} - oe_runmake install - install -d ${D}/${sysconfdir}/valkey - install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server - install -d ${D}/var/lib/valkey/ - chown valkey.valkey ${D}/var/lib/valkey/ - - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir} - sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service - - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf - sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf - fi -} - -CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf" - -INITSCRIPT_NAME = "valkey-server" -INITSCRIPT_PARAMS = "defaults 87" - -SYSTEMD_SERVICE:${PN} = "valkey.service" - -CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows." diff --git a/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb b/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb new file mode 100644 index 0000000000..1f27224772 --- /dev/null +++ b/meta-oe/recipes-extended/valkey/valkey_9.0.1.bb @@ -0,0 +1,73 @@ +SUMMARY = "Valkey key-value store" +DESCRIPTION = "A flexible distributed key-value datastore that supports both caching and beyond caching workloads." +HOMEPAGE = "http://valkey.io" +SECTION = "libs" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=08b9159809d809e8aaa340a8387e693e" +DEPENDS = "readline lua ncurses" + +SRC_URI = "git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https;tag=${PV} \ + file://valkey.conf \ + file://init-valkey-server \ + file://valkey.service \ + 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 \ + " +SRCREV = "ab3c953b80289d88991095f53c1235fc2f8b44d6" + +RPROVIDES:${PN} = "virtual-redis" + +inherit pkgconfig update-rc.d systemd useradd + +FINAL_LIBS:x86:toolchain-clang = "-latomic" +FINAL_LIBS:riscv32 = "-latomic" +FINAL_LIBS:mips = "-latomic" +FINAL_LIBS:arm = "-latomic" +FINAL_LIBS:powerpc = "-latomic" + +export FINAL_LIBS + +USERADD_PACKAGES = "${PN}" +USERADD_PARAM:${PN} = "--system --home-dir /var/lib/valkey -g valkey --shell /bin/false valkey" +GROUPADD_PARAM:${PN} = "--system valkey" + +PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd" + +EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" + +do_compile() { + oe_runmake -C deps libvalkey lua linenoise + oe_runmake +} + +do_install() { + export PREFIX=${D}/${prefix} + oe_runmake install + install -d ${D}/${sysconfdir}/valkey + install -m 0644 ${UNPACKDIR}/valkey.conf ${D}/${sysconfdir}/valkey/valkey.conf + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${UNPACKDIR}/init-valkey-server ${D}/${sysconfdir}/init.d/valkey-server + install -d ${D}/var/lib/valkey/ + chown valkey.valkey ${D}/var/lib/valkey/ + + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${UNPACKDIR}/valkey.service ${D}${systemd_system_unitdir} + sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/valkey.service + + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + sed -i 's!daemonize yes!# daemonize yes!' ${D}/${sysconfdir}/valkey/valkey.conf + sed -i 's!supervised no!supervised systemd!' ${D}/${sysconfdir}/valkey/valkey.conf + fi +} + +CONFFILES:${PN} = "${sysconfdir}/valkey/valkey.conf" + +INITSCRIPT_NAME = "valkey-server" +INITSCRIPT_PARAMS = "defaults 87" + +SYSTEMD_SERVICE:${PN} = "valkey.service" + +CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows." -- cgit v1.2.3-54-g00ecf