summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2021-05-22 03:35:11 +0200
committerKhem Raj <raj.khem@gmail.com>2021-05-22 05:54:00 -0700
commit50fddcc42b631c93ef95aae4fcf880e0a1aff9b6 (patch)
tree44f578180ffa016465b05b96e673418f247b74c6
parentcb65ca0d45c9f0ced8bd8fd40318d2bcce38ebd9 (diff)
downloadmeta-openembedded-50fddcc42b631c93ef95aae4fcf880e0a1aff9b6.tar.gz
redis: upgrade 6.2.2 -> 6.2.3
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch10
-rw-r--r--meta-oe/recipes-extended/redis/redis_6.2.3.bb (renamed from meta-oe/recipes-extended/redis/redis_6.2.2.bb)2
2 files changed, 5 insertions, 7 deletions
diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
index b5c4133e3..66ab0ee33 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
@@ -10,15 +10,16 @@ e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
13--- 14---
14 src/Makefile | 2 +- 15 src/Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
16 17
17diff --git a/src/Makefile b/src/Makefile 18diff --git a/src/Makefile b/src/Makefile
18index 7f7c625..c71dd3b 100644 19index 5564351..83ccd76 100644
19--- a/src/Makefile 20--- a/src/Makefile
20+++ b/src/Makefile 21+++ b/src/Makefile
21@@ -75,7 +75,7 @@ endif 22@@ -91,7 +91,7 @@ endif
22 23
23 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) 24 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
24 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) 25 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
@@ -26,7 +27,4 @@ index 7f7c625..c71dd3b 100644
26+FINAL_LIBS+=-lm 27+FINAL_LIBS+=-lm
27 DEBUG=-g -ggdb 28 DEBUG=-g -ggdb
28 29
29 # Linux ARM needs -latomic at linking time 30 # Linux ARM32 needs -latomic at linking time
30--
312.23.0
32
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.2.bb b/meta-oe/recipes-extended/redis/redis_6.2.3.bb
index 65b525709..67ac974de 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.2.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.3.bb
@@ -17,7 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
17 file://GNU_SOURCE.patch \ 17 file://GNU_SOURCE.patch \
18 file://0006-Define-correct-gregs-for-RISCV32.patch \ 18 file://0006-Define-correct-gregs-for-RISCV32.patch \
19 " 19 "
20SRC_URI[sha256sum] = "7a260bb74860f1b88c3d5942bf8ba60ca59f121c6dce42d3017bed6add0b9535" 20SRC_URI[sha256sum] = "98ed7d532b5e9671f5df0825bb71f0f37483a16546364049384c63db8764512b"
21 21
22inherit autotools-brokensep update-rc.d systemd useradd 22inherit autotools-brokensep update-rc.d systemd useradd
23 23