Skip to contentSkip to conversation

redis: fix do_patch fuzz warning

PATCH New Martin Jansa 1 participant 1 message Apr 29, 2023 1 message not in the archive

lore
Share & tools
lore
#1 lore raw

PATCH 1/1 redis: fix do_patch fuzz warning

In reply to a message not in the archive

From: Changqing Li <[email protected]>

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

---
 .../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%)
meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE-7.patch renamed from meta-oe/recipes-extended/redis/redis-7/GNU_SOURCE.patch +0 -0
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
meta-oe/recipes-extended/redis/redis_7.0.11.bb +2 -2
index e6bfa227a0..4626044781 100644
@@ -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"
Signature · 1 line
2.40.1