diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /meta-openembedded/meta-networking/recipes-extended | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-extended')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf | 85 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb (renamed from meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb) | 23 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch | 51 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb | 24 | ||||
-rw-r--r-- | meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb | 23 |
7 files changed, 134 insertions, 136 deletions
diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch deleted file mode 100644 index bdc7645ce..000000000 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch +++ /dev/null @@ -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 - diff --git a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf index 6aef9de95..744a30ff5 100644 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync/corosync.conf +++ b/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/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb index eefbcca8a..c0531d386 100644 --- a/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_2.4.5.bb +++ b/meta-openembedded/meta-networking/recipes-extended/corosync/corosync_3.0.3.bb @@ -7,20 +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 \ - file://0001-configure.ac-fix-pkgconfig-issue-of-rdma.patch \ " - -SRC_URI[md5sum] = "e36a056b893c313c4ec1fe0d7e6cdebd" -SRC_URI[sha256sum] = "ab6eafdb8f43a23794fc15d4c5198bbd6759060cb13c8d2d1e78a6c8360aba5f" - +SRC_URI[sha256sum] = "20eb903eb984f6a728282c199825e442e8bba869acefd22390076ef3a33a4ded" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+\.(?!99)\d+(\.\d+)+)" 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)} \ @@ -31,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,rdma-core" 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/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-dlm-fix-package-qa-error.patch deleted file mode 100644 index 3e384f7d9..000000000 --- a/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/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm/0001-make-Replace-cp-a-with-mode-preserving-options.patch new file mode 100644 index 000000000..e6a37579e --- /dev/null +++ b/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/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb index 4bf9944aa..577db7087 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.0.9.bb @@ -8,6 +8,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" 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-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] = "4c57a941a15547859cd38fd55f66388e" @@ -21,7 +22,7 @@ LIC_FILES_CHKSUM = "file://README.license;md5=8f0bbcdd678df1bce9863492b6c8832d" S = "${WORKDIR}/dlm-dlm-${PV}" -DEPENDS = "corosync systemd" +DEPENDS += "corosync" inherit pkgconfig systemd features_check @@ -40,29 +41,20 @@ do_compile_prepend_toolchain-clang() { sed -i -e "s/-fstack-clash-protection//g" ${S}/*/Makefile } -do_compile_prepend() { +do_compile() { sed -i "s/libsystemd-daemon/libsystemd/g" ${S}/dlm_controld/Makefile sed -i -e "s/ ${DONTBUILD}//g" ${S}/Makefile -} - -do_compile () { 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/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb b/meta-openembedded/meta-networking/recipes-extended/kronosnet/kronosnet_1.15.bb new file mode 100644 index 000000000..6bf268da9 --- /dev/null +++ b/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" + |