* [kirtstone][master][meta-oe][PATCH] redis: fix do_patch fuzz warning
@ 2022-08-12 9:14 changqing.li
2022-08-13 10:10 ` [oe] " Robert Yang
0 siblings, 1 reply; 4+ messages in thread
From: changqing.li @ 2022-08-12 9:14 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@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.li@windriver.com>
---
.../redis/redis-7/{GNU_SOURCE.patch => GNU_SOURCE-7.patch} | 0
meta-oe/recipes-extended/redis/redis_7.0.4.bb | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
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 993ff34b10..e292237097 100644
--- a/meta-oe/recipes-extended/redis/redis_7.0.4.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.0.4.bb
@@ -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"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [oe] [kirtstone][master][meta-oe][PATCH] redis: fix do_patch fuzz warning
2022-08-12 9:14 [kirtstone][master][meta-oe][PATCH] redis: fix do_patch fuzz warning changqing.li
@ 2022-08-13 10:10 ` Robert Yang
2022-08-13 14:08 ` Khem Raj
0 siblings, 1 reply; 4+ messages in thread
From: Robert Yang @ 2022-08-13 10:10 UTC (permalink / raw)
To: Changqing Li, openembedded-devel
Please hold on this patch, we need a V2 to fix the multilib do_fetch error.
// Robert
On 8/12/22 17:14, Changqing Li wrote:
> From: Changqing Li <changqing.li@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.li@windriver.com>
> ---
> .../redis/redis-7/{GNU_SOURCE.patch => GNU_SOURCE-7.patch} | 0
> meta-oe/recipes-extended/redis/redis_7.0.4.bb | 2 +-
> 2 files changed, 1 insertion(+), 1 deletion(-)
> 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 993ff34b10..e292237097 100644
> --- a/meta-oe/recipes-extended/redis/redis_7.0.4.bb
> +++ b/meta-oe/recipes-extended/redis/redis_7.0.4.bb
> @@ -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"
>
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#98209): https://lists.openembedded.org/g/openembedded-devel/message/98209
> Mute This Topic: https://lists.openembedded.org/mt/92976372/3616940
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [liezhi.yang@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe] [kirtstone][master][meta-oe][PATCH] redis: fix do_patch fuzz warning
2022-08-13 10:10 ` [oe] " Robert Yang
@ 2022-08-13 14:08 ` Khem Raj
2022-08-15 2:12 ` [kirtstone][master][meta-oe][PATCH V2] " changqing.li
0 siblings, 1 reply; 4+ messages in thread
From: Khem Raj @ 2022-08-13 14:08 UTC (permalink / raw)
To: Robert Yang; +Cc: Changqing Li, openembedded-devel
On Sat, Aug 13, 2022 at 3:10 AM Robert Yang <liezhi.yang@windriver.com> wrote:
>
> Please hold on this patch, we need a V2 to fix the multilib do_fetch error.
>
dropped. thanks
> // Robert
>
> On 8/12/22 17:14, Changqing Li wrote:
> > From: Changqing Li <changqing.li@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.li@windriver.com>
> > ---
> > .../redis/redis-7/{GNU_SOURCE.patch => GNU_SOURCE-7.patch} | 0
> > meta-oe/recipes-extended/redis/redis_7.0.4.bb | 2 +-
> > 2 files changed, 1 insertion(+), 1 deletion(-)
> > 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 993ff34b10..e292237097 100644
> > --- a/meta-oe/recipes-extended/redis/redis_7.0.4.bb
> > +++ b/meta-oe/recipes-extended/redis/redis_7.0.4.bb
> > @@ -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"
> >
> >
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#98227): https://lists.openembedded.org/g/openembedded-devel/message/98227
> Mute This Topic: https://lists.openembedded.org/mt/92976372/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [kirtstone][master][meta-oe][PATCH V2] redis: fix do_patch fuzz warning
2022-08-13 14:08 ` Khem Raj
@ 2022-08-15 2:12 ` changqing.li
0 siblings, 0 replies; 4+ messages in thread
From: changqing.li @ 2022-08-15 2:12 UTC (permalink / raw)
To: openembedded-devel
From: Changqing Li <changqing.li@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.li@windriver.com>
---
.../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 993ff34b10..cde32e4147 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"
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-15 2:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-12 9:14 [kirtstone][master][meta-oe][PATCH] redis: fix do_patch fuzz warning changqing.li
2022-08-13 10:10 ` [oe] " Robert Yang
2022-08-13 14:08 ` Khem Raj
2022-08-15 2:12 ` [kirtstone][master][meta-oe][PATCH V2] " changqing.li
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.