[yocto] [meta-cgl][PATCH] pacemaker: upgrade 1.1.12 -> 1.1.13

[Li xin]

* update 0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
* Modify SRC_URI
* Warning Fix:
  WARNING: QA Issue: pacemaker: Files/directories were installed but not shipped in any package:
  /usr/lib/python2.7
  /usr/lib/python2.7/site-packages
  /usr/lib/python2.7/site-packages/cts
  /usr/lib/python2.7/site-packages/cts/watcher.py

Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
---
 ...earch-header-from-STAGING_INCDIR-to-walka.patch | 41 +++++++++-------------
 .../{pacemaker_1.1.12.bb => pacemaker_1.1.13.bb}   |  9 +++--
 2 files changed, 21 insertions(+), 29 deletions(-)
 rename meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.12.bb => pacemaker_1.1.13.bb} (92%)

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 7e5f499..0831fda 100755
--- 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,8 +1,8 @@
-From 1fef2f6adaef3c56649adce4aca1b0ef2214c13b Mon Sep 17 00:00:00 2001
-From: Bian Naimeng <biannm at cn.fujitsu.com>
-Date: Fri, 3 Jul 2015 15:55:52 +0900
-Subject: [PATCH 2/2] pacemaker: search header from STAGING_INCDIR to
- walkaround error
+From 6bb056aa8359e33f9b6f8974e2cc8b518ca9fe96 Mon Sep 17 00:00:00 2001
+From: Li xin <lixin.fnst at cn.fujitsu.com>
+Date: Tue, 18 Aug 2015 12:34:32 +0900
+Subject: [PATCH] pacemaker: search header from STAGING_INCDIR to walkaround
+ error
 
  ** -I/usr/include/ is unsafe for cross-compilation
 
@@ -11,35 +11,28 @@ Subject: [PATCH 2/2] pacemaker: search header from STAGING_INCDIR to
  ** This autoconf log indicates errors, it looked at host include and/or library paths
  ** while determining system capabilities
 
+Upstream-Status: pending
+
 Signed-off-by: Bian Naimeng <biannm at cn.fujitsu.com>
+Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
 ---
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
+ configure.ac | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 25af918..4dee123 100644
+index 08b4611..6fcd1aa 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -451,7 +451,8 @@ case "$host_os" in
- 		;;
- *linux*)
- 		AC_DEFINE_UNQUOTED(ON_LINUX, 1, Compiling for Linux platform)
--  		CFLAGS="$CFLAGS -I${prefix}/include"
-+		CFLAGS="$CFLAGS -I${STAGING_INCDIR}"
-+		CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
-  		;;
- darwin*)
- 		AC_DEFINE_UNQUOTED(ON_DARWIN, 1, Compiling for Darwin platform)
-@@ -461,7 +462,8 @@ darwin*)
- esac
+@@ -463,7 +463,8 @@ esac
  
  dnl Eventually remove this
--CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
-+CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
-+CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
+ if test "$cross_compiling" != "yes"; then
+-   CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
++   CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
++   CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
+ fi
  
  AC_SUBST(INIT_EXT)
- AC_MSG_NOTICE(Host CPU: $host_cpu)
 -- 
 1.8.4.2
 
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
similarity index 92%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
index 8c6e998..1806fe1 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.12.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6adca3b36477cc77e04376f9a40df32c \
                    "
 DEPENDS = "corosync libxslt openais libxml2 gnutls resource-agents libqb python-native"
 
-SRC_URI = "https://codeload.github.com/ClusterLabs/${BPN}/tar.gz/Pacemaker-1.1.12;downloadfilename=${BPN}-${PV}.tar.gz \
+SRC_URI = "git://github.com/ClusterLabs/pacemaker.git \
            file://0001-pacemaker-fix-xml-config.patch \
            file://0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch \
            file://0003-pacemaker-fix-header-defs-lookup.patch \
@@ -23,13 +23,11 @@ SRC_URI = "https://codeload.github.com/ClusterLabs/${BPN}/tar.gz/Pacemaker-1.1.1
            file://volatiles \
            file://tmpfiles \
           "
-
-SRC_URI[md5sum] = "c5c28013efb08441ab74a12034d9e9b4"
-SRC_URI[sha256sum] = "f5c72b609fac18d362880d120f08f990e8afd9388e6ff86c55cd93900ba54d9c"
+SRCREV = "6052cd16c2f455809f8088af76ce86483bf98353"
 
 inherit autotools-brokensep pkgconfig systemd python-dir useradd
 
-S="${WORKDIR}/pacemaker-Pacemaker-${PV}"
+S="${WORKDIR}/git"
 
 EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \
                  --disable-fatal-warnings \
@@ -79,6 +77,7 @@ FILES_${PN} += " ${datadir}/snmp                             \
                  ${libdir}/corosync/lcrso/pacemaker.lcrso    \
                  ${libdir}/${PYTHON_DIR}/dist-packages/cts/  \
                  ${libdir}/ocf/resource.d/ \
+                 ${libdir}/${PYTHON_DIR}/site-packages \
                "
 FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
 RDEPENDS_${PN} = "bash python libqb"
-- 
1.8.4.2