| Message ID | 20220812091458.1395202-1-changqing.li@windriver.com |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [kirtstone,master,meta-oe] redis: fix do_patch fuzz warning | expand |
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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] > -=-=-=-=-=-=-=-=-=-=-=- >
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"