From: Wang Mingyu <wan...@fujitsu.com> To fix conflict when do_patch: ERROR: resource-agents-4.5.0-r0 do_patch: QA Issue: Fuzz detected:
Applying patch autoconf-2.73.patch patching file configure.ac Hunk #1 succeeded at 883 with fuzz 2. Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- .../resource-agents/autoconf-2.73.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch index af188d2..dd3e1d1 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch @@ -15,16 +15,17 @@ Signed-off-by: Lei Maohui <leimao...@fujitsu.com> 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac -index d682ad780..84444a525 100644 +index d682ad7..84444a5 100644 --- a/configure.ac +++ b/configure.ac @@ -883,7 +883,6 @@ else - -Wno-strict-aliasing - -Wpointer-arith - -Wstrict-prototypes + -Wno-strict-aliasing + -Wpointer-arith + -Wstrict-prototypes - -Wunsigned-char - -Wwrite-strings" - + -Wwrite-strings" + # Additional warnings it might be nice to enable one day --- +-- 2.34.1 + -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#61354): https://lists.yoctoproject.org/g/yocto/message/61354 Mute This Topic: https://lists.yoctoproject.org/mt/102009296/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
