[oe-commits] [meta-openembedded] 01/02: dlm: Build fence only when pacemaker recipe is available

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 0b5b93426577da81bb4c5e5b6393d7b0eb3029e7
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sun Aug 19 15:51:06 2018 -0700

    dlm: Build fence only when pacemaker recipe is available
    
    pacemaker is not in meta-networking, and therefore dlm fails
    to build when meta-cgl is not included, this changeset makes
    the pacemaker dependency to be optional, and disabled by default
    so users who have pacemaker in the bbfiles should enable pacemaker
    support via a bbappend or setting it in config metadata
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-networking/recipes-extended/dlm/dlm_4.0.7.bb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb
index f7f7e18..18843a6 100644
--- a/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb
+++ b/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb
@@ -20,17 +20,24 @@ UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)"
 LICENSE = "LGPLv2+ & GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d"
 
-DEPENDS = "corosync systemd pacemaker"
+DEPENDS = "corosync systemd"
 
 inherit pkgconfig systemd distro_features_check
 
+PACKAGECONFIG ??= ""
+
+PACKAGECONFIG[pacemaker] = ",,pacemaker"
+
 SYSTEMD_SERVICE_${PN} = "dlm.service"
 SYSTEMD_AUTO_ENABLE = "enable"
 
 export EXTRA_OEMAKE = ""
 
+DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}"
+
 do_compile_prepend() {
     sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile
+    sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile
 }
 
 do_compile () {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.