Re: [yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning

[Yi Zhao]

在 2018年04月16日 10:26, Anuj Mittal 写道:

Hi Yi

On 04/16/2018 09:57 AM, Yi Zhao wrote:


+
+diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c
+index 385ca7d..c259c7c 100644
+--- a/lib/common/mainloop.c
 b/lib/common/mainloop.c
  @@ -32,6 +32,7 @@
   #include 
   #include 
   #include 
  +#include 
   
- struct mainloop_child_s {

- pid_t pid;
+ #include 
+

It looks like this patch is no longer required and is just adding the
same thing twice. Please check.


Thanks. You are right. I will send V2.

//Yi





--
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning

[Anuj Mittal]

Hi Yi

On 04/16/2018 09:57 AM, Yi Zhao wrote:

> +
> +diff --git a/lib/common/mainloop.c b/lib/common/mainloop.c
> +index 385ca7d..c259c7c 100644
> +--- a/lib/common/mainloop.c
>  b/lib/common/mainloop.c
>  @@ -32,6 +32,7 @@
>   #include 
>   #include 
>   #include 
>  +#include 
>   
> - struct mainloop_child_s {
> - pid_t pid;
> + #include 
> + 

It looks like this patch is no longer required and is just adding the
same thing twice. Please check.
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

[yocto] [meta-cgl][PATCH 2/3] pacemaker: refresh patches to fix QA warning

[Yi Zhao]

Refresh patches with devtool command to fix do_patch warning.

Signed-off-by: Yi Zhao 
---
 .../pacemaker/0001-pacemaker-fix-xml-config.patch  | 14 ++
 ...earch-header-from-STAGING_INCDIR-to-walka.patch | 10 --
 .../0003-pacemaker-fix-header-defs-lookup.patch| 12 +---
 .../0004-pacemaker-do-not-build-help.patch | 12 +---
 ...o-not-execute-target-program-while-cross-.patch | 12 +---
 ...006-pacemaker-do-not-use-libgnutls-config.patch | 22 +-
 .../pacemaker/pacemaker/fix_missing_qb_array.patch | 21 ++---
 .../pacemaker/set-OCF_ROOT_DIR-to-libdir-ocf.patch |  6 ++
 8 files changed, 54 insertions(+), 55 deletions(-)
 mode change 100755 => 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
 mode change 100755 => 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
 mode change 100755 => 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0004-pacemaker-do-not-build-help.patch
 mode change 100755 => 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0005-pacemaker-do-not-execute-target-program-while-cross-.patch
 mode change 100755 => 100644 
meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-pacemaker-do-not-use-libgnutls-config.patch

diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
old mode 100755
new mode 100644
index ea9380e..c27052d
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
+++ 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-xml-config.patch
@@ -1,18 +1,19 @@
-From a6b792b9abb26e810ad9ca11be31998c7e97db6c Mon Sep 17 00:00:00 2001
+From a55e235f56bc6e894e79fa200c39678e06ef985e Mon Sep 17 00:00:00 2001
 From: Bian Naimeng 
 Date: Fri, 3 Jul 2015 15:48:58 +0900
-Subject: [PATCH 1/2] pacemaker: fix xml config
+Subject: [PATCH] pacemaker: fix xml config
 
 Signed-off-by: Bian Naimeng 
+
 ---
  configure.ac | 17 ++---
  1 file changed, 6 insertions(+), 11 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 03f543d..25af918 100644
+index 7195f9b..5e420f2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -533,7 +533,6 @@ AC_PATH_PROGS(TAR, tar)
+@@ -557,7 +557,6 @@ AC_PATH_PROGS(TAR, tar)
  AC_PATH_PROGS(MD5, md5)
  AC_PATH_PROGS(TEST, test)
  AC_PATH_PROGS(PKGCONFIG, pkg-config)
@@ -20,7 +21,7 @@ index 03f543d..25af918 100644
  AC_PATH_PROGS(VALGRIND_BIN, valgrind, /usr/bin/valgrind)
  AC_DEFINE_UNQUOTED(VALGRIND_BIN, "$VALGRIND_BIN", Valgrind command)
  
-@@ -779,17 +778,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
+@@ -807,17 +806,13 @@ dnl AC_CHECK_HEADERS(netinet/icmp6.h)
  dnl AC_CHECK_HEADERS(netinet/ip6.h)
  dnl AC_CHECK_HEADERS(netinet/ip_icmp.h)
  
@@ -44,6 +45,3 @@ index 03f543d..25af918 100644
  
  AC_CHECK_HEADERS(libxml/xpath.h)
  AC_CHECK_HEADERS(libxslt/xslt.h)
--- 
-1.8.4.2
-
diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
index ee3c722..83940d1 100644
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
+++ 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
@@ -1,4 +1,4 @@
-From f2ab529af7ab31d265dd3e9a53e074317982dffd Mon Sep 17 00:00:00 2001
+From 844ec301031b0e6a3000c793906ba476f08a1e65 Mon Sep 17 00:00:00 2001
 From: Li xin 
 Date: Wed, 27 Dec 2017 05:20:45 +
 Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround
@@ -16,15 +16,16 @@ Upstream-Status: pending
 Signed-off-by: Bian Naimeng 
 Signed-off-by: Li Xin 
 Signed-off-by: Mingli Yu 
+
 ---
  configure.ac | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.ac b/configure.ac
-index 36ccb01..2eade3c 100644
+index 5e420f2..5d442a5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -483,6 +483,9 @@ esac
+@@ -484,6 +484,9 @@ esac
  dnl Eventually remove this
  if test "$cross_compiling" != "yes"; then
 CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat"
@@ -34,6 +35,3 @@ index 36ccb01..2eade3c 100644
  fi
  
  AC_SUBST(INIT_EXT)
--- 
-2.11.0
-
diff --git 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
 
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch
old mode 100755
new mode 100644
index 939ecab..6dc4663
--- 
a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0003-pacemaker-fix-header-defs-lookup.patch