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 b91684afd6..7e5a6bb570 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 @@ -19,6 +19,9 @@ Signed-off-by: Leon Anavi Updated to work with 8.1.x Signed-off-by: Randy MacLeod +Refreshed for 9.1.x +Signed-off-by: Tim Orling + Upstream-Status: Inappropriate [OE-specific] --- @@ -28,10 +31,10 @@ Upstream-Status: Inappropriate [OE-specific] 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/deps/Makefile b/deps/Makefile -index 72389def9..5d3ade528 100644 +index 94d9385..5d49559 100644 --- a/deps/Makefile +++ b/deps/Makefile -@@ -95,7 +95,6 @@ endif +@@ -102,7 +102,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. @@ -40,7 +43,7 @@ index 72389def9..5d3ade528 100644 lua: .make-prerequisites diff --git a/deps/lua/Makefile b/deps/lua/Makefile -index 209a13244..72f4b2bf2 100644 +index 209a132..72f4b2b 100644 --- a/deps/lua/Makefile +++ b/deps/lua/Makefile @@ -33,7 +33,6 @@ INSTALL_DATA= $(INSTALL) -m 0644 @@ -52,7 +55,7 @@ index 209a13244..72f4b2bf2 100644 # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= diff --git a/deps/lua/src/Makefile b/deps/lua/src/Makefile -index f3bba2f81..1555ec028 100644 +index d38b2d8..e6b3540 100644 --- a/deps/lua/src/Makefile +++ b/deps/lua/src/Makefile @@ -5,18 +5,14 @@ @@ -78,5 +81,5 @@ index f3bba2f81..1555ec028 100644 +CFLAGS += $(MYCFLAGS) +LIBS += -lm $(MYLIBS) - # == END OF USER SETTINGS. NO NEED TO CHANGE ANYTHING BELOW THIS LINE ========= - + # Pretty-printing setup + CC_COLOR="\033[32m" diff --git a/meta-oe/recipes-extended/valkey/valkey_9.0.4.bb b/meta-oe/recipes-extended/valkey/valkey_9.1.0.bb similarity index 93% rename from meta-oe/recipes-extended/valkey/valkey_9.0.4.bb rename to meta-oe/recipes-extended/valkey/valkey_9.1.0.bb index 93e37a922a..de1f413d4f 100644 --- a/meta-oe/recipes-extended/valkey/valkey_9.0.4.bb +++ b/meta-oe/recipes-extended/valkey/valkey_9.1.0.bb @@ -6,7 +6,7 @@ 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} \ +SRC_URI = "git://github.com/valkey-io/valkey.git;branch=${@oe.utils.trim_version(d.getVar('PV'), 2)};protocol=https;tag=${PV} \ file://valkey.conf \ file://init-valkey-server \ file://valkey.service \ @@ -15,7 +15,7 @@ SRC_URI = "git://github.com/valkey-io/valkey.git;branch=9.0;protocol=https;tag=$ file://0001-src-Do-not-reset-FINAL_LIBS.patch \ file://GNU_SOURCE-7.patch \ " -SRCREV = "1cbee84ba69b54c3510597965fc4320ce716a6f4" +SRCREV = "c9e8005e9d0ec817e26c7db318861cb821409249" RPROVIDES:${PN} = "virtual-redis"