From 15a1c43d245a04d003dff2f30caf7a7a79a9c811 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Mon, 15 Aug 2022 10:12:05 +0800 Subject: [PATCH] redis: fix do_patch fuzz warning 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 Signed-off-by: Khem Raj --- .../redis/redis-7/{GNU_SOURCE.patch => GNU_SOURCE-7.patch} | 0 meta-oe/recipes-extended/redis/redis_7.0.4.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.4.bb b/meta-oe/recipes-extended/redis/redis_7.0.4.bb index 993ff34b101..cde32e41478 100644 --- a/meta-oe/recipes-extended/redis/redis_7.0.4.bb +++ b/meta-oe/recipes-extended/redis/redis_7.0.4.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] = "f0e65fda74c44a3dd4fa9d512d4d4d833dd0939c934e946a5c622a630d057f2f"