From 4f3289fe4d5de73be7113110b4efc903a3c69e28 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 7 Nov 2017 13:22:03 +0800 Subject: corosync: 2.4.2 -> 2.4.3 Upgrade corosync from 2.4.2 to 2.4.3. * remove patch which is merged by upstream * remove gcc option '-fpie' by append configure cache value 'ap_cv_cc_pie=no' to fix TEXTREL QA issue for linker gold * disable autostart of corosync. It only works after configured and config file /etc/corosync/corosync.conf exists. * use bb.utils.filter * corosync init script requires command pidof. But pidof from busybox doesn't work well to filter the calling process itself, so update runtime dependency Signed-off-by: Kai Kang Signed-off-by: Armin Kuster Signed-off-by: Joe MacDonald --- ...001-Include-fcntl.h-for-F_-and-O_-defines.patch | 28 -------- .../recipes-extended/corosync/corosync_2.4.2.bb | 80 ---------------------- .../recipes-extended/corosync/corosync_2.4.3.bb | 79 +++++++++++++++++++++ 3 files changed, 79 insertions(+), 108 deletions(-) delete mode 100644 meta-networking/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch delete mode 100644 meta-networking/recipes-extended/corosync/corosync_2.4.2.bb create mode 100644 meta-networking/recipes-extended/corosync/corosync_2.4.3.bb (limited to 'meta-networking/recipes-extended') diff --git a/meta-networking/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch b/meta-networking/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch deleted file mode 100644 index fe4b0793fe..0000000000 --- a/meta-networking/recipes-extended/corosync/corosync/0001-Include-fcntl.h-for-F_-and-O_-defines.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 85ea47fedbc96ed9180e08b0d371d9966e3a88da Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 30 Aug 2017 17:28:55 -0700 -Subject: [PATCH] Include fcntl.h for F_* and O_* defines - -Fixes errors like -utils.c:95:22: error: use of undeclared identifier 'O_WRONLY' - -Signed-off-by: Khem Raj ---- - qdevices/utils.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qdevices/utils.c b/qdevices/utils.c -index 41850b8c..87090853 100644 ---- a/qdevices/utils.c -+++ b/qdevices/utils.c -@@ -39,6 +39,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.14.1 - diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb deleted file mode 100644 index 33e74e2ff8..0000000000 --- a/meta-networking/recipes-extended/corosync/corosync_2.4.2.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" -DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ -APIs and libraries, default configuration files, and an init script." -HOMEPAGE = "http://corosync.github.io/corosync/" - -SECTION = "base" - -inherit autotools pkgconfig systemd useradd - -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ - file://0001-Include-fcntl.h-for-F_-and-O_-defines.patch \ - " -SRC_URI[md5sum] = "547fa78704da53aa35912be58d31035f" -SRC_URI[sha256sum] = "f26e3011309fe4bcce94b1dc20ea8c462f19483a73f3ca62f13b925d011a4ba9" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" - -DEPENDS = "groff-native nss libqb" - -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_AUTO_ENABLE = "enable" - -INITSCRIPT_NAME = "corosync-daemon" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus qdevice qnetd snmp \ -" - -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" -PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd" - -EXTRA_OECONF = "ac_cv_path_BASHPATH=${base_bindir}/bash" -EXTRA_OEMAKE = "tmpfilesdir_DATA=" - -do_configure_prepend() { - ( cd ${S} - ${S}/autogen.sh ) -} - -do_install_append() { - 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 - - rm -rf "${D}${localstatedir}/run" - - install -d ${D}${sysconfdir}/default/volatiles - echo "d root root 0755 ${localstatedir}/log/cluster none" > ${D}${sysconfdir}/default/volatiles/05_corosync - - if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', 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.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/tmpfiles.d - echo "d ${localstatedir}/log/cluster - - - -" > ${D}${sysconfdir}/tmpfiles.d/corosync.conf - - if ${@bb.utils.contains('PACKAGECONFIG', 'qnetd', 'true', 'false', d)}; then - install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d - fi - fi -} - -RDEPENDS_${PN} += "bash" - -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" diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb new file mode 100644 index 0000000000..9673fa362e --- /dev/null +++ b/meta-networking/recipes-extended/corosync/corosync_2.4.3.bb @@ -0,0 +1,79 @@ +SUMMARY = "The Corosync Cluster Engine and Application Programming Interfaces" +DESCRIPTION = "This package contains the Corosync Cluster Engine Executive, several default \ +APIs and libraries, default configuration files, and an init script." +HOMEPAGE = "http://corosync.github.io/corosync/" + +SECTION = "base" + +inherit autotools pkgconfig systemd useradd + +SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" + +SRC_URI[md5sum] = "bf0ede13018aadc8a046183bc593b0e0" +SRC_URI[sha256sum] = "b1e7e422e8d2f7af8e5315fa329b1dbd1175fff32efaa55e8054584c80a2c597" + +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" + +DEPENDS = "groff-native nss libqb" + +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_AUTO_ENABLE = "disable" + +INITSCRIPT_NAME = "corosync-daemon" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ + dbus qdevice qnetd snmp \ +" + +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" +PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp" +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_OEMAKE = "tmpfilesdir_DATA=" + +do_configure_prepend() { + ( cd ${S} + ${S}/autogen.sh ) +} + +do_install_append() { + 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 + + rm -rf "${D}${localstatedir}/run" + + 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 + + if [ ${@bb.utils.filter('PACKAGECONFIG', 'qnetd', d)} ]; then + install -m 0644 ${S}/conf/tmpfiles.d/corosync-qnetd.conf ${D}${sysconfdir}/tmpfiles.d + fi + fi +} + +RDEPENDS_${PN} += "bash ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit-pidof', 'procps', d)}" + +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" -- cgit v1.2.3-54-g00ecf