From: Changqing Li <changqing...@windriver.com>
Fix:
WARNING: lib32-redis-7.0.4-r0 do_patch: Fuzz detected:
Applying patch GNU_SOURCE.patch
patching file src/zmalloc.c
Hunk #1 succeeded at 32 with fuzz 2 (offset 4 lines).
There are two version of redis, and need different GNU_SOURCE.patch
Signed-off-by: Changqing Li <changqing...@windriver.com>
Signed-off-by: Khem Raj <raj.k...@gmail.com>
---
.../redis/redis-7/{GNU_SOURCE.patch => GNU_SOURCE-7.patch} | 0
meta-oe/recipes-extended/redis/redis_7.0.11.bb | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-extended/redis/redis-7/{GNU_SOURCE.patch =>
GNU_SOURCE-7.patch} (100%)
diff --git a/meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE.patch
b/meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE-7.patch
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE.patch
rename to meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE-7.patch
diff --git a/meta-oe/recipes-extended/redis/redis_7.0.11.bb
b/meta-oe/recipes-extended/redis/redis_7.0.11.bb
index e6bfa227a0..4626044781 100644
--- a/meta-oe/recipes-extended/redis/redis_7.0.11.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.0.11.bb
@@ -6,7 +6,7 @@ LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ffdd6c926faaece928cf9d9640132d2"
DEPENDS = "readline lua ncurses"
-FILESPATH =. "${FILE_DIRNAME}/${PN}-7:"
+FILESPATH =. "${FILE_DIRNAME}/${BPN}-7:"
SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
file://redis.conf \
@@ -16,7 +16,7 @@ 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://GNU_SOURCE.patch \
+ file://GNU_SOURCE-7.patch \
file://0006-Define-correct-gregs-for-RISCV32.patch \
"
SRC_URI[sha256sum] =
"ce250d1fba042c613de38a15d40889b78f7cb6d5461a27e35017ba39b07221e3"
--
2.40.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#102228):
https://lists.openembedded.org/g/openembedded-devel/message/102228
Mute This Topic: https://lists.openembedded.org/mt/98576174/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
