diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-08-19 15:51:06 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-08-19 16:09:28 -0700 |
| commit | 8cec59341a845eb9776a54a5c34e6777f8a332aa (patch) | |
| tree | d5d2210df6600e9e155c7abf06e36a0a1832bda8 /meta-networking | |
| parent | 45ee3c0e98bd3ed81419aaeae1e7324e486161a2 (diff) | |
| download | meta-openembedded-8cec59341a845eb9776a54a5c34e6777f8a332aa.tar.gz | |
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@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-extended/dlm/dlm_4.0.7.bb | 9 |
1 files changed, 8 insertions, 1 deletions
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 f7f7e188c5..18843a61f8 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+)+)" | |||
| 20 | LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" | 20 | LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" |
| 21 | LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" | 21 | LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" |
| 22 | 22 | ||
| 23 | DEPENDS = "corosync systemd pacemaker" | 23 | DEPENDS = "corosync systemd" |
| 24 | 24 | ||
| 25 | inherit pkgconfig systemd distro_features_check | 25 | inherit pkgconfig systemd distro_features_check |
| 26 | 26 | ||
| 27 | PACKAGECONFIG ??= "" | ||
| 28 | |||
| 29 | PACKAGECONFIG[pacemaker] = ",,pacemaker" | ||
| 30 | |||
| 27 | SYSTEMD_SERVICE_${PN} = "dlm.service" | 31 | SYSTEMD_SERVICE_${PN} = "dlm.service" |
| 28 | SYSTEMD_AUTO_ENABLE = "enable" | 32 | SYSTEMD_AUTO_ENABLE = "enable" |
| 29 | 33 | ||
| 30 | export EXTRA_OEMAKE = "" | 34 | export EXTRA_OEMAKE = "" |
| 31 | 35 | ||
| 36 | DONTBUILD = "${@bb.utils.contains('PACKAGECONFIG', 'pacemaker', '', 'fence', d)}" | ||
| 37 | |||
| 32 | do_compile_prepend() { | 38 | do_compile_prepend() { |
| 33 | sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile | 39 | sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile |
| 40 | sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile | ||
| 34 | } | 41 | } |
| 35 | 42 | ||
| 36 | do_compile () { | 43 | do_compile () { |
