diff options
| author |   Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2021-11-02 19:51:37 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-11-02 13:29:11 -0700 |
| commit | e2a348255d0e03e0a36329426dc7639d768aef5f (patch) | |
| tree | 40154e3ba4559202ff6dc42d942bfde04f96638d | |
| parent | e6464f0871c82a7935c3e645aa15f56baad28d22 (diff) | |
| download | meta-openembedded-contrib-e2a348255d0e03e0a36329426dc7639d768aef5f.tar.gz | |
corosync: Clean up leftover support for qdevice and qnetd
These features were removed in commit 5c051f84 (corosync: Update to
3.0.3), but some code still remained.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-extended/corosync/corosync_3.0.3.bb | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb index 909296197c..016441be5c 100644 --- a/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb +++ b/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://corosync.github.io/corosync/" SECTION = "base" -inherit autotools pkgconfig systemd useradd +inherit autotools pkgconfig systemd SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://corosync.conf \ @@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" DEPENDS = "groff-native nss libqb kronosnet" -SYSTEMD_SERVICE:${PN} = "corosync.service corosync-notifyd.service \ - ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'corosync-qnetd.service', '', d)} \ -" +SYSTEMD_SERVICE:${PN} = "corosync.service corosync-notifyd.service" SYSTEMD_AUTO_ENABLE = "disable" INITSCRIPT_NAME = "corosync-daemon" @@ -43,7 +40,7 @@ EXTRA_OEMAKE = "tmpfilesdir_DATA=" #} 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 install -d ${D}${sysconfdir}/sysconfig/ install -m 0644 ${S}/init/corosync.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync install -m 0644 ${S}/tools/corosync-notifyd.sysconfig.example ${D}${sysconfdir}/sysconfig/corosync-notifyd @@ -53,11 +50,6 @@ do_install:append() { install -d ${D}${sysconfdir}/default/volatiles echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync - if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then - chown -R coroqnetd:coroqnetd ${D}${sysconfdir}/${BPN}/qnetd - echo "d coroqnetd coroqnetd 0770 /var/run/corosync-qnetd none" >> ${D}${sysconfdir}/default/volatiles/05_corosync - fi - if [ ${@bb.utils.filter('DISTRO_FEATURES','systemd',d)} ]; then install -d ${D}${sysconfdir}/tmpfiles.d echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf @@ -68,7 +60,3 @@ RDEPENDS:${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sys FILES:${PN}-dbg += "${libexecdir}/lcrso/.debug" FILES:${PN}-doc += "${datadir}/snmp/mibs/COROSYNC-MIB.txt" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system coroqnetd" -USERADD_PARAM:${PN} = "--system -d / -M -s /bin/nologin -c 'User for corosync-qnetd' -g coroqnetd coroqnetd" |