diff options
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-extended')
8 files changed, 159 insertions, 173 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf index 6aef9de9..744a30ff 100644 --- a/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf +++ b/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf @@ -1,58 +1,61 @@ -# Starting point for cluster with pacemaker/openais -compatibility: none - -corosync { - user: root - group: root -} - -aisexec { - with Pacemaker - user: root - group: root -} - -service { - name: pacemaker - ver: 1 -} - +# Please read the corosync.conf.5 manual page totem { version: 2 - secauth: off - threads: 0 - interface { - ringnumber: 0 - # Cluster network address - bindnetaddr: 192.168.10.0 - # Should be fine in most cases, don't forget to allow - # packets for this address/port in netfilter if there - # is restrictive policy set for cluster network - mcastaddr: 226.94.1.1 - mcastport: 5405 - } + + # Set name of the cluster + cluster_name: testCluster + + # crypto_cipher and crypto_hash: Used for mutual node authentication. + # If you choose to enable this, then do remember to create a shared + # secret with "corosync-keygen". + # enabling crypto_cipher, requires also enabling of crypto_hash. + # crypto works only with knet transport + crypto_cipher: none + crypto_hash: none } logging { + # Log the source file and line where messages are being + # generated. When in doubt, leave off. Potentially useful for + # debugging. fileline: off - to_stderr: no + # Log to standard error. When in doubt, set to yes. Useful when + # running in the foreground (when invoking "corosync -f") + to_stderr: yes + # Log to a log file. When set to "no", the "logfile" option + # must not be set. to_logfile: yes - to_syslog: yes logfile: /var/log/cluster/corosync.log + # Log to the system log daemon. When in doubt, set to yes. + to_syslog: yes + # Log debug messages (very verbose). When in doubt, leave off. debug: off - timestamp: on + # Log messages with time stamps. When in doubt, set to hires (or on) + #timestamp: hires logger_subsys { - subsys: AMF + subsys: QUORUM debug: off } } -amf { - mode: disabled -} - quorum { - # Quorum for the Pacemaker Cluster Resource Manager + # Enable and configure quorum subsystem (default: off) + # see also corosync.conf.5 and votequorum.5 provider: corosync_votequorum - expected_votes: 1 +} + +nodelist { + # Change/uncomment/add node sections to match cluster configuration + + node { + # Hostname of the node + name: node1 + # Cluster membership node identifier + nodeid: 1 + # Address of first link + ring0_addr: 127.0.0.1 + # When knet transport is used it's possible to define up to 8 links + #ring1_addr: 192.168.1.1 + } + # ... } diff --git a/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb index 23a3d147..c0531d38 100644 --- a/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb +++ b/external/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb @@ -7,19 +7,16 @@ SECTION = "base" 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 \ " - -SRC_URI[md5sum] = "69db29ff4bc035936946be44fc8be5cd" -SRC_URI[sha256sum] = "9bd4707bb271df16f8d543ec782eb4c35ec0330b7be696b797da4bd8f058a25d" - +SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" 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 \ ${@bb.utils.contains('PACKAGECONFIG', 'qdevice', 'corosync-qdevice.service', '', d)} \ @@ -30,23 +27,20 @@ SYSTEMD_AUTO_ENABLE = "disable" INITSCRIPT_NAME = "corosync-daemon" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - dbus qdevice qnetd snmp \ + dbus 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_configure_prepend() { +# ( cd ${S} +# ${S}/autogen.sh ) +#} do_install_append() { install -D -m 0644 ${WORKDIR}/corosync.conf ${D}/${sysconfdir}/corosync/corosync.conf.example diff --git a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch index 0a2f31d5..f56359a4 100644 --- a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch +++ b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch @@ -1,12 +1,12 @@ -From 9107f3bd68aef6ae456a3cad664223b4f3d00131 Mon Sep 17 00:00:00 2001 +From ad207a6f83dac390b2d95e3a8262d27292921863 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 17:04:39 +0800 +Date: Wed, 26 Jun 2019 11:49:33 +0800 Subject: [PATCH] dlm: fix compile error since xml2-config should not be used xml2-config is disabled, so change Makefile to use pkgconfig to find libxml2. -Upstream-Status: Inappropriate +Upstream-Status: Inappropriate [oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> --- @@ -14,21 +14,21 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/Makefile b/fence/Makefile -index 77bf0fd..cca0b2c 100644 +index b927879..6e16078 100644 --- a/fence/Makefile +++ b/fence/Makefile -@@ -30,11 +30,11 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - -fdiagnostics-show-option \ +@@ -18,11 +18,11 @@ CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ + -fstack-clash-protection -Wl,-z,now - BIN_CFLAGS += -fPIE -DPIE --BIN_CFLAGS += `xml2-config --cflags` -+BIN_CFLAGS += `pkg-config libxml-2.0 --cflags` - BIN_CFLAGS += -I../include + CFLAGS += -fPIE -DPIE +-CFLAGS += `xml2-config --cflags` ++CFLAGS += `pkg-config libxml-2.0 --cflags` + CFLAGS += -I../include - BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie --BIN_LDFLAGS += `xml2-config --libs` -+BIN_LDFLAGS += `pkg-config libxml-2.0 --libs` - BIN_LDFLAGS += -ldl + LDFLAGS += -Wl,-z,relro -pie +-LDFLAGS += `xml2-config --libs` ++LDFLAGS += `pkg-config libxml-2.0 --libs` + LDFLAGS += -ldl all: $(BIN_TARGET) -- diff --git a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch deleted file mode 100644 index 3e384f7d..00000000 --- a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1fb68433bde97d571fc781b52c9521b17fbb8df0 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 17:42:43 +0800 -Subject: [PATCH] dlm: fix package qa error - -pass LDFLAG to makefile to fix below error: -do_package_qa: QA Issue: No GNU_HASH in the elf binary: -/packages-split/dlm/usr/sbin/dlm_stonith' [ldflags] - -Upstream-Status: Inappropriate[oe-specific] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - fence/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fence/Makefile b/fence/Makefile -index cca0b2c..2b3963c 100644 ---- a/fence/Makefile -+++ b/fence/Makefile -@@ -33,7 +33,7 @@ BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += `pkg-config libxml-2.0 --cflags` - BIN_CFLAGS += -I../include - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += `pkg-config libxml-2.0 --libs` - BIN_LDFLAGS += -ldl - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch new file mode 100644 index 00000000..e6a37579 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch @@ -0,0 +1,51 @@ +From 2f72f9271b8dd61ca5092e025b0f8243c6fd68f2 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Mar 2020 12:38:19 -0800 +Subject: [PATCH] make: Replace cp -a with mode preserving options + +Helps fix permissions in staging area + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + dlm_controld/Makefile | 4 ++-- + libdlm/Makefile | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile +index 6081cf8..fe71be2 100644 +--- a/dlm_controld/Makefile ++++ b/dlm_controld/Makefile +@@ -88,8 +88,8 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 755 $(BIN_TARGET) $(DESTDIR)/$(BINDIR) + $(INSTALL) -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 libdlmcontrol.h $(DESTDIR)/$(HDRDIR) + $(INSTALL) -m 644 dlm_controld.8 $(DESTDIR)/$(MANDIR)/man8/ +diff --git a/libdlm/Makefile b/libdlm/Makefile +index ab32761..8820bf8 100644 +--- a/libdlm/Makefile ++++ b/libdlm/Makefile +@@ -125,10 +125,10 @@ install: all + $(INSTALL) -d $(DESTDIR)/$(UDEVDIR) + $(INSTALL) -c -m 755 $(LIB_TARGET) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -c -m 755 $(LLT_TARGET) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SO) $(DESTDIR)/$(LIBDIR) +- cp -a $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LIB_SMAJOR) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SO) $(DESTDIR)/$(LIBDIR) ++ cp -R --no-dereference --preserve=mode,links $(LLT_SMAJOR) $(DESTDIR)/$(LIBDIR) + $(INSTALL) -m 644 $(LIB_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -m 644 $(LLT_PC) $(DESTDIR)/$(PKGDIR) + $(INSTALL) -c -m 644 $(HDR_TARGET) $(DESTDIR)/$(HDRDIR) +-- +2.25.1 + diff --git a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch deleted file mode 100644 index 6f01b217..00000000 --- a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/respect-ldflags-also-from-bin_ldflags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 34a9182814ae565d6f430f85cfe80c05fa9f2dda Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 24 Jul 2018 17:55:32 +0800 -Subject: [PATCH] respect-ldflags-also-from-bin_ldflags - -Upstream-Status: Inappropriate[oe-specific] - -update original patch to version 4.0.7 - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - dlm_controld/Makefile | 4 ++-- - dlm_tool/Makefile | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dlm_controld/Makefile b/dlm_controld/Makefile -index cf556c9..3381730 100644 ---- a/dlm_controld/Makefile -+++ b/dlm_controld/Makefile -@@ -55,11 +55,11 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -lpthread -lrt -lcpg -lcmap -lcfg -lquorum - - LIB_CFLAGS += $(BIN_CFLAGS) --LIB_LDFLAGS += -Wl,-z,relro -pie -+LIB_LDFLAGS += $(LDFLAGS) -Wl,-z,relro -pie - - ifeq ($(USE_SD_NOTIFY),yes) - BIN_CFLAGS += $(shell pkg-config --cflags libsystemd) \ -diff --git a/dlm_tool/Makefile b/dlm_tool/Makefile -index c16d8f5..a48a26f 100644 ---- a/dlm_tool/Makefile -+++ b/dlm_tool/Makefile -@@ -32,7 +32,7 @@ BIN_CFLAGS += -D_GNU_SOURCE -O2 -ggdb \ - BIN_CFLAGS += -fPIE -DPIE - BIN_CFLAGS += -I../include -I../libdlm -I../dlm_controld - --BIN_LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie -+BIN_LDFLAGS += $(LDFLAGS) -Wl,-z,now -Wl,-z,relro -pie - BIN_LDFLAGS += -L../libdlm -L../dlm_controld - BIN_LDFLAGS += -lpthread -ldlm -ldlmcontrol - --- -2.7.4 - diff --git a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index 027864a1..577db708 100644 --- a/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.7.bb +++ b/external/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -5,15 +5,14 @@ HOMEPAGE = "https://fedorahosted.org/cluster/wiki/HomePage" REQUIRED_DISTRO_FEATURES = "systemd" -SRC_URI = "https://releases.pagure.org/dlm/${BP}.tar.gz \ - file://respect-ldflags-also-from-bin_ldflags.patch \ +SRC_URI = "https://pagure.io/dlm/archive/dlm-${PV}/dlm-dlm-${PV}.tar.gz \ file://0001-dlm-fix-compile-error-since-xml2-config-should-not-b.patch \ - file://0001-dlm-fix-package-qa-error.patch \ file://0001-Include-sys-sysmacros.h-for-major-minor-macros-in-gl.patch \ + file://0001-make-Replace-cp-a-with-mode-preserving-options.patch \ " -SRC_URI[md5sum] = "aa604a10d5ac2d3414eb89ec6984cd12" -SRC_URI[sha256sum] = "639ddfc82369272a68d56816689736c00b8f1b6b2869a6b66b7dbf6dad86469a" +SRC_URI[md5sum] = "4c57a941a15547859cd38fd55f66388e" +SRC_URI[sha256sum] = "d59142e067cbd603aaf66151a04e9fa34330219680b8827c953d20821b951991" UPSTREAM_CHECK_URI = "https://pagure.io/dlm/releases" UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)" @@ -21,9 +20,11 @@ UPSTREAM_CHECK_REGEX = "dlm-(?P<pver>\d+(\.\d+)+)" LICENSE = "LGPLv2+ & GPLv2 & GPLv2+" LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" -DEPENDS = "corosync systemd" +S = "${WORKDIR}/dlm-dlm-${PV}" -inherit pkgconfig systemd distro_features_check +DEPENDS += "corosync" + +inherit pkgconfig systemd features_check PACKAGECONFIG ??= "" @@ -36,29 +37,24 @@ 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_prepend_toolchain-clang() { + sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile } -do_compile () { +do_compile() { + sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile + sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile oe_runmake 'CC=${CC}' } -do_install_append (){ - install -d ${D}${sysconfdir}/sysconfig/ - install -d ${D}${sysconfdir}/init.d/ - install -m 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm - install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm +do_install() { + oe_runmake install DESTDIR=${D} LIBDIR=${libdir} + install -Dm 0644 ${S}/init/dlm.sysconfig ${D}${sysconfdir}/sysconfig/dlm + install -Dm 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm # install systemd unit files if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system + install -Dm 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system/dlm.service fi } -do_install() { - oe_runmake install DESTDIR=${D} LIBDIR=${libdir} -} - diff --git a/external/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/external/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb new file mode 100644 index 00000000..6bf268da --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb @@ -0,0 +1,23 @@ +# Copyright (C) 2020 Khem Raj <raj.khem@gmail.com> +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = " Kronosnet, often referred to as knet, is a network abstraction layer designed for High Availability use cases, where redundancy, security, fault tolerance and fast fail-over are the core requirements of your application." +HOMEPAGE = "https://kronosnet.org/" +LICENSE = "GPL-2.0+ & LGPL-2.1" +LIC_FILES_CHKSUM = "file://COPYING.applications;md5=751419260aa954499f7abaabaa882bbe \ + file://COPYING.libraries;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "libs" +DEPENDS = "doxygen-native libqb-native libxml2-native bzip2 libqb libxml2 libnl lksctp-tools lz4 lzo openssl nss xz zlib zstd" + +SRCREV = "0ba5985c3ddec8429b989f0e7bd3324f53e0a9b0" +SRC_URI = "git://github.com/kronosnet/kronosnet;protocol=https;branch=stable1" + +inherit autotools + +S = "${WORKDIR}/git" + +# libknet/transport_udp.c:326:48: error: comparison of integers of different signs: 'unsigned long' and 'int' [-Werror,-Wsign-compare] +# for (cmsg = CMSG_FIRSTHDR(&msg);cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { +# ^~~~~~~~~~~~~~~~~~~~~~~ +CFLAGS_append_toolchain-clang = " -Wno-sign-compare" + |