[yocto] [meta-cgl][PATCH] cluster-glue: replace hardcoded strings with generic variables.

[Jagadeesh Krishnanjanappa]

If BASELIB variable is set to other than 'lib', we get below error
of some files not being shipped into any package,

-- snip --
ERROR: QA Issue: cluster-glue: Files/directories were installed but not shipped
in any package:
  /usr/lib64/libstonith.so.1.0.0
  /usr/lib64/libplumb.so.2
  /usr/lib64/libpils.so.2
  /usr/lib64/libplumb.so.2.0.0
  /usr/lib64/libpils.so.2.0.0
  /usr/lib64/liblrm.so.2
  /usr/lib64/libstonith.so.1
  /usr/lib64/libplumbgpl.so.2
  /usr/lib64/libplumbgpl.so.2.0.0
  /usr/lib64/liblrm.so.2.0.0
  /usr/lib64/heartbeat
  /usr/lib64/stonith
  /usr/lib64/heartbeat/ipctransientserver
  /usr/lib64/heartbeat/transient-test.sh
  /usr/lib64/heartbeat/lrmd
  /usr/lib64/heartbeat/logtest
  /usr/lib64/heartbeat/base64_md5_test
  /usr/lib64/heartbeat/ipctransientclient
  /usr/lib64/heartbeat/ha_logd
-- CUT --

If bitbake fails to find these files not being provided by
any RPMs/DPKs, then we get below error during do_rootfs;

-- snip --
ERROR: Unable to install packages. Command '/opt/poky/build/tmp/sysroots/x86_64-linux/usr/bin/smart --log-level=warning --data-dir=/opt/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/rootfs/var/lib/smart install -y cluster-glue at core2_64 run-postinsts at all packagegroup-core-boot at qemux86_64' returned 1:
Loading cache...
Updating cache...               ######################################## [100%]

Computing transaction...error: Can't install cluster-glue-1.0.5-r0 at core2_64: no
package provides libstonith.so.1()(64bit)
-- CUT --

So, use generic variables rather than hardcoded values.

Signed-off-by: Jagadeesh Krishnanjanappa <jkrishnanjanappa at mvista.com>
---
 .../recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb | 53 +++++++++++-----------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
index f1b4a78..836f408 100644
--- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.5.bb
@@ -72,41 +72,42 @@ PACKAGES += "\
 	 ${PN}-lrmtest \
 	 "
 
-FILES_${PN} = "/etc/ /var /usr/lib/lib*.so.* /usr/sbin /usr/share/cluster-glue/*sh /usr/share/cluster-glue/*pl\
-	/usr/lib/heartbeat/transient-test.sh \
-	/usr/lib/heartbeat/logtest \
-	/usr/lib/heartbeat/ipctransientserver \
-	/usr/lib/heartbeat/base64_md5_test \
-	/usr/lib/heartbeat/ipctest \
-	/usr/lib/heartbeat/ipctransientclient \
-	/usr/lib/heartbeat/ha_logd \
-	/usr/lib/heartbeat/lrmd \
+FILES_${PN} = "${sysconfdir} ${localstatedir} ${libdir}/lib*.so.* \
+	${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\
+	${libdir}/heartbeat/transient-test.sh \
+	${libdir}/heartbeat/logtest \
+	${libdir}/heartbeat/ipctransientserver \
+	${libdir}/heartbeat/base64_md5_test \
+	${libdir}/heartbeat/ipctest \
+	${libdir}/heartbeat/ipctransientclient \
+	${libdir}/heartbeat/ha_logd \
+	${libdir}/heartbeat/lrmd \
 	"
 
-FILES_${PN}-dbg += "/usr/lib/heartbeat/.debug/"
+FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/"
 
-FILES_${PN}-plugin-test = "/usr/lib/heartbeat/plugins/test/test.so"
-FILES_${PN}-plugin-test-staticdev = "/usr/lib/heartbeat/plugins/test/test.*a"
-FILES_${PN}-plugin-test-dbg = "/usr/lib/heartbeat/plugins/test/.debug/"
+FILES_${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so"
+FILES_${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a"
+FILES_${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/"
 FILES_${PN}-plugin-stonith2 = " \
-	/usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper \
-	/usr/lib/stonith/plugins/stonith2/*.so \
+	${libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper \
+	${libdir}/stonith/plugins/stonith2/*.so \
 	"
-FILES_${PN}-plugin-stonith2-ribcl = "/usr/lib/stonith/plugins/stonith2/ribcl.py"
+FILES_${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py"
 
-FILES_${PN}-plugin-stonith2-dbg = "/usr/lib/stonith/plugins/stonith2/.debug/"
-FILES_${PN}-plugin-stonith2-staticdev = "/usr/lib/stonith/plugins/stonith2/*.*a"
+FILES_${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/"
+FILES_${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a"
 
-FILES_${PN}-plugin-stonith-external = "/usr/lib/stonith/plugins/external/"
-FILES_${PN}-plugin-raexec = "/usr/lib/heartbeat/plugins/RAExec/*.so"
-FILES_${PN}-plugin-raexec-staticdev = "/usr/lib/heartbeat/plugins/RAExec/*.*a"
-FILES_${PN}-plugin-raexec-dbg = "/usr/lib/heartbeat/plugins/RAExec/.debug/"
+FILES_${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/"
+FILES_${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so"
+FILES_${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a"
+FILES_${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/"
 
-FILES_${PN}-plugin-interfacemgr = "/usr/lib/heartbeat/plugins/InterfaceMgr/generic.so"
-FILES_${PN}-plugin-interfacemgr-staticdev = "/usr/lib/heartbeat/plugins/InterfaceMgr/generic.*a"
-FILES_${PN}-plugin-interfacemgr-dbg = "/usr/lib/heartbeat/plugins/InterfaceMgr/.debug/"
+FILES_${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so"
+FILES_${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a"
+FILES_${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/"
 
-FILES_${PN}-lrmtest = "/usr/share/cluster-glue/lrmtest/"
+FILES_${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/"
 
 RDEPENDS_${PN} += "perl"
 RDEPENDS_${PN}-plugin-stonith2 += "bash"
-- 
1.9.1