[oe-commits] Vladimir Sorokin : pacemaker: packaging fixes, move some files between packages

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 77de34d15bc0d069cab2695b107e36f892401c1e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=77de34d15bc0d069cab2695b107e36f892401c1e

Author: Vladimir Sorokin <sorokin at altell.ru>
Date:   Wed Sep 29 15:23:08 2010 +0400

pacemaker: packaging fixes, move some files between packages

Signed-off-by: Vladimir Sorokin <sorokin at altell.ru>
Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/pacemaker/pacemaker_1.0.9.1.bb |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/recipes/pacemaker/pacemaker_1.0.9.1.bb b/recipes/pacemaker/pacemaker_1.0.9.1.bb
index eac6aae..34ab2ee 100644
--- a/recipes/pacemaker/pacemaker_1.0.9.1.bb
+++ b/recipes/pacemaker/pacemaker_1.0.9.1.bb
@@ -16,7 +16,7 @@ DEPENDS = " \
 	"
 RDEPENDS_${PN} += "openais"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = " \
 	http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-${PV}.tar.bz2 \
@@ -50,16 +50,17 @@ pkg_postinst_${PN} () {
 	grep hacluster /etc/passwd || adduser --disabled-password --home=${localstatedir}/lib/heartbeat --ingroup haclient -g "HA cluster" hacluster
 	/etc/init.d/populate-volatile.sh update
 }
-
+FILES_${PN}-doc += "${datadir}/pacemaker/crm_cli.txt ${datadir}/pacemaker/templates/"
 FILES_${PN} += " \
 	${libdir}/service_crm.so \
 	${libdir}/ocf/resource.d/pacemaker \
-	${libdir}/heartbeat/a* \
+	${libdir}/heartbeat/attrd \
 	${libdir}/heartbeat/c* \
 	${libdir}/heartbeat/pengine \
 	${libdir}/heartbeat/pingd \
 	${libdir}/heartbeat/plugins/RAExec/stonith.so \
-	${libdir}/heartbeat/s* \
+	${libdir}/heartbeat/stonithd \
+	${datadir}/pacemaker/*.rng \
 	"
 FILES_${PN}-dbg += "${libdir}/heartbeat/.debug ${libdir}/heartbeat/plugins/RAExec/.debug/ ${libdir}/heartbeat/stonithdtest/.debug/ ${libexecdir}/lcrso/.debug"
 FILES_${PN}-dev += "${libdir}/heartbeat/plugins/RAExec/*.la"
@@ -72,6 +73,6 @@ FILES_${PN}-hb2openais = "${libdir}/heartbeat/hb2openais.sh ${libdir}/heartbeat/
 RDEPENDS_${PN}-hb2openais += "python-core"
 FILES_${PN}-haresources2cib = "${libdir}/heartbeat/haresources2cib.py"
 RDEPENDS_${PN}-haresources2cib += "python-core"
-FILES_${PN}-tests = "${datadir}/pacemaker/tests"
+FILES_${PN}-tests = "${datadir}/pacemaker/tests ${datadir}/pacemaker/stonithdtest ${libdir}/heartbeat/atest ${libdir}/heartbeat/stonithdtest/*"
 RDEPENDS_${PN}-test += "python-core"
 FILES_${PN}-snmp = "${datadir}/snmp/mibs/PCMK-MIB.txt"