summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/redis
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/redis')
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch)7
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch)6
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch)7
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch)4
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch)6
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch)4
-rw-r--r--[-rwxr-xr-x]meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server)0
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf)0
-rw-r--r--meta-oe/recipes-extended/redis/redis-7.2.8/redis.service (renamed from meta-oe/recipes-extended/redis/redis-7.2.4/redis.service)0
-rw-r--r--meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch (renamed from meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch)14
-rw-r--r--meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch (renamed from meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch)10
-rw-r--r--meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch (renamed from meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch)9
-rw-r--r--meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch (renamed from meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch)8
-rw-r--r--meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch (renamed from meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch)6
-rw-r--r--meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch12
-rw-r--r--[-rwxr-xr-x]meta-oe/recipes-extended/redis/redis/init-redis-server0
-rw-r--r--meta-oe/recipes-extended/redis/redis_6.2.18.bb (renamed from meta-oe/recipes-extended/redis/redis_6.2.14.bb)27
-rw-r--r--meta-oe/recipes-extended/redis/redis_7.2.8.bb (renamed from meta-oe/recipes-extended/redis/redis_7.2.4.bb)32
18 files changed, 76 insertions, 76 deletions
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
index 7785acca5c..63bf403412 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
1From 41efa2f0cf08c91ff935bbb2d16ab233df7f5811 Mon Sep 17 00:00:00 2001 1From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 17:39:52 -0600 3Date: Fri, 8 Feb 2013 17:39:52 -0600
4Subject: [PATCH] hiredis: use default CC if it is set 4Subject: [PATCH] hiredis: use default CC if it is set
@@ -9,6 +9,8 @@ Content-Transfer-Encoding: 8bit
9Instead of trying to automagically figure out CC, which breaks with OE 9Instead of trying to automagically figure out CC, which breaks with OE
10as CC has spaces in it, just skip it if one was already passed in. 10as CC has spaces in it, just skip it if one was already passed in.
11 11
12Upstream-Status: Pending
13
12Signed-off-by: Venture Research <tech@ventureresearch.com> 14Signed-off-by: Venture Research <tech@ventureresearch.com>
13 15
14Update to work with 4.0.8 16Update to work with 4.0.8
@@ -16,10 +18,7 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
16 18
17Reworked for 6.0.4 19Reworked for 6.0.4
18Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 20Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
19
20--- 21---
21Upstream-Status: Pending
22
23 deps/hiredis/Makefile | 2 -- 22 deps/hiredis/Makefile | 2 --
24 1 file changed, 2 deletions(-) 23 1 file changed, 2 deletions(-)
25 24
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 20708eda1e..46330f5064 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
1From aa3d31355f3cc140b1dc2f4fcff8e3c0aa261549 Mon Sep 17 00:00:00 2001 1From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 20:22:19 -0600 3Date: Fri, 8 Feb 2013 20:22:19 -0600
4Subject: [PATCH] lua: update Makefile to use environment build settings 4Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
6OE-specific parameters, instead of overriding all of these simply use 6OE-specific parameters, instead of overriding all of these simply use
7the ones that are already passed in. Also configure for only Linux... 7the ones that are already passed in. Also configure for only Linux...
8 8
9Upstream-Status: Pending
10
9Signed-off-by: Venture Research <tech@ventureresearch.com> 11Signed-off-by: Venture Research <tech@ventureresearch.com>
10 12
11Updated to work with 3.0.x 13Updated to work with 3.0.x
@@ -14,8 +16,6 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
14 16
15updated to work wtih 6.2.1 17updated to work wtih 6.2.1
16Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> 18Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
17
18Upstream-Status: Pending
19--- 19---
20 deps/Makefile | 1 - 20 deps/Makefile | 1 -
21 deps/lua/Makefile | 1 - 21 deps/lua/Makefile | 1 -
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
index 7b601e02a9..1f97f9783d 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
1From 38a5f403b033d03cdac3ff814687d83f61527d8e Mon Sep 17 00:00:00 2001 1From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Wed, 6 Feb 2013 20:51:02 -0600 3Date: Wed, 6 Feb 2013 20:51:02 -0600
4Subject: [PATCH] hack to force use of libc malloc 4Subject: [PATCH] hack to force use of libc malloc
@@ -9,14 +9,13 @@ removed in favor of magic.
9Note that this of course doesn't allow tcmalloc and jemalloc, however 9Note that this of course doesn't allow tcmalloc and jemalloc, however
10jemalloc wasn't building correctly. 10jemalloc wasn't building correctly.
11 11
12Upstream-Status: Pending
13
12Signed-off-by: Venture Research <tech@ventureresearch.com> 14Signed-off-by: Venture Research <tech@ventureresearch.com>
13 15
14Update to work with 4.0.8 16Update to work with 4.0.8
15Signed-off-by: Alistair Francis <alistair.francis@wdc.com> 17Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
16
17--- 18---
18Upstream-Status: Pending
19
20 src/Makefile | 3 ++- 19 src/Makefile | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-) 20 1 file changed, 2 insertions(+), 1 deletion(-)
22 21
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
index 01e53e3f21..974cf5169f 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
1From d9d1f9a501ef7caa80d1e6595218898e9989ec2b Mon Sep 17 00:00:00 2001 1From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 Sep 2019 20:04:26 -0700 3Date: Tue, 10 Sep 2019 20:04:26 -0700
4Subject: [PATCH] src: Do not reset FINAL_LIBS 4Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,8 +9,8 @@ environment to get it going
9e.g. -latomic is needed on clang/x86 to provide for 64bit atomics 9e.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>
13 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14---
15 src/Makefile | 2 +- 15 src/Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 6e07c25c6a..8e5f30993b 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/GNU_SOURCE-7.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
1From a22512ac1cbd6de1f5646219722e49752d1f60ac Mon Sep 17 00:00:00 2001 1From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Dec 2019 12:09:51 -0800 3Date: Sat, 21 Dec 2019 12:09:51 -0800
4Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER 4Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -9,14 +9,14 @@ Fixes
9| | ^~~~~~~~~~~~~~~~~~~~~~~~~ 9| | ^~~~~~~~~~~~~~~~~~~~~~~~~
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14---
15 src/zmalloc.c | 1 + 15 src/zmalloc.c | 1 +
16 1 file changed, 1 insertion(+) 16 1 file changed, 1 insertion(+)
17 17
18diff --git a/src/zmalloc.c b/src/zmalloc.c 18diff --git a/src/zmalloc.c b/src/zmalloc.c
19index ba03685..322304f 100644 19index bbfa386..93e07ff 100644
20--- a/src/zmalloc.c 20--- a/src/zmalloc.c
21+++ b/src/zmalloc.c 21+++ b/src/zmalloc.c
22@@ -32,6 +32,7 @@ 22@@ -32,6 +32,7 @@
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
index 93c3595261..7009048171 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,14 +1,14 @@
1From 634f62be6c135ece93cb4e44a69ce3cb66f394ca Mon Sep 17 00:00:00 2001 1From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 26 Oct 2020 21:32:22 -0700 3Date: Mon, 26 Oct 2020 21:32:22 -0700
4Subject: [PATCH] Define correct gregs for RISCV32 4Subject: [PATCH] Define correct gregs for RISCV32
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 9
9Updated patch for 6.2.8 10Updated patch for 6.2.8
10Signed-off-by: Changqing Li <changqing.li@windriver.com> 11Signed-off-by: Changqing Li <changqing.li@windriver.com>
11
12--- 12---
13 src/debug.c | 26 ++++++++++++++++++++++++-- 13 src/debug.c | 26 ++++++++++++++++++++++++--
14 1 file changed, 24 insertions(+), 2 deletions(-) 14 1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
index 75037d6dc8..75037d6dc8 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.conf
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
index b7791d0df4..b7791d0df4 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.4/redis.service
+++ b/meta-oe/recipes-extended/redis/redis-7.2.8/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
index d2a1b45e66..51a6e9c957 100644
--- a/meta-oe/recipes-extended/redis/redis/hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,11 +1,16 @@
1From dc745a33f3875cc72d41bd34ed490b352e546352 Mon Sep 17 00:00:00 2001 1From 67990f216f2fbbc8a6699c700dfc089aa617905f Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 17:39:52 -0600 3Date: Fri, 8 Feb 2013 17:39:52 -0600
4Subject: [PATCH] hiredis: use default CC if it is set 4Subject: [PATCH] hiredis: use default CC if it is set
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
5 8
6Instead of trying to automagically figure out CC, which breaks with OE 9Instead of trying to automagically figure out CC, which breaks with OE
7as CC has spaces in it, just skip it if one was already passed in. 10as CC has spaces in it, just skip it if one was already passed in.
8 11
12Upstream-Status: Pending
13
9Signed-off-by: Venture Research <tech@ventureresearch.com> 14Signed-off-by: Venture Research <tech@ventureresearch.com>
10 15
11Update to work with 4.0.8 16Update to work with 4.0.8
@@ -14,13 +19,11 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
14Reworked for 6.0.4 19Reworked for 6.0.4
15Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 20Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
16--- 21---
17Upstream-Status: Pending
18
19 deps/hiredis/Makefile | 2 -- 22 deps/hiredis/Makefile | 2 --
20 1 file changed, 2 deletions(-) 23 1 file changed, 2 deletions(-)
21 24
22diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile 25diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile
23index 25ac154..569f82b 100644 26index 7e41c97..54717e3 100644
24--- a/deps/hiredis/Makefile 27--- a/deps/hiredis/Makefile
25+++ b/deps/hiredis/Makefile 28+++ b/deps/hiredis/Makefile
26@@ -42,8 +42,6 @@ endef 29@@ -42,8 +42,6 @@ endef
@@ -32,6 +35,3 @@ index 25ac154..569f82b 100644
32 OPTIMIZATION?=-O3 35 OPTIMIZATION?=-O3
33 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers 36 WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
34 DEBUG_FLAGS?= -g -ggdb 37 DEBUG_FLAGS?= -g -ggdb
35--
362.21.3
37
diff --git a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index aade7afd06..17b533669b 100644
--- a/meta-oe/recipes-extended/redis/redis/lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
1From 097a2b259cb266c2c861dc74fa6f80712d6138c5 Mon Sep 17 00:00:00 2001 1From ef989aab052510bfda32b2b325a5f80b76c42677 Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Fri, 8 Feb 2013 20:22:19 -0600 3Date: Fri, 8 Feb 2013 20:22:19 -0600
4Subject: [PATCH] lua: update Makefile to use environment build settings 4Subject: [PATCH] lua: update Makefile to use environment build settings
@@ -6,6 +6,8 @@ Subject: [PATCH] lua: update Makefile to use environment build settings
6OE-specific parameters, instead of overriding all of these simply use 6OE-specific parameters, instead of overriding all of these simply use
7the ones that are already passed in. Also configure for only Linux... 7the ones that are already passed in. Also configure for only Linux...
8 8
9Upstream-Status: Pending
10
9Signed-off-by: Venture Research <tech@ventureresearch.com> 11Signed-off-by: Venture Research <tech@ventureresearch.com>
10 12
11Updated to work with 3.0.x 13Updated to work with 3.0.x
@@ -15,18 +17,16 @@ Signed-off-by: Armin Kuster <akust808@gmail.com>
15updated to work wtih 6.2.1 17updated to work wtih 6.2.1
16Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> 18Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
17--- 19---
18Upstream-Status: Pending
19
20 deps/Makefile | 1 - 20 deps/Makefile | 1 -
21 deps/lua/Makefile | 1 - 21 deps/lua/Makefile | 1 -
22 deps/lua/src/Makefile | 16 ++++++---------- 22 deps/lua/src/Makefile | 16 ++++++----------
23 3 files changed, 6 insertions(+), 12 deletions(-) 23 3 files changed, 6 insertions(+), 12 deletions(-)
24 24
25diff --git a/deps/Makefile b/deps/Makefile 25diff --git a/deps/Makefile b/deps/Makefile
26index ff16ee9..d8d64aa 100644 26index cbe3aef..76bc222 100644
27--- a/deps/Makefile 27--- a/deps/Makefile
28+++ b/deps/Makefile 28+++ b/deps/Makefile
29@@ -74,7 +74,6 @@ LUA_LDFLAGS+= $(LDFLAGS) 29@@ -81,7 +81,6 @@ endif
30 # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more 30 # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
31 # challenging to cross-compile lua (and redis). These defines make it easier 31 # challenging to cross-compile lua (and redis). These defines make it easier
32 # to fit redis into cross-compilation environments, which typically set AR. 32 # to fit redis into cross-compilation environments, which typically set AR.
diff --git a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
index e76bdbc263..f1021eef6c 100644
--- a/meta-oe/recipes-extended/redis/redis/oe-use-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
1From 1fa047162983d4a7e0576f0837a73a6027a783bd Mon Sep 17 00:00:00 2001 1From b9586abcb803747301f6cc4ff93c7642bef693ea Mon Sep 17 00:00:00 2001
2From: Venture Research <tech@ventureresearch.com> 2From: Venture Research <tech@ventureresearch.com>
3Date: Wed, 6 Feb 2013 20:51:02 -0600 3Date: Wed, 6 Feb 2013 20:51:02 -0600
4Subject: [PATCH] hack to force use of libc malloc 4Subject: [PATCH] hack to force use of libc malloc
@@ -9,19 +9,18 @@ removed in favor of magic.
9Note that this of course doesn't allow tcmalloc and jemalloc, however 9Note that this of course doesn't allow tcmalloc and jemalloc, however
10jemalloc wasn't building correctly. 10jemalloc wasn't building correctly.
11 11
12Upstream-Status: Pending
13
12Signed-off-by: Venture Research <tech@ventureresearch.com> 14Signed-off-by: Venture Research <tech@ventureresearch.com>
13 15
14Update to work with 4.0.8 16Update to work with 4.0.8
15Signed-off-by: Alistair Francis <alistair.francis@wdc.com> 17Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
16
17--- 18---
18Upstream-Status: Pending
19
20 src/Makefile | 3 ++- 19 src/Makefile | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-) 20 1 file changed, 2 insertions(+), 1 deletion(-)
22 21
23diff --git a/src/Makefile b/src/Makefile 22diff --git a/src/Makefile b/src/Makefile
24index ecd6929..c7f43c5 100644 23index 7d75c83..35dd314 100644
25--- a/src/Makefile 24--- a/src/Makefile
26+++ b/src/Makefile 25+++ b/src/Makefile
27@@ -13,7 +13,8 @@ 26@@ -13,7 +13,8 @@
diff --git a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
index 66ab0ee33c..958106e261 100644
--- a/meta-oe/recipes-extended/redis/redis/0001-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
1From 97584e1eb78dc18599534b47b6670c20c63f5ee2 Mon Sep 17 00:00:00 2001 1From a4d87aca1c00c53b386ee7490223971e00873add Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 Sep 2019 20:04:26 -0700 3Date: Tue, 10 Sep 2019 20:04:26 -0700
4Subject: [PATCH] src: Do not reset FINAL_LIBS 4Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -9,17 +9,17 @@ environment to get it going
9e.g. -latomic is needed on clang/x86 to provide for 64bit atomics 9e.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>
13 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14---
15 src/Makefile | 2 +- 15 src/Makefile | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/src/Makefile b/src/Makefile 18diff --git a/src/Makefile b/src/Makefile
19index 5564351..83ccd76 100644 19index 35dd314..3770f96 100644
20--- a/src/Makefile 20--- a/src/Makefile
21+++ b/src/Makefile 21+++ b/src/Makefile
22@@ -91,7 +91,7 @@ endif 22@@ -93,7 +93,7 @@ endif
23 23
24 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) 24 FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
25 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) 25 FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
diff --git a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 20f689bd0b..d73c66c9d0 100644
--- a/meta-oe/recipes-extended/redis/redis/GNU_SOURCE.patch
+++ b/meta-oe/recipes-extended/redis/redis/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
1From 98d526f76049be21bf3d77158236b2189419a78e Mon Sep 17 00:00:00 2001 1From 2e6311c9c7cd85bf63eab8fe92c08ec1ec01b6fc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 21 Dec 2019 12:09:51 -0800 3Date: Sat, 21 Dec 2019 12:09:51 -0800
4Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER 4Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
@@ -9,6 +9,7 @@ Fixes
9| | ^~~~~~~~~~~~~~~~~~~~~~~~~ 9| | ^~~~~~~~~~~~~~~~~~~~~~~~~
10 10
11Upstream-Status: Pending 11Upstream-Status: Pending
12
12Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
13--- 14---
14 src/zmalloc.c | 1 + 15 src/zmalloc.c | 1 +
@@ -26,6 +27,3 @@ index 1f33d09..5e182d1 100644
26 #include <stdio.h> 27 #include <stdio.h>
27 #include <stdlib.h> 28 #include <stdlib.h>
28 #include <stdint.h> 29 #include <stdint.h>
29--
302.25.1
31
diff --git a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
index 9d7e502717..bb3f5c607e 100644
--- a/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,9 +1,10 @@
1From 26bd72f3b8de22e5036d86e6c79f815853b83473 Mon Sep 17 00:00:00 2001 1From 6149911f7a6fbaef3ed418408e2b501fa9479ffa Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 26 Oct 2020 21:32:22 -0700 3Date: Mon, 26 Oct 2020 21:32:22 -0700
4Subject: [PATCH] Define correct gregs for RISCV32 4Subject: [PATCH] Define correct gregs for RISCV32
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7
7Signed-off-by: Khem Raj <raj.khem@gmail.com> 8Signed-off-by: Khem Raj <raj.khem@gmail.com>
8 9
9Updated patch for 6.2.1 10Updated patch for 6.2.1
@@ -13,10 +14,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com>
13 1 file changed, 24 insertions(+), 2 deletions(-) 14 1 file changed, 24 insertions(+), 2 deletions(-)
14 15
15diff --git a/src/debug.c b/src/debug.c 16diff --git a/src/debug.c b/src/debug.c
16index 5318c14..8c21b47 100644 17index bb76c5d..55a0696 100644
17--- a/src/debug.c 18--- a/src/debug.c
18+++ b/src/debug.c 19+++ b/src/debug.c
19@@ -1055,7 +1055,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) { 20@@ -1067,7 +1067,9 @@ static void* getAndSetMcontextEip(ucontext_t *uc, void *eip) {
20 #endif 21 #endif
21 #elif defined(__linux__) 22 #elif defined(__linux__)
22 /* Linux */ 23 /* Linux */
@@ -27,7 +28,7 @@ index 5318c14..8c21b47 100644
27 GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip); 28 GET_SET_RETURN(uc->uc_mcontext.gregs[14], eip);
28 #elif defined(__X86_64__) || defined(__x86_64__) 29 #elif defined(__X86_64__) || defined(__x86_64__)
29 GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip); 30 GET_SET_RETURN(uc->uc_mcontext.gregs[16], eip);
30@@ -1222,8 +1224,28 @@ void logRegisters(ucontext_t *uc) { 31@@ -1234,8 +1236,28 @@ void logRegisters(ucontext_t *uc) {
31 #endif 32 #endif
32 /* Linux */ 33 /* Linux */
33 #elif defined(__linux__) 34 #elif defined(__linux__)
@@ -57,6 +58,3 @@ index 5318c14..8c21b47 100644
57 serverLog(LL_WARNING, 58 serverLog(LL_WARNING,
58 "\n" 59 "\n"
59 "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n" 60 "EAX:%08lx EBX:%08lx ECX:%08lx EDX:%08lx\n"
60--
612.25.1
62
diff --git a/meta-oe/recipes-extended/redis/redis/init-redis-server b/meta-oe/recipes-extended/redis/redis/init-redis-server
index c5f335f57d..c5f335f57d 100755..100644
--- a/meta-oe/recipes-extended/redis/redis/init-redis-server
+++ b/meta-oe/recipes-extended/redis/redis/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis_6.2.14.bb b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
index fa430ce402..171c6640f2 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.14.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.18.bb
@@ -10,19 +10,20 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
10 file://redis.conf \ 10 file://redis.conf \
11 file://init-redis-server \ 11 file://init-redis-server \
12 file://redis.service \ 12 file://redis.service \
13 file://hiredis-use-default-CC-if-it-is-set.patch \ 13 file://0001-hiredis-use-default-CC-if-it-is-set.patch \
14 file://lua-update-Makefile-to-use-environment-build-setting.patch \ 14 file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
15 file://oe-use-libc-malloc.patch \ 15 file://0003-hack-to-force-use-of-libc-malloc.patch \
16 file://0001-src-Do-not-reset-FINAL_LIBS.patch \ 16 file://0004-src-Do-not-reset-FINAL_LIBS.patch \
17 file://GNU_SOURCE.patch \ 17 file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
18 file://0006-Define-correct-gregs-for-RISCV32.patch \ 18 file://0006-Define-correct-gregs-for-RISCV32.patch \
19 " 19 "
20SRC_URI[sha256sum] = "34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277"
21 20
22inherit autotools-brokensep update-rc.d systemd useradd 21SRC_URI[sha256sum] = "470c75bac73d7390be4dd66479c6f29e86371c5d380ce0c7efb4ba2bbda3612d"
22
23inherit update-rc.d systemd useradd
23 24
24FINAL_LIBS:x86:toolchain-clang = "-latomic" 25FINAL_LIBS:x86:toolchain-clang = "-latomic"
25FINAL_LIBS:riscv32:toolchain-clang = "-latomic" 26FINAL_LIBS:riscv32 = "-latomic"
26FINAL_LIBS:mips = "-latomic" 27FINAL_LIBS:mips = "-latomic"
27FINAL_LIBS:arm = "-latomic" 28FINAL_LIBS:arm = "-latomic"
28FINAL_LIBS:powerpc = "-latomic" 29FINAL_LIBS:powerpc = "-latomic"
@@ -36,21 +37,21 @@ GROUPADD_PARAM:${PN} = "--system redis"
36REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}" 37REDIS_ON_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
37 38
38do_compile:prepend() { 39do_compile:prepend() {
39 (cd deps && oe_runmake hiredis lua linenoise) 40 oe_runmake -C deps hiredis lua linenoise
40} 41}
41 42
42do_install() { 43do_install() {
43 export PREFIX=${D}/${prefix} 44 export PREFIX=${D}/${prefix}
44 oe_runmake install 45 oe_runmake install
45 install -d ${D}/${sysconfdir}/redis 46 install -d ${D}/${sysconfdir}/redis
46 install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf 47 install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
47 install -d ${D}/${sysconfdir}/init.d 48 install -d ${D}/${sysconfdir}/init.d
48 install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server 49 install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
49 install -d ${D}/var/lib/redis/ 50 install -d ${D}/var/lib/redis/
50 chown redis.redis ${D}/var/lib/redis/ 51 chown redis.redis ${D}/var/lib/redis/
51 52
52 install -d ${D}${systemd_system_unitdir} 53 install -d ${D}${systemd_system_unitdir}
53 install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} 54 install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir}
54 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service 55 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service
55 56
56 if [ "${REDIS_ON_SYSTEMD}" = true ]; then 57 if [ "${REDIS_ON_SYSTEMD}" = true ]; then
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.4.bb b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
index 5d64e9ba78..3c4d84085b 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.4.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.8.bb
@@ -10,19 +10,22 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
10 file://redis.conf \ 10 file://redis.conf \
11 file://init-redis-server \ 11 file://init-redis-server \
12 file://redis.service \ 12 file://redis.service \
13 file://hiredis-use-default-CC-if-it-is-set.patch \ 13 file://0001-hiredis-use-default-CC-if-it-is-set.patch \
14 file://lua-update-Makefile-to-use-environment-build-setting.patch \ 14 file://0002-lua-update-Makefile-to-use-environment-build-setting.patch \
15 file://oe-use-libc-malloc.patch \ 15 file://0003-hack-to-force-use-of-libc-malloc.patch \
16 file://0001-src-Do-not-reset-FINAL_LIBS.patch \ 16 file://0004-src-Do-not-reset-FINAL_LIBS.patch \
17 file://GNU_SOURCE-7.patch \ 17 file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
18 file://0006-Define-correct-gregs-for-RISCV32.patch \ 18 file://0006-Define-correct-gregs-for-RISCV32.patch \
19 " 19 "
20SRC_URI[sha256sum] = "8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59"
21 20
22inherit autotools-brokensep pkgconfig update-rc.d systemd useradd 21SRC_URI[sha256sum] = "6be4fdfcdb2e5ac91454438246d00842d2671f792673390e742dfcaf1bf01574"
22
23RPROVIDES:${PN} = "virtual-redis"
24
25inherit pkgconfig update-rc.d systemd useradd
23 26
24FINAL_LIBS:x86:toolchain-clang = "-latomic" 27FINAL_LIBS:x86:toolchain-clang = "-latomic"
25FINAL_LIBS:riscv32:toolchain-clang = "-latomic" 28FINAL_LIBS:riscv32 = "-latomic"
26FINAL_LIBS:mips = "-latomic" 29FINAL_LIBS:mips = "-latomic"
27FINAL_LIBS:arm = "-latomic" 30FINAL_LIBS:arm = "-latomic"
28FINAL_LIBS:powerpc = "-latomic" 31FINAL_LIBS:powerpc = "-latomic"
@@ -39,21 +42,21 @@ PACKAGECONFIG[systemd] = "USE_SYSTEMD=yes,USE_SYSTEMD=no,systemd"
39EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}" 42EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS}"
40 43
41do_compile:prepend() { 44do_compile:prepend() {
42 (cd deps && oe_runmake hiredis lua linenoise) 45 oe_runmake -C deps hiredis lua linenoise
43} 46}
44 47
45do_install() { 48do_install() {
46 export PREFIX=${D}/${prefix} 49 export PREFIX=${D}/${prefix}
47 oe_runmake install 50 oe_runmake install
48 install -d ${D}/${sysconfdir}/redis 51 install -d ${D}/${sysconfdir}/redis
49 install -m 0644 ${WORKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf 52 install -m 0644 ${UNPACKDIR}/redis.conf ${D}/${sysconfdir}/redis/redis.conf
50 install -d ${D}/${sysconfdir}/init.d 53 install -d ${D}/${sysconfdir}/init.d
51 install -m 0755 ${WORKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server 54 install -m 0755 ${UNPACKDIR}/init-redis-server ${D}/${sysconfdir}/init.d/redis-server
52 install -d ${D}/var/lib/redis/ 55 install -d ${D}/var/lib/redis/
53 chown redis.redis ${D}/var/lib/redis/ 56 chown redis.redis ${D}/var/lib/redis/
54 57
55 install -d ${D}${systemd_system_unitdir} 58 install -d ${D}${systemd_system_unitdir}
56 install -m 0644 ${WORKDIR}/redis.service ${D}${systemd_system_unitdir} 59 install -m 0644 ${UNPACKDIR}/redis.service ${D}${systemd_system_unitdir}
57 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service 60 sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_system_unitdir}/redis.service
58 61
59 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 62 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
@@ -68,3 +71,6 @@ INITSCRIPT_NAME = "redis-server"
68INITSCRIPT_PARAMS = "defaults 87" 71INITSCRIPT_PARAMS = "defaults 87"
69 72
70SYSTEMD_SERVICE:${PN} = "redis.service" 73SYSTEMD_SERVICE:${PN} = "redis.service"
74
75CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows."
76CVE_STATUS[CVE-2022-0543] = "not-applicable-platform: Debian-specific CVE"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-08 23:54:23 +0000