mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-07 17:19:23 +00:00
redis: Update to 4.0.8
Update redis to the latest 4.0.8 release. This also involves updating the redis.conf while maintaining some OE specific config options. Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alistair Francis
committed by
Khem Raj
Khem Raj
parent
e148ac43cc
commit
4b9e0f546e
-19
@@ -1,19 +0,0 @@
|
||||
--- redis-3.0.2/deps/hiredis/Makefile.orig 2016-05-06 19:36:26.179003036 -0700
|
||||
+++ redis-3.0.2/deps/hiredis/Makefile 2016-05-06 19:40:15.341340736 -0700
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
# Fallback to gcc when $CC is not in $PATH.
|
||||
CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
|
||||
-OPTIMIZATION?=-O3
|
||||
+OPTIMIZATION?=-O2
|
||||
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
|
||||
DEBUG?= -g -ggdb
|
||||
REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG) $(ARCH)
|
||||
@@ -68,6 +68,7 @@
|
||||
|
||||
$(STLIBNAME): $(OBJ)
|
||||
$(STLIB_MAKE_CMD) $(OBJ)
|
||||
+ $(RANLIB) $@
|
||||
|
||||
dynamic: $(DYLIBNAME)
|
||||
static: $(STLIBNAME)
|
||||
@@ -8,23 +8,23 @@ as CC has spaces in it, just skip it if one was already passed in.
|
||||
|
||||
Signed-off-by: Venture Research <tech@ventureresearch.com>
|
||||
|
||||
Update to work with 3.0.x
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
Update to work with 4.0.8
|
||||
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||
|
||||
---
|
||||
deps/hiredis/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: deps/hiredis/Makefile
|
||||
===================================================================
|
||||
diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
|
||||
index 9a4de836..271c06ba 100644
|
||||
--- a/deps/hiredis/Makefile
|
||||
+++ b/deps/hiredis/Makefile
|
||||
@@ -24,7 +24,7 @@ endef
|
||||
@@ -36,7 +36,7 @@ endef
|
||||
export REDIS_TEST_CONFIG
|
||||
|
||||
# Fallback to gcc when $CC is not in $PATH.
|
||||
-CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
|
||||
+CC?=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
|
||||
CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
|
||||
OPTIMIZATION?=-O3
|
||||
WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
|
||||
DEBUG?= -g -ggdb
|
||||
|
||||
@@ -11,15 +11,15 @@ jemalloc wasn't building correctly.
|
||||
|
||||
Signed-off-by: Venture Research <tech@ventureresearch.com>
|
||||
|
||||
Update to work with 3.0.x
|
||||
Signed-off-by: Armin Kuster <akuster808@gmail.com>
|
||||
Update to work with 4.0.8
|
||||
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||
|
||||
---
|
||||
src/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: src/Makefile
|
||||
===================================================================
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index 86e0b3fe..a810180b 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -13,7 +13,8 @@
|
||||
@@ -29,6 +29,6 @@ Index: src/Makefile
|
||||
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
||||
+# use fake uname option to force use of generic libc
|
||||
+uname_S := "USE_LIBC_MALLOC"
|
||||
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
|
||||
OPTIMIZATION?=-O2
|
||||
DEPENDENCY_TARGETS=hiredis linenoise lua
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,72 @@
|
||||
From c486455e0691f9915018b9d8b133200a6c61a3c5 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Francis <alistair.francis@wdc.com>
|
||||
Date: Thu, 24 May 2018 09:58:42 -0700
|
||||
Subject: [PATCH] Remove atomics
|
||||
|
||||
Based on this patch:
|
||||
https://github.com/patrikx3/lede-redis/blob/master/redis/patches/010-redis.patch
|
||||
|
||||
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
|
||||
---
|
||||
deps/jemalloc/src/pages.c | 22 +---------------------
|
||||
src/atomicvar.h | 4 ++--
|
||||
2 files changed, 3 insertions(+), 23 deletions(-)
|
||||
|
||||
diff --git a/deps/jemalloc/src/pages.c b/deps/jemalloc/src/pages.c
|
||||
index 83a167f6..8e82c78d 100644
|
||||
--- a/deps/jemalloc/src/pages.c
|
||||
+++ b/deps/jemalloc/src/pages.c
|
||||
@@ -147,27 +147,7 @@ pages_purge(void *addr, size_t size)
|
||||
{
|
||||
bool unzeroed;
|
||||
|
||||
-#ifdef _WIN32
|
||||
- VirtualAlloc(addr, size, MEM_RESET, PAGE_READWRITE);
|
||||
- unzeroed = true;
|
||||
-#elif defined(JEMALLOC_HAVE_MADVISE)
|
||||
-# ifdef JEMALLOC_PURGE_MADVISE_DONTNEED
|
||||
-# define JEMALLOC_MADV_PURGE MADV_DONTNEED
|
||||
-# define JEMALLOC_MADV_ZEROS true
|
||||
-# elif defined(JEMALLOC_PURGE_MADVISE_FREE)
|
||||
-# define JEMALLOC_MADV_PURGE MADV_FREE
|
||||
-# define JEMALLOC_MADV_ZEROS false
|
||||
-# else
|
||||
-# error "No madvise(2) flag defined for purging unused dirty pages."
|
||||
-# endif
|
||||
- int err = madvise(addr, size, JEMALLOC_MADV_PURGE);
|
||||
- unzeroed = (!JEMALLOC_MADV_ZEROS || err != 0);
|
||||
-# undef JEMALLOC_MADV_PURGE
|
||||
-# undef JEMALLOC_MADV_ZEROS
|
||||
-#else
|
||||
- /* Last resort no-op. */
|
||||
- unzeroed = true;
|
||||
-#endif
|
||||
+ unzeroed = false;
|
||||
return (unzeroed);
|
||||
}
|
||||
|
||||
diff --git a/src/atomicvar.h b/src/atomicvar.h
|
||||
index 84a5bbc5..f9b563c2 100644
|
||||
--- a/src/atomicvar.h
|
||||
+++ b/src/atomicvar.h
|
||||
@@ -68,7 +68,7 @@
|
||||
* is reported. */
|
||||
// #define __ATOMIC_VAR_FORCE_SYNC_MACROS
|
||||
|
||||
-#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057)
|
||||
+#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057)
|
||||
/* Implementation using __atomic macros. */
|
||||
|
||||
#define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED)
|
||||
@@ -82,7 +82,7 @@
|
||||
#define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED)
|
||||
#define REDIS_ATOMIC_API "atomic-builtin"
|
||||
|
||||
-#elif defined(HAVE_ATOMIC)
|
||||
+#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC)
|
||||
/* Implementation using __sync macros. */
|
||||
|
||||
#define atomicIncr(var,count) __sync_add_and_fetch(&var,(count))
|
||||
--
|
||||
2.17.0
|
||||
|
||||
+4
-3
@@ -13,11 +13,12 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
|
||||
file://redis.conf \
|
||||
file://init-redis-server \
|
||||
file://redis.service \
|
||||
file://hiredis-update-Makefile-to-add-symbols-to-staticlib.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "87be8867447f62524b584813e5a7bd14"
|
||||
SRC_URI[sha256sum] = "93e422c0d584623601f89b956045be158889ebe594478a2c24e1bf218495633f"
|
||||
SRC_URI_append_mips = " file://remove-atomics.patch"
|
||||
|
||||
SRC_URI[md5sum] = "c75b11e4177e153e4dc1d8dd3a6174e4"
|
||||
SRC_URI[sha256sum] = "ff0c38b8c156319249fec61e5018cf5b5fe63a65b61690bec798f4c998c232ad"
|
||||
|
||||
inherit autotools-brokensep update-rc.d systemd useradd
|
||||
|
||||
Reference in New Issue
Block a user