diff options
author | Zang Ruochen <zangrc.fnst@cn.fujitsu.com> | 2020-03-17 10:35:50 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-03-17 19:46:35 -0700 |
commit | 81386fc82cd6c3364cf689aa1b2459f58c636598 (patch) | |
tree | 2629cd1242f6c77888a5706d20213a59d63e8f3f /meta-oe | |
parent | 802f9127b17e730032803adefdc2237426adbd8b (diff) | |
download | meta-openembedded-81386fc82cd6c3364cf689aa1b2459f58c636598.tar.gz |
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@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch | 4 | ||||
-rw-r--r-- | meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch | 27 | ||||
-rw-r--r-- | meta-oe/recipes-extended/redis/redis_5.0.8.bb (renamed from meta-oe/recipes-extended/redis/redis_5.0.7.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 04af15dd8..b5c4133e3 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 | |||
18 | index 7f7c625..c71dd3b 100644 | 18 | index 7f7c625..c71dd3b 100644 |
19 | --- a/src/Makefile | 19 | --- a/src/Makefile |
20 | +++ b/src/Makefile | 20 | +++ b/src/Makefile |
21 | @@ -66,7 +66,7 @@ endif | 21 | @@ -75,7 +75,7 @@ endif |
22 | 22 | ||
23 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | 23 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) |
24 | FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) | 24 | FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) |
@@ -26,7 +26,7 @@ index 7f7c625..c71dd3b 100644 | |||
26 | +FINAL_LIBS+=-lm | 26 | +FINAL_LIBS+=-lm |
27 | DEBUG=-g -ggdb | 27 | DEBUG=-g -ggdb |
28 | 28 | ||
29 | ifeq ($(uname_S),SunOS) | 29 | # Linux ARM needs -latomic at linking time |
30 | -- | 30 | -- |
31 | 2.23.0 | 31 | 2.23.0 |
32 | 32 | ||
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 4675687c3..000000000 --- a/meta-oe/recipes-extended/redis/redis/0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From 7f7f710c8821b7254baeaf945ca3ca263b9845e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 21 Dec 2019 11:17:50 -0800 | ||
4 | Subject: [PATCH] Mark extern definition of SDS_NOINIT in sds.h | ||
5 | |||
6 | This helps avoiding multiple definition of this variable, its also | ||
7 | defined globally in sds.c | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
11 | --- | ||
12 | src/sds.h | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/sds.h b/src/sds.h | ||
16 | index 1bdb60d..adcc12c 100644 | ||
17 | --- a/src/sds.h | ||
18 | +++ b/src/sds.h | ||
19 | @@ -34,7 +34,7 @@ | ||
20 | #define __SDS_H | ||
21 | |||
22 | #define SDS_MAX_PREALLOC (1024*1024) | ||
23 | -const char *SDS_NOINIT; | ||
24 | +extern const char *SDS_NOINIT; | ||
25 | |||
26 | #include <sys/types.h> | ||
27 | #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 index b91575552..2aec1b46a 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 \ | |||
14 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ | 14 | file://lua-update-Makefile-to-use-environment-build-setting.patch \ |
15 | file://oe-use-libc-malloc.patch \ | 15 | file://oe-use-libc-malloc.patch \ |
16 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ | 16 | file://0001-src-Do-not-reset-FINAL_LIBS.patch \ |
17 | file://0005-Mark-extern-definition-of-SDS_NOINIT-in-sds.h.patch \ | ||
18 | file://GNU_SOURCE.patch \ | 17 | file://GNU_SOURCE.patch \ |
19 | " | 18 | " |
20 | 19 | ||
21 | SRC_URI[md5sum] = "612ec43075a888bc8b8a7dd8ccb2e0f7" | 20 | SRC_URI[md5sum] = "1885f1c67281d566a1fd126e19cfb25d" |
22 | SRC_URI[sha256sum] = "61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b" | 21 | SRC_URI[sha256sum] = "f3c7eac42f433326a8d981b50dba0169fdfaf46abb23fcda2f933a7552ee4ed7" |
23 | 22 | ||
24 | inherit autotools-brokensep update-rc.d systemd useradd | 23 | inherit autotools-brokensep update-rc.d systemd useradd |
25 | 24 | ||