[oe-commits] [meta-openembedded] 01/19: redis: upgrade 5.0.7 -> 5.0.8

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 81386fc82cd6c3364cf689aa1b2459f58c636598
Author: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
AuthorDate: Tue Mar 17 10:35:50 2020 +0800

    redis: upgrade 5.0.7 -> 5.0.8
    
    -Refresh the following patch:
    	0001-src-Do-not-reset-FINAL_LIBS.patch
    
    -0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
    	Removed since this is included in 5.0.8
    
    Signed-off-by: Zang Ruochen <zangrc.fnst at cn.fujitsu.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../redis/0001-src-Do-not-reset-FINAL_LIBS.patch   |  4 ++--
 ...-extern-definition-of-SDS_NOINIT-in-sds.h.patch | 27 ----------------------
 .../redis/{redis_5.0.7.bb => redis_5.0.8.bb}       |  5 ++--
 3 files changed, 4 insertions(+), 32 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 04af15d..b5c4133 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
@@ -18,7 +18,7 @@ diff --git a/src/Makefile b/src/Makefile
 index 7f7c625..c71dd3b 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -66,7 +66,7 @@ endif
+@@ -75,7 +75,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
  FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
@@ -26,7 +26,7 @@ index 7f7c625..c71dd3b 100644
 +FINAL_LIBS+=-lm
  DEBUG=-g -ggdb
  
- ifeq ($(uname_S),SunOS)
+ # Linux ARM needs -latomic at linking time
 -- 
 2.23.0
 
diff --git a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch b/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
deleted file mode 100644
index 4675687..0000000
--- a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7f7f710c8821b7254baeaf945ca3ca263b9845e2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem at gmail.com>
-Date: Sat, 21 Dec 2019 11:17:50 -0800
-Subject: [PATCH] Mark extern definition of SDS_NOINIT in sds.h
-
-This helps avoiding multiple definition of this variable, its also
-defined globally in sds.c
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem at gmail.com>
----
- src/sds.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sds.h b/src/sds.h
-index 1bdb60d..adcc12c 100644
---- a/src/sds.h
-+++ b/src/sds.h
-@@ -34,7 +34,7 @@
- #define __SDS_H
- 
- #define SDS_MAX_PREALLOC (1024*1024)
--const char *SDS_NOINIT;
-+extern const char *SDS_NOINIT;
- 
- #include <sys/types.h>
- #include <stdarg.h>
diff --git a/meta-oe/recipes-extended/redis/redis_5.0.7.bb b/meta-oe/recipes-extended/redis/redis_5.0.8.bb
similarity index 90%
rename from meta-oe/recipes-extended/redis/redis_5.0.7.bb
rename to meta-oe/recipes-extended/redis/redis_5.0.8.bb
index b915755..2aec1b4 100644
--- a/meta-oe/recipes-extended/redis/redis_5.0.7.bb
+++ b/meta-oe/recipes-extended/redis/redis_5.0.8.bb
@@ -14,12 +14,11 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            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://0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch \
            file://GNU_SOURCE.patch \
            "
 
-SRC_URI[md5sum] = "612ec43075a888bc8b8a7dd8ccb2e0f7"
-SRC_URI[sha256sum] = "61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b"
+SRC_URI[md5sum] = "1885f1c67281d566a1fd126e19cfb25d"
+SRC_URI[sha256sum] = "f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.