ping
-----Original Message-----
From: Wang, Xin/王 鑫
Sent: Sunday, September 11, 2016 10:58 PM
To: yocto@yoctoproject.org
Cc: Wang, Xin/王 鑫
Subject: [yocto][meta-cgl][PATCH] pacemaker: 1.1.13 -> 1.1.15
1) Upgrade pacemaker from 1.1.13 to 1.1.15.
2) Modify patch, since the data has been changed.
0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch
Signed-off-by: Wang Xin <wangxin2015.f...@cn.fujitsu.com>
---
.../0002-pacemaker-search-header-from-STAGING_INCDIR-to-walka.patch | 2 +-
.../pacemaker/{pacemaker_1.1.13.bb => pacemaker_1.1.15.bb} | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-) rename
meta-cgl-common/recipes-cgl/pacemaker/{pacemaker_1.1.13.bb =>
pacemaker_1.1.15.bb} (96%)
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 0831fda..3104512 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-sea
+++ rch-header-from-STAGING_INCDIR-to-walka.patch
@@ -27,7 +27,7 @@ index 08b4611..6fcd1aa 100644
dnl Eventually remove this
if test "$cross_compiling" != "yes"; then
-- CFLAGS="$CFLAGS -I${prefix}/include/heartbeat"
+- CPPFLAGS="$CPPFLAGS -I${prefix}/include/heartbeat"
+ CFLAGS="$CFLAGS -I${STAGING_INCDIR}/heartbeat"
+ CPPFLAGS="$CPPFLAGS -I${STAGING_INCDIR}/heartbeat"
fi
diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb
similarity index 96%
rename from meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
rename to meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb
index d2e2395..17c9fe4 100755
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.13.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.15.bb
@@ -23,8 +23,8 @@ SRC_URI =
"https://github.com/ClusterLabs/${PN}/archive/Pacemaker-${PV}.zip \
file://volatiles \
file://tmpfiles \
"
-SRC_URI[md5sum] = "d84a5173306727a981a4f87e36007595"
-SRC_URI[sha256sum] =
"e963bc59a5d98a3e3441ea5cccb42aa67f9d7934b80c8818e19ae91c5da48331"
+SRC_URI[md5sum] = "3721971f8adba248076b43f97c4571ab"
+SRC_URI[sha256sum] =
"0787cbc18d1f1b360a11eb7ccb6714042360d4948b2517a9fe43daf9e839af66"
inherit autotools-brokensep pkgconfig systemd python-dir useradd
--
2.7.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
