mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
corosync: Update to 3.0.3
- Add dependency on kronosnet - Remove obsolete options and packageconfigs - Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
a367e54deb
commit
5c051f8402
|
@ -1,32 +0,0 @@
|
||||||
Subject: [PATCH] configure.ac: fix pkgconfig issue of rdma
|
|
||||||
|
|
||||||
pkgconfig files from rdma-core(https://github.com/linux-rdma/rdma-core)
|
|
||||||
are named start with lib, such as librdmacm.pc and libibverbs.pc. When
|
|
||||||
rdma support is enabled, it fails to find rdma related libraries. Update
|
|
||||||
configure.ac to the issue.
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/corosync/corosync/pull/515]
|
|
||||||
|
|
||||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
|
||||||
---
|
|
||||||
configure.ac | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index ac513e93..240cfed4 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -459,8 +459,8 @@ if test "x${enable_testagents}" = xyes; then
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x${enable_rdma}" = xyes; then
|
|
||||||
- PKG_CHECK_MODULES([rdmacm],[rdmacm])
|
|
||||||
- PKG_CHECK_MODULES([ibverbs],[ibverbs])
|
|
||||||
+ PKG_CHECK_MODULES([rdmacm],[librdmacm])
|
|
||||||
+ PKG_CHECK_MODULES([ibverbs],[libibverbs])
|
|
||||||
AC_DEFINE_UNQUOTED([HAVE_RDMA], 1, [have rdmacm])
|
|
||||||
PACKAGE_FEATURES="$PACKAGE_FEATURES rdma"
|
|
||||||
WITH_LIST="$WITH_LIST --with rdma"
|
|
||||||
--
|
|
||||||
2.20.1
|
|
||||||
|
|
|
@ -7,20 +7,16 @@ SECTION = "base"
|
||||||
|
|
||||||
inherit autotools pkgconfig systemd useradd
|
inherit autotools pkgconfig systemd useradd
|
||||||
|
|
||||||
SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \
|
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \
|
||||||
file://corosync.conf \
|
file://corosync.conf \
|
||||||
file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \
|
|
||||||
"
|
"
|
||||||
|
SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded"
|
||||||
SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd"
|
|
||||||
SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f"
|
|
||||||
|
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)"
|
||||||
|
|
||||||
LICENSE = "BSD-3-Clause"
|
LICENSE = "BSD-3-Clause"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
|
LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d"
|
||||||
|
|
||||||
DEPENDS = "groff-native nss libqb"
|
DEPENDS = "groff-native nss libqb kronosnet"
|
||||||
|
|
||||||
SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \
|
SYSTEMD_SERVICE_${PN} = "corosync.service corosync-notifyd.service \
|
||||||
${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \
|
${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \
|
||||||
|
@ -31,23 +27,20 @@ SYSTEMD_AUTO_ENABLE = "disable"
|
||||||
INITSCRIPT_NAME = "corosync-daemon"
|
INITSCRIPT_NAME = "corosync-daemon"
|
||||||
|
|
||||||
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
||||||
dbus qdevice qnetd snmp \
|
dbus snmp \
|
||||||
"
|
"
|
||||||
|
|
||||||
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
|
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
|
||||||
PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
|
|
||||||
PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
|
|
||||||
PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,rdma-core"
|
|
||||||
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
|
PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
|
||||||
PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
|
PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
|
||||||
|
|
||||||
EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no"
|
EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash ap_cv_cc_pie=no"
|
||||||
EXTRA_OEMAKE = "tmpfilesdir_DATA="
|
EXTRA_OEMAKE = "tmpfilesdir_DATA="
|
||||||
|
|
||||||
do_configure_prepend() {
|
#do_configure_prepend() {
|
||||||
( cd ${S}
|
# ( cd ${S}
|
||||||
${S}/autogen.sh )
|
# ${S}/autogen.sh )
|
||||||
}
|
#}
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example
|
install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example
|
Loading…
Reference in New Issue
Block a user