diff options
Diffstat (limited to 'meta-cgl-common/recipes-cgl')
23 files changed, 431 insertions, 219 deletions
diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb index d9df83b..e3aac57 100644 --- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb @@ -3,7 +3,7 @@ the Heartbeat/Pacemaker cluster stack. In essence, Glue is everything that \ is not the cluster messaging layer (Heartbeat), nor the cluster resource manager \ (Pacemaker), nor a Resource Agent." HOMEPAGE = "http://clusterlabs.org/" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b70d30a00a451e19d7449d7465d02601 \ file://COPYING.LIB;md5=c386bfabdebabbdc1f28e9fde4f4df6d \ " @@ -11,20 +11,22 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b70d30a00a451e19d7449d7465d02601 \ DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux net-snmp openhpi" SRC_URI = " \ - git://github.com/ClusterLabs/${BPN}.git \ + git://github.com/ClusterLabs/${BPN}.git;branch=master;protocol=https \ file://0001-don-t-compile-doc-and-Error-Fix.patch \ file://0001-ribcl.py.in-Warning-Fix.patch \ file://0001-Update-for-python3.patch \ file://volatiles \ file://tmpfiles \ " -SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch" +SRC_URI:append_libc-uclibc = " file://kill-stack-protector.patch" SRCREV = "fd5a3befacd23d056a72cacd2b8ad6bba498e56b" +UPSTREAM_CHECK_GITTAGREGEX = "glue-(?P<pver>\d+(\.\d+)+)" + inherit autotools useradd pkgconfig systemd multilib_script multilib_header -SYSTEMD_SERVICE_${PN} = "logd.service" +SYSTEMD_SERVICE:${PN} = "logd.service" SYSTEMD_AUTO_ENABLE = "disable" HA_USER = "hacluster" @@ -42,21 +44,23 @@ EXTRA_OECONF = "--with-daemon-user=${HA_USER} \ --with-ocf-root=${libdir}/ocf \ " -CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0" +CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0 \ + ac_cv_path_SSH=ssh \ +" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \ +USERADD_PARAM:${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \ -g ${HA_GROUP} -r -s ${sbindir}/nologin -c 'cluster user' ${HA_USER} \ " -GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}" +GROUPADD_PARAM:${PN} = "-r ${HA_GROUP}" MULTILIB_SCRIPTS = "${PN}:${sbindir}/cibsecret" -do_configure_prepend() { +do_configure:prepend() { ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue install -d ${D}${sysconfdir}/tmpfiles.d @@ -65,7 +69,7 @@ do_install_append() { oe_multilib_header heartbeat/glue_config.h } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create @@ -97,7 +101,7 @@ PACKAGES =+ "\ ${PN}-plugin-compress-staticdev \ " -FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\ +FILES:${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\ ${libdir}/heartbeat/transient-test.sh \ ${libdir}/heartbeat/logtest \ ${libdir}/heartbeat/ipctransientserver \ @@ -109,40 +113,40 @@ FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/clus ${systemd_unitdir} \ " -FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/ \ +FILES:${PN}-dbg += "${libdir}/heartbeat/.debug/ \ ${sbindir}/.debug/ \ ${libdir}/.debug/ \ " -FILES_${PN}-plugin-compress = "${libdir}/heartbeat/plugins/compress/*.so" -FILES_${PN}-plugin-compress-staticdev = "${libdir}/heartbeat/plugins/compress/*.*a" -FILES_${PN}-plugin-compress-dbg = "${libdir}/heartbeat/plugins/compress/.debug/" +FILES:${PN}-plugin-compress = "${libdir}/heartbeat/plugins/compress/*.so" +FILES:${PN}-plugin-compress-staticdev = "${libdir}/heartbeat/plugins/compress/*.*a" +FILES:${PN}-plugin-compress-dbg = "${libdir}/heartbeat/plugins/compress/.debug/" -FILES_${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so" -FILES_${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a" -FILES_${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/" -FILES_${PN}-plugin-stonith2 = " \ +FILES:${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so" +FILES:${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a" +FILES:${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/" +FILES:${PN}-plugin-stonith2 = " \ ${libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper \ ${libdir}/stonith/plugins/stonith2/*.so \ " -FILES_${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py" +FILES:${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py" -FILES_${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/" -FILES_${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a" +FILES:${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/" +FILES:${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a" -FILES_${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/" -FILES_${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so" -FILES_${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a" -FILES_${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/" +FILES:${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/" +FILES:${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so" +FILES:${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a" +FILES:${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/" -FILES_${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so" -FILES_${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a" -FILES_${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/" +FILES:${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so" +FILES:${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a" +FILES:${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/" -FILES_${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/" +FILES:${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/" -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-plugin-stonith2 += "bash" -RDEPENDS_${PN}-plugin-stonith-external += "bash python3-core perl" -RDEPENDS_${PN}-plugin-stonith2-ribcl += "python3-core" -RDEPENDS_${PN}-lrmtest += "${VIRTUAL-RUNTIME_getopt} ${PN}-plugin-raexec" +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-plugin-stonith2 += "bash" +RDEPENDS:${PN}-plugin-stonith-external += "bash python3-core perl" +RDEPENDS:${PN}-plugin-stonith2-ribcl += "python3-core" +RDEPENDS:${PN}-lrmtest += "${VIRTUAL-RUNTIME_getopt} ${PN}-plugin-raexec" diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-set-correct-path-of-rm-command.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-set-correct-path-of-rm-command.patch new file mode 100644 index 0000000..d53faea --- /dev/null +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-set-correct-path-of-rm-command.patch @@ -0,0 +1,28 @@ +From d34c5d8611d084db9cb7169e3628f3f752618cc7 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Sun, 2 Oct 2022 21:08:34 +0800 +Subject: [PATCH] ldirectord.service.in: set correct path of rm command + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + ldirectord/systemd/ldirectord.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in +index 7965b79fb..bb476cf5d 100644 +--- a/ldirectord/systemd/ldirectord.service.in ++++ b/ldirectord/systemd/ldirectord.service.in +@@ -6,7 +6,7 @@ Documentation=man:ldirectord(8) + ExecStart=@sbindir@/ldirectord start + ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord + ExecStop=@sbindir@/ldirectord stop +-ExecStopPost=@RM@ -f /var/lock/subsys/ldirectord ++ExecStopPost=/bin/rm -f /var/lock/subsys/ldirectord + ExecReload=@sbindir@/ldirectord reload + PIDFile=/run/ldirectord.ldirectord.pid + Type=forking +-- +2.25.1 + diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-use-run-instead-of-var-run.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-use-run-instead-of-var-run.patch new file mode 100644 index 0000000..0045cee --- /dev/null +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/0001-ldirectord.service.in-use-run-instead-of-var-run.patch @@ -0,0 +1,31 @@ +From c739aa4fda8bae8e0aa7ed6af29c16392eb13a86 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Fri, 16 Oct 2020 16:24:24 +0800 +Subject: [PATCH] ldirectord.service.in: use /run instead of /var/run + +/var/run has been deprecated by systemd, so use /run instead, +as suggested by systemd. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + ldirectord/systemd/ldirectord.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ldirectord/systemd/ldirectord.service.in b/ldirectord/systemd/ldirectord.service.in +index 191f62af..7965b79f 100644 +--- a/ldirectord/systemd/ldirectord.service.in ++++ b/ldirectord/systemd/ldirectord.service.in +@@ -8,7 +8,7 @@ ExecStartPost=/usr/bin/touch /var/lock/subsys/ldirectord + ExecStop=@sbindir@/ldirectord stop + ExecStopPost=@RM@ -f /var/lock/subsys/ldirectord + ExecReload=@sbindir@/ldirectord reload +-PIDFile=/var/run/ldirectord.ldirectord.pid ++PIDFile=/run/ldirectord.ldirectord.pid + Type=forking + KillMode=none + +-- +2.17.1 + diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch new file mode 100644 index 0000000..dd3e1d1 --- /dev/null +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/autoconf-2.73.patch @@ -0,0 +1,31 @@ +From 749d10d4c61a84d8ba506f178daededac8062c3f Mon Sep 17 00:00:00 2001 +From: Lei Maohui <leimaohui@fujitsu.com> +Date: Wed, 16 Aug 2023 02:43:08 +0000 +Subject: [PATCH] autoconf-2.7: + +To fix build error with autoconf-2.7: + +| configure: error: in '/home/aarch64-test/tmp/work/aarch64-ubinux-linux/resource-agents/4.5.0-r0/build': +| configure: error: C preprocessor "aarch64-ubinux-linux-gcc -E --sysroot=/home/aarch64-test/tmp/work/aarch64-ubinux-linux/resource-agents/4.5.0-r0/recipe-sysroot -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security" fails sanity check + +Upstream-Status: Inappropriate +Signed-off-by: Lei Maohui <leimaohui@fujitsu.com> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d682ad7..84444a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -883,7 +883,6 @@ else + -Wno-strict-aliasing + -Wpointer-arith + -Wstrict-prototypes +- -Wunsigned-char + -Wwrite-strings" + + # Additional warnings it might be nice to enable one day +-- +2.34.1 + diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb index d34d706..a1b6624 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb @@ -4,25 +4,30 @@ to operate in a High Availability environment for both Pacemaker and \ rgmanager service managers." HOMEPAGE = "http://sources.redhat.com/cluster/wiki/" -LICENSE = "GPLv2+ & LGPLv2+ & GPLv3" -LICENSE_${PN} = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-dev = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-staticdev = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-dbg = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-doc = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-extra = "GPLv3" -LICENSE_${PN}-extra-dbg = "GPLv3" -LICENSE_ldirectord = "GPLv2+" - -SRC_URI = "git://github.com/ClusterLabs/resource-agents \ +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-only" +LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-dev = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-staticdev = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-dbg = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-doc = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-extra = "GPL-3.0-only" +LICENSE:${PN}-extra-dbg = "GPL-3.0-only" +LICENSE:ldirectord = "GPL-2.0-or-later" + +SRC_URI = "git://github.com/ClusterLabs/resource-agents;branch=main;protocol=https \ file://01-disable-doc-build.patch \ file://02-set-OCF_ROOT_DIR-to-libdir-ocf.patch \ file://03-fix-header-defs-lookup.patch \ file://fix-install-sh-not-found.patch \ + file://0001-ldirectord.service.in-use-run-instead-of-var-run.patch \ + file://0001-ldirectord.service.in-set-correct-path-of-rm-command.patch \ + file://autoconf-2.73.patch \ " SRCREV = "fee181320547365d7f8c88cca2b32801412b933d" +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" + S="${WORKDIR}/git" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ @@ -36,7 +41,7 @@ DEPENDS = "cluster-glue" # ip.sh requires: ethtool iproute2 iputils-arping # fs.sh requires: e2fsprogs-e2fsck util-linux quota # netfs.sh requires: procps util-linux nfs-utils -RDEPENDS_${PN} += "bash perl lvm2 \ +RDEPENDS:${PN} += "bash perl lvm2 \ ethtool iproute2 iputils-arping \ e2fsprogs-e2fsck util-linux quota \ procps nfs-utils \ @@ -49,36 +54,38 @@ CACHED_CONFIGUREVARS += " \ ac_cv_path_TEST=test \ ac_cv_path_BASH_SHELL=/bin/bash \ ac_cv_path_PYTHON="/usr/bin/env python3" \ + ac_cv_path_SSH="/usr/bin/ssh" \ " EXTRA_OECONF += "--disable-fatal-warnings \ --with-rsctmpdir=/var/run/heartbeat/rsctmp" -do_install_append() { - rm -rf "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" +do_install:append() { + rm -rf ${D}${localstatedir}/run + rm -rf ${D}${localstatedir} + sed -i 's,${TMPDIR},${bindir},g' ${D}${libdir}/ocf/lib/heartbeat/ocf-binaries } # tickle_tcp is published under GPLv3, we just split it into ${PN}-extra, # and it's required by portblock, so move portblock into ${PN}-extra together. -PACKAGES_prepend = "${PN}-extra ${PN}-extra-dbg ldirectord " +PACKAGES:prepend = "${PN}-extra ${PN}-extra-dbg ldirectord " NOAUTOPACKAGEDEBUG = "1" -FILES_${PN}-extra = "${libexecdir}/heartbeat/tickle_tcp \ +FILES:${PN}-extra = "${libexecdir}/heartbeat/tickle_tcp \ ${libdir}/ocf/resource.d/heartbeat/portblock \ ${datadir}/resource-agents/ocft/configs/portblock \ " -FILES_${PN}-extra-dbg = "${libexecdir}/heartbeat/.debug/tickle_tcp" +FILES:${PN}-extra-dbg = "${libexecdir}/heartbeat/.debug/tickle_tcp" -FILES_ldirectord = " \ +FILES:ldirectord = " \ ${sbindir}/ldirectord \ ${sysconfdir}/ha.d/resource.d/ldirectord \ ${sysconfdir}/init.d/ldirectord \ ${sysconfdir}/logrotate.d/ldirectord \ ${libdir}/ocf/resource.d/heartbeat/ldirectord \ " -FILES_ldirectord-doc = "${mandir}/man8/ldirectord.8*" +FILES:ldirectord-doc = "${mandir}/man8/ldirectord.8*" -RDEPENDS_ldirectord += " \ +RDEPENDS:ldirectord += " \ ipvsadm \ libdbi-perl \ libdigest-hmac-perl \ @@ -100,9 +107,9 @@ RDEPENDS_ldirectord += " \ " SYSTEMD_PACKAGES = "ldirectord" -SYSTEMD_SERVICE_ldirectord += "ldirectord.service" +SYSTEMD_SERVICE:ldirectord += "ldirectord.service" -FILES_${PN} += "${datadir}/cluster/* \ +FILES:${PN} += "${datadir}/cluster/* \ ${libdir}/ocf/resource.d/heartbeat/ \ ${libdir}/ocf/lib/heartbeat/* \ ${libdir}/ocf/resource.d/redhat \ @@ -110,6 +117,6 @@ FILES_${PN} += "${datadir}/cluster/* \ ${systemd_unitdir}/system \ " -FILES_${PN}-dbg += "${libdir}/ocf/resource.d/heartbeat/.debug \ +FILES:${PN}-dbg += "${libdir}/ocf/resource.d/heartbeat/.debug \ ${sbindir}/.debug \ ${libexecdir}/heartbeat/.debug " diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb index 34076d3..a6076cc 100644 --- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb +++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb @@ -10,16 +10,16 @@ SRC_URI = "https://releases.pagure.org/linux-cluster/cluster/${BP}.tar.xz \ SRC_URI[md5sum] = "300d83dbbc525c3da21c2e961271c84b" SRC_URI[sha256sum] = "4d340338c2376d369cb223469fa1a3356cce9ab5b2a0a0a33256ade2dbbe02d1" -LICENSE = "GPL-2.0 & LGPL-2.0" +LICENSE = "GPL-2.0-only & LGPL-2.0-only" LIC_FILES_CHKSUM = "file://doc/README.licence;md5=ee8ae43af5ea09f12ca7f7a649764cb0" PR = "r1" DEPENDS = "corosync dbus openldap libxml2 ncurses perl zlib" -FILES_${PN} += "/lib/udev/rules.d/51-dlm.rules \ +FILES:${PN} += "/lib/udev/rules.d/51-dlm.rules \ ${localstatedir}/run " -FILES_${PN}-doc += "/usr/share/man3/* /usr/share/man8/*" +FILES:${PN}-doc += "/usr/share/man3/* /usr/share/man8/*" do_configure () { CFLAGS="${TARGET_CFLAGS}" \ diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh/0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch b/meta-cgl-common/recipes-cgl/crmsh/crmsh/0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch new file mode 100644 index 0000000..62db8e8 --- /dev/null +++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh/0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch @@ -0,0 +1,52 @@ +From c1356d64086d2e3f9d113f346a14e6dff1c2acb0 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 26 Oct 2021 14:01:09 +0800 +Subject: [PATCH] orderedset.py: fix deprecation on collections.MutableSet + +Python 3.10 removes the deprecated aliases to collections abstract +base clases [1]. Using 'collections.abc.MutableSet' instead of +'collections.MutableSet' + +[1]: https://bugs.python.org/issue37324 + +Fixes: +$ crm +Traceback (most recent call last): + File "/usr/bin/crm", line 29, in <module> + from crmsh import main + File "/usr/lib64/python3.10/site-packages/crmsh/main.py", line 18, in <module> + from . import ui_root + File "/usr/lib64/python3.10/site-packages/crmsh/ui_root.py", line 23, in <module> + from . import ui_cib + File "/usr/lib64/python3.10/site-packages/crmsh/ui_cib.py", line 16, in <module> + from .cibconfig import cib_factory + File "/usr/lib64/python3.10/site-packages/crmsh/cibconfig.py", line 23, in <module> + from . import orderedset + File "/usr/lib64/python3.10/site-packages/crmsh/orderedset.py", line 29, in <module> + class OrderedSet(collections.MutableSet): +AttributeError: module 'collections' has no attribute 'MutableSet' + +Upstream-Status: Submitted +[https://github.com/ClusterLabs/crmsh/pull/882] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + crmsh/orderedset.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/crmsh/orderedset.py b/crmsh/orderedset.py +index 21ec480c..27233289 100644 +--- a/crmsh/orderedset.py ++++ b/crmsh/orderedset.py +@@ -26,7 +26,7 @@ import collections + KEY, PREV, NEXT = list(range(3)) + + +-class OrderedSet(collections.MutableSet): ++class OrderedSet(collections.abc.MutableSet): + + def __init__(self, iterable=None): + self.end = end = [] +-- +2.25.1 + diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb index add7dba..8f319b5 100644 --- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb +++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb @@ -3,22 +3,24 @@ DESCRIPTION = "crm shell, a Pacemaker command line interface for management and HOMEPAGE = "https://crmsh.github.io" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "asciidoc-native \ docbook-xsl-stylesheets-native \ libxslt-native \ - python-setuptools-native \ " -RDEPENDS_${PN} = "pacemaker python3-lxml python3-parallax gawk bash" +RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash python3-doctest" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=master;protocol=https \ file://tweaks_for_build.patch \ + file://0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch \ " -SRCREV = "d10d2fbdd1b357500387bebb432c68e88748526b" +SRCREV = "00ec69054edecd068deda54c6184c0385d90ebd2" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$" inherit autotools-brokensep setuptools3 @@ -29,4 +31,4 @@ export BUILD_SYS # network accesses for the dtd and stylesheets export SGML_CATALOG_FILES = "${STAGING_DATADIR_NATIVE}/xml/docbook/xsl-stylesheets/catalog.xml" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/${BPN}" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/${BPN}" diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb index 35fee43..7b9e875 100644 --- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb +++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb @@ -22,7 +22,7 @@ It implements the following kinds of heartbeats: \ " HOMEPAGE = "http://linux-ha.org/" SECTION = "System Environment/Daemons" -LICENSE = "GPLv2 & LGPLv2+" +LICENSE = "GPL-2.0-only & LGPL-2.0-or-later" LIC_FILES_CHKSUM = " \ file://doc/COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ file://doc/COPYING.LGPL;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ @@ -38,9 +38,9 @@ SRC_URI = " \ " SRC_URI[md5sum] = "101c8f507b1f407468d5ef15ae6719da" SRC_URI[sha256sum] = "851d2add2c129fef9fede764fec80229e1f6e7295e0e979950d10258648b462c" -S = "${WORKDIR}/Heartbeat-3-0-958e11be8686/" +S = "${WORKDIR}/Heartbeat-3-0-958e11be8686" DEPENDS = "cluster-glue corosync gnutls libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" -RDEPENDS_${PN} += "python" +RDEPENDS:${PN} += "python" inherit autotools-brokensep pkgconfig useradd EXTRA_OECONF = " \ STAGING_DIR_TARGET=${STAGING_DIR_TARGET} \ @@ -48,7 +48,7 @@ EXTRA_OECONF = " \ --disable-static \ " SOURCE1 = "heartbeat/init.d/heartbeat" -CFLAGS_append += "-DGLIB_COMPILATION" +CFLAGS:append = " -DGLIB_COMPILATION" do_configure() { ./bootstrap @@ -70,12 +70,12 @@ do_configure() { fi oe_runconf ${EXTRA_OECONF} } -do_compile_prepend() { +do_compile:prepend() { sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_PREFIX}libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_PREFIX}libtool make clean } -do_install_append () { +do_install:append () { sed -i -e 's,/usr/lib/,${libdir}/,' ${WORKDIR}/heartbeat.service if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${libexecdir} @@ -101,22 +101,22 @@ do_install() { } inherit systemd -SYSTEMD_SERVICE_${PN} = "heartbeat.service" +SYSTEMD_SERVICE:${PN} = "heartbeat.service" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r haclient" -USERADD_PARAM_${PN} = " \ +GROUPADD_PARAM:${PN} = "-r haclient" +USERADD_PARAM:${PN} = " \ -r -g haclient -d /var/lib/heartbeat/cores/hacluster -M \ -s /sbin/nologin -c \"heartbeat user\" hacluster \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/heartbeat/plugins/quorum/.debug \ ${libdir}/heartbeat/plugins/HBauth/.debug \ ${libdir}/heartbeat/plugins/tiebreaker/.debug \ ${libdir}/heartbeat/plugins/HBcomm/.debug \ ${libdir}/heartbeat/plugins/HBcompress/.debug \ " -FILES_${PN} += " \ +FILES:${PN} += " \ run/heartbeat/ccm \ run/heartbeat/dopd \ ${libdir}/tmpfiles.d \ diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch new file mode 100644 index 0000000..5609b4b --- /dev/null +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch @@ -0,0 +1,32 @@ +From b7913a62e2d78fa98ae2c475de4cc697519181e2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Tue, 10 Sep 2019 19:29:16 -0700 +Subject: [PATCH] o2cb.init.sh: Remove unneeded /lib/lsb/init-functions + +The "systemctl start o2cb/ocfs2" works well when systemd (no +/etc/init.d/functions, either), so remove the unneeded line. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + vendor/common/o2cb.init.sh | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/vendor/common/o2cb.init.sh b/vendor/common/o2cb.init.sh +index 8b0dbf09..49eb9a4c 100755 +--- a/vendor/common/o2cb.init.sh ++++ b/vendor/common/o2cb.init.sh +@@ -25,9 +25,6 @@ then + start_daemon () { + daemon $* + } +-else +-# Let's try to use the LSB functions +-. /lib/lsb/init-functions + fi + + if [ $? != 0 ] +-- +2.21.0 + diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb index bc0551b..03a1333 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb @@ -9,18 +9,22 @@ technologies, such as JBD - the same journaling subsystem in use by \ ext3." HOMEPAGE = "http://oss.oracle.com/projects/ocfs2-tools/" SECTION = "System Environment/Base" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=8ef380476f642c20ebf40fecb0add2ec" -SRC_URI = "git://github.com/markfasheh/ocfs2-tools \ +SRC_URI = "git://github.com/markfasheh/ocfs2-tools;branch=master;protocol=https \ file://0003-vendor-common-o2cb.ocf-add-new-conf-file.patch \ file://ocfs2-tools-1.8.5-format-fortify.patch \ file://no-redhat.patch \ file://o2cb.service \ file://ocfs2.service \ file://0001-Fix-build-with-glibc-2.28.patch \ + file://0001-o2cb.init.sh-Remove-unneeded-lib-lsb-init-functions.patch \ " SRCREV = "4d76ceb4aa7aaa1fd595368089e99575d708f719" + +UPSTREAM_CHECK_GITTAGREGEX = "ocfs2-tools-(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig systemd @@ -30,17 +34,17 @@ DEPENDS = "corosync pacemaker \ e2fsprogs e2fsprogs-native \ " + # lsbinitscripts are needed to replace /etc/init.d/functions supplied by initscripts (systemv) # They are not the same code! # -RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0 \ - ${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}" +RDEPENDS:${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0" -ASNEEDED_pn-${PN} = "" +ASNEEDED:pn-${PN} = "" PARALLEL_MAKE = "" -INSANE_SKIP_${PN} = "unsafe-references-in-binaries" -CFLAGS_append += "-DGLIB_COMPILATION" -CPPFLAGS_append += "-DGLIB_COMPILATION" +INSANE_SKIP:${PN} = "unsafe-references-in-binaries" +CFLAGS:append = " -DGLIB_COMPILATION" +CPPFLAGS:append = " -DGLIB_COMPILATION" EXTRA_OECONF = " \ --enable-ocfs2console=no \ @@ -49,7 +53,7 @@ EXTRA_OECONF = " \ --with-root-prefix=${root_prefix} \ " -do_configure_prepend () { +do_configure:prepend () { # fix here or EXTRA_OECONF sed -i -e '/^PYTHON_INCLUDES="-I/c\ PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ @@ -64,16 +68,16 @@ PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ } -do_compile_prepend() { +do_compile:prepend() { for m in `find . -name "Makefile"` ; do sed -i -e "s@-I/usr/include@-I${STAGING_DIR_TARGET}/usr/include@g" $m done } -SYSTEMD_SERVICE_${PN} = "o2cb.service ocfs2.service" +SYSTEMD_SERVICE:${PN} = "o2cb.service ocfs2.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${S}/vendor/common/o2cb.init ${D}${sysconfdir}/init.d/o2cb install -m 0755 ${S}/vendor/common/ocfs2.init ${D}${sysconfdir}/init.d/ocfs2 diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles index 979db47..765ee0d 100755..100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles +++ b/meta-cgl-common/recipes-cgl/pacemaker/files/tmpfiles @@ -3,4 +3,5 @@ d /var/lib/pacemaker/cib 0750 hacluster haclient - d /var/lib/pacemaker/cores 0750 hacluster haclient - d /var/lib/pacemaker/pengine 0750 hacluster haclient - d /var/lib/pacemaker/blackbox 0750 hacluster haclient - -d /var/run/crm 0750 hacluster haclient - +d /run/crm 0750 hacluster haclient - +d /var/log/pacemaker 0750 hacluster haclient - diff --git a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles index 1700a69..eca3002 100755..100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles +++ b/meta-cgl-common/recipes-cgl/pacemaker/files/volatiles @@ -4,3 +4,4 @@ d hacluster haclient 0750 /var/lib/pacemaker/cores none d hacluster haclient 0750 /var/lib/pacemaker/pengine none d hacluster haclient 0750 /var/lib/pacemaker/blackbox none d hacluster haclient 0750 /var/run/crm none +d hacluster haclient 0750 /var/log/pacemaker none diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch index 05d7a76..2095227 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-Fix-python3-usage.patch @@ -1,4 +1,4 @@ -From fdefa9efc726fe704238d462a3dc207e0282fb9e Mon Sep 17 00:00:00 2001 +From f470884e0b990676685c8740b5c7d6f094267e4f Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <jpuhlman@mvista.com> Date: Sun, 15 Mar 2020 21:09:33 +0000 Subject: [PATCH] Fix python3 usage @@ -18,12 +18,11 @@ Upstream-Status: Pending cts/pacemaker-cts-dummyd.in | 2 +- daemons/fenced/fence_legacy.in | 2 +- doc/Pacemaker_Development/en-US/Ch-Python.txt | 2 +- - doc/Pacemaker_Development/pot/Ch-Python.pot | 2 +- tools/pcmk_simtimes.in | 2 +- - 14 files changed, 14 insertions(+), 14 deletions(-) + 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cts/CTSlab.py.in b/cts/CTSlab.py.in -index f4ae60dc1..55a0d4ecf 100644 +index 4bae93515..f09f71c66 100644 --- a/cts/CTSlab.py.in +++ b/cts/CTSlab.py.in @@ -1,4 +1,4 @@ @@ -43,10 +42,10 @@ index 81a5da8c0..bbadf938a 100644 '''OCF IPaddr/IPaddr2 Resource Agent Test''' diff --git a/cts/cluster_test.in b/cts/cluster_test.in -index e0d28509d..f982be05a 100755 +index 38f941d3e..5a289e3fc 100755 --- a/cts/cluster_test.in +++ b/cts/cluster_test.in -@@ -171,4 +171,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests" +@@ -172,4 +172,4 @@ printf "\nAll set to go for %d iterations!\n" "$CTS_numtests" || echo "+ To use a different configuration, remove ~/.cts and re-run cts (or edit it manually)." echo Now paste the following command into this shell: @@ -63,7 +62,7 @@ index 592d850b4..9a653a442 100644 """ diff --git a/cts/cts-fencing.in b/cts/cts-fencing.in -index 2d9999ca0..8e3fb7203 100644 +index 444402438..0270c99ce 100644 --- a/cts/cts-fencing.in +++ b/cts/cts-fencing.in @@ -1,4 +1,4 @@ @@ -83,7 +82,7 @@ index 28f4efe7f..b4ed5024f 100644 Reads a specified number of lines from the supplied offset diff --git a/cts/cts-scheduler.in b/cts/cts-scheduler.in -index 8fa16fb69..d4306b02b 100644 +index 23e6a919f..09058ce22 100644 --- a/cts/cts-scheduler.in +++ b/cts/cts-scheduler.in @@ -1,4 +1,4 @@ @@ -93,7 +92,7 @@ index 8fa16fb69..d4306b02b 100644 """ diff --git a/cts/environment.py b/cts/environment.py -index db9d3db16..9d103fda9 100644 +index 6a97b1289..39e89fa6f 100644 --- a/cts/environment.py +++ b/cts/environment.py @@ -639,7 +639,7 @@ class Environment(object): @@ -106,7 +105,7 @@ index db9d3db16..9d103fda9 100644 sys.exit(status) diff --git a/cts/fence_dummy.in b/cts/fence_dummy.in -index a2692b1e0..f1d111205 100644 +index 8b0dd5165..9e8624bd9 100644 --- a/cts/fence_dummy.in +++ b/cts/fence_dummy.in @@ -1,4 +1,4 @@ @@ -148,19 +147,6 @@ index 42d35b649..467e1c524 100644 ---- ==== which will be replaced with the appropriate python executable when Pacemaker is -diff --git a/doc/Pacemaker_Development/pot/Ch-Python.pot b/doc/Pacemaker_Development/pot/Ch-Python.pot -index ed71331ce..27c7e22e5 100644 ---- a/doc/Pacemaker_Development/pot/Ch-Python.pot -+++ b/doc/Pacemaker_Development/pot/Ch-Python.pot -@@ -39,7 +39,7 @@ msgstr "" - - #. Tag: screen - #, no-c-format --msgid "#!@PYTHON@" -+msgid "#!/usr/bin/env python3" - msgstr "" - - #. Tag: para diff --git a/tools/pcmk_simtimes.in b/tools/pcmk_simtimes.in index 6e362243b..28009f499 100644 --- a/tools/pcmk_simtimes.in @@ -172,5 +158,5 @@ index 6e362243b..28009f499 100644 """ -- -2.23.0 +2.17.1 diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch index f8cbb7e..a10e8cd 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-fix-compile-error-of-musl-libc.patch @@ -1,4 +1,4 @@ -From 51b0df9242bb1e3eb41362381472a00727910f64 Mon Sep 17 00:00:00 2001 +From ba9e4810a09893521d28f6c699fb7f213d4a4b34 Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Fri, 10 Aug 2018 15:08:31 +0800 Subject: [PATCH] pacemaker: fix compile error of musl libc @@ -7,28 +7,14 @@ Upstream-Status: Pending Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - include/crm/stonith-ng.h | 1 + - lib/cib/cib_remote.c | 3 --- - tools/crm_mon.c | 2 +- - 3 files changed, 2 insertions(+), 4 deletions(-) + lib/cib/cib_remote.c | 3 --- + 1 file changed, 3 deletions(-) -diff --git a/include/crm/stonith-ng.h b/include/crm/stonith-ng.h -index 56c1ec7..a637b47 100644 ---- a/include/crm/stonith-ng.h -+++ b/include/crm/stonith-ng.h -@@ -28,6 +28,7 @@ - # include <dlfcn.h> - # include <errno.h> - # include <stdbool.h> -+# include <time.h> - - /* TO-DO: Work out how to drop this requirement */ - # include <libxml/tree.h> diff --git a/lib/cib/cib_remote.c b/lib/cib/cib_remote.c -index 4d7b93b..8be8ecc 100644 +index 4de0a0f7b..7686637db 100644 --- a/lib/cib/cib_remote.c +++ b/lib/cib/cib_remote.c -@@ -53,9 +53,6 @@ typedef void gnutls_session_t; +@@ -45,9 +45,6 @@ typedef void gnutls_session_t; #endif #include <arpa/inet.h> @@ -38,19 +24,6 @@ index 4d7b93b..8be8ecc 100644 #define DH_BITS 1024 -diff --git a/tools/crm_mon.c b/tools/crm_mon.c -index 7c63803..1ae6c21 100644 ---- a/tools/crm_mon.c -+++ b/tools/crm_mon.c -@@ -553,7 +553,7 @@ main(int argc, char **argv) - - #if !defined (ON_DARWIN) && !defined (ON_BSD) - /* prevent zombies */ -- signal(SIGCLD, SIG_IGN); -+ signal(SIGCHLD, SIG_IGN); - #endif - - if (crm_ends_with_ext(argv[0], ".cgi") == TRUE) { -- -2.7.4 +2.17.1 diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch new file mode 100644 index 0000000..1ff9c7d --- /dev/null +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch @@ -0,0 +1,32 @@ +From 3ca78a6441eefc26f18211375b18205ed6fc28c6 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Thu, 3 Sep 2020 05:26:36 +0000 +Subject: [PATCH] pacemaker: set OCF_ROOT_DIR to $libdir/ocf + +* Set the default OCF_ROOT_DIR to $libdir/ocf + to make the resource agents components more + compatible + +Upstream-Status: Pending + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 58d39cdc0..eb4275560 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -315,7 +315,7 @@ dnl This defaults to /usr/lib rather than libdir because it's determined by the + dnl OCF project and not pacemaker. Even if a user wants to install pacemaker to + dnl /usr/local or such, the OCF agents will be expected in their usual + dnl location. However, we do give the user the option to override it. +-OCF_ROOT_DIR="/usr/lib/ocf" ++OCF_ROOT_DIR="$libdir/ocf" + AC_ARG_WITH([ocfdir], + [AS_HELP_STRING([--with-ocfdir=DIR], + [OCF resource agent root directory (advanced option: changing this may break other cluster components unless similarly configured) @<:@/usr/lib/ocf@:>@])], +-- +2.26.2 + diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch deleted file mode 100644 index f5e1829..0000000 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker/0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 426f06cc088d11d6db0c45b434e5ce6b69da78b4 Mon Sep 17 00:00:00 2001 -From: Chris Lumens <clumens@redhat.com> -Date: Thu, 2 Jan 2020 15:08:58 -0500 -Subject: [PATCH 006/207] Fix: tools: Fix definition of curses_indented_printf. - -The placeholder version that is built if curses is not enabled does not -have a type that matches the header file. Correct that. - -Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> -Upstream-Status: Backport[git] ---- - tools/crm_mon_curses.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/crm_mon_curses.c b/tools/crm_mon_curses.c -index c0dbedbf0..ecd0584fe 100644 ---- a/tools/crm_mon_curses.c -+++ b/tools/crm_mon_curses.c -@@ -368,7 +368,7 @@ curses_indented_vprintf(pcmk__output_t *out, const char *format, va_list args) { - - G_GNUC_PRINTF(2, 3) - void --curses_indented_printf(pcmk__output_t *out, const char *format, va_list args) { -+curses_indented_printf(pcmk__output_t *out, const char *format, ...) { - return; - } - --- -2.23.0 - diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb index 9b63acd..c3fdff3 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.3.bb +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb @@ -8,23 +8,23 @@ when related resources fail and can be configured to periodically \ check resource health." HOMEPAGE = "http://www.clusterlabs.org" -LICENSE = "GPLv2+ & LGPLv2.1+" +LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=000212f361a81b100d9d0f0435040663" DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python3-native" -SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ - file://0006-Fix-tools-Fix-definition-of-curses_indented_printf.patch \ +SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=main;protocol=https \ file://0001-Fix-python3-usage.patch \ + file://0001-pacemaker-set-OCF_ROOT_DIR-to-libdir-ocf.patch \ file://volatiles \ file://tmpfiles \ " CFLAGS += "-I${STAGING_INCDIR}/heartbeat" CPPFLAGS +="-I${STAGING_INCDIR}/heartbeat" -SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch" +SRC_URI:append:libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch" -SRCREV = "4b1f869f0f64ef0d248b6aa4781d38ecccf83318" +SRCREV = "ba59be71228fed04f78ab374dfac748d314d0e89" inherit autotools-brokensep pkgconfig systemd python3native python3-dir useradd @@ -49,8 +49,20 @@ EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \ CACHED_CONFIGUREVARS += " \ ac_cv_path_BASH_PATH=/bin/bash \ " +do_configure:prepend() { + # remove buildpath + placeh="abs_top_builddir abs_top_srcdir" + for ph in $placeh + do + srcdirs=$(grep -Rn $ph ${S}/* | awk -F: '{print $1}' | uniq) + for srcdir in $srcdirs + do + sed -i "s/${ph}/${ph}_placeholder/g" $srcdir + done + done +} -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_${BPN} @@ -64,13 +76,27 @@ do_install_append() { rm -rf ${D}${localstatedir}/lib/heartbeat rm -rf ${D}${localstatedir}/run + rm -rf ${D}${localstatedir}/log + + # remove buildpath + tempdirs=$(grep -Rn ${RECIPE_SYSROOT_NATIVE} ${D}/* | awk -F: '{print $1}' | uniq) + for temdir in $tempdirs + do + sed -i "s:${RECIPE_SYSROOT_NATIVE}::g" $temdir + done + + hostdir=$(grep -Rn ${HOSTTOOLS_DIR} ${D}/* | awk -F: '{print $1}' | uniq) + for tmpdir in $hostdir + do + sed -i "s:${HOSTTOOLS_DIR}::g" $tmpdir + done } -PACKAGES_prepend = "${PN}-cli-utils ${PN}-libs ${PN}-cluster-libs ${PN}-remote " +PACKAGES:prepend = "${PN}-cli-utils ${PN}-libs ${PN}-cluster-libs ${PN}-remote " -FILES_${PN}-cli-utils = "${sbindir}/crm* ${sbindir}/iso8601" -RDEPENDS_${PN}-cli-utils += "libqb bash" -FILES_${PN}-libs = "${libdir}/libcib.so.* \ +FILES:${PN}-cli-utils = "${sbindir}/crm* ${sbindir}/iso8601" +RDEPENDS:${PN}-cli-utils += "libqb bash" +FILES:${PN}-libs = "${libdir}/libcib.so.* \ ${libdir}/liblrmd.so.* \ ${libdir}/libcrmservice.so.* \ ${libdir}/libcrmcommon.so.* \ @@ -80,29 +106,29 @@ FILES_${PN}-libs = "${libdir}/libcib.so.* \ ${libdir}/libstonithd.so.* \ ${libdir}/libtransitioner.so.* \ " -RDEPENDS_${PN}-libs += "libqb dbus-lib" -FILES_${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*" -RDEPENDS_${PN}-cluster-libs += "libqb" -FILES_${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \ +RDEPENDS:${PN}-libs += "libqb dbus-lib" +FILES:${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*" +RDEPENDS:${PN}-cluster-libs += "libqb" +FILES:${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \ ${sbindir}/pacemaker_remoted \ ${libdir}/ocf/resource.d/pacemaker/remote \ " -RDEPENDS_${PN}-remote += "libqb bash" -FILES_${PN} += " ${datadir}/snmp \ +RDEPENDS:${PN}-remote += "libqb bash" +FILES:${PN} += " ${datadir}/snmp \ ${libdir}/corosync/lcrso/pacemaker.lcrso \ ${libdir}/${PYTHON_DIR}/dist-packages/cts/ \ ${libdir}/ocf/resource.d/ \ ${libdir}/${PYTHON_DIR}/site-packages/cts/ \ " -FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug" -RDEPENDS_${PN} = "bash python3-core perl libqb ${PN}-cli-utils" +FILES:${PN}-dbg += "${libdir}/corosync/lcrso/.debug" +RDEPENDS:${PN} = "bash python3-core perl libqb ${PN}-cli-utils" SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_PACKAGES += "${PN}-remote" -SYSTEMD_SERVICE_${PN} += "pacemaker.service crm_mon.service" -SYSTEMD_SERVICE_${PN}-remote += "pacemaker_remote.service" +SYSTEMD_SERVICE:${PN} += "pacemaker.service crm_mon.service" +SYSTEMD_SERVICE:${PN}-remote += "pacemaker_remote.service" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -g haclient -s ${base_sbindir}/nologin hacluster" -GROUPADD_PARAM_${PN} = "-r haclient" +USERADD_PARAM:${PN} = "-r -g haclient -s ${base_sbindir}/nologin hacluster" +GROUPADD_PARAM:${PN} = "-r haclient" diff --git a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb index 56dabfb..0388afe 100644 --- a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb +++ b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb @@ -8,12 +8,12 @@ FreeBSD, NetBSD, Linux, and Mac OS X." HOMEPAGE = "http://ftp.racoon2.wide.ad.jp/pub/racoon2/" DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'krb5', '', d)} libpcap openssl bison flex-native util-linux bison-native" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=99a60756441098855c538fe86f859afe" -SRC_URI = "git://github.com/zoulasc/racoon2 \ +SRC_URI = "git://github.com/zoulasc/racoon2;branch=master;protocol=https \ file://0001-Add-DESTDIR-to-install-commands.patch \ file://0002-Enable-turning-of-kinkd-and-iked.patch \ file://0003-Replace-perl_bindir-with-usr-bin-env-perl.patch \ @@ -49,11 +49,11 @@ EXTRA_OECONF += "--sysconfdir=${sysconfdir}/${BPN} \ --with-kernel-build-dir=${STAGING_INCDIR}" CLEANBROKEN = "1" -do_configure_prepend () { +do_configure:prepend () { mkdir -p lib/m4 spmd/m4 iked/m4 kinkd/m4 } -do_install_append() { +do_install:append() { install -d -m 0755 ${D}${sysconfdir}/init.d/ cp -rfa ${D}${sysconfdir}/${BPN}/init.d/* ${D}${sysconfdir}/init.d/ @@ -80,19 +80,19 @@ do_install_append() { } INITSCRIPT_PACKAGES = "${PN} ${PN}-iked ${PN}-${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'kinkd', '', d)}" -INITSCRIPT_NAME_${PN} = "spmd" -INITSCRIPT_PARAMS_${PN} = "remove" -INITSCRIPT_NAME_${PN}-iked = "iked" -INITSCRIPT_PARAMS_${PN}-iked = "remove" -INITSCRIPT_NAME_${PN}-kinkd = "kinkd" -INITSCRIPT_PARAMS_${PN}-kinkd= "remove" +INITSCRIPT_NAME:${PN} = "spmd" +INITSCRIPT_PARAMS:${PN} = "remove" +INITSCRIPT_NAME:${PN}-iked = "iked" +INITSCRIPT_PARAMS:${PN}-iked = "remove" +INITSCRIPT_NAME:${PN}-kinkd = "kinkd" +INITSCRIPT_PARAMS:${PN}-kinkd= "remove" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "spmd.service iked.service" +SYSTEMD_SERVICE:${PN} = "spmd.service iked.service" SYSTEMD_AUTO_ENABLE = "disable" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp/0001-ip_carp.h-use-__attribute__-packed-instead-of-__pack.patch b/meta-cgl-common/recipes-cgl/ucarp/ucarp/0001-ip_carp.h-use-__attribute__-packed-instead-of-__pack.patch new file mode 100644 index 0000000..918fa9b --- /dev/null +++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp/0001-ip_carp.h-use-__attribute__-packed-instead-of-__pack.patch @@ -0,0 +1,30 @@ +From a1c83bc4676dbeaff0e1c540aeeb7c31e17aae74 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 24 Sep 2020 14:20:58 +0800 +Subject: [PATCH] ip_carp.h: use __attribute__((packed)) instead of __packed + +Fix gcc10 build error about multiple definition of __packed. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + src/ip_carp.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ip_carp.h b/src/ip_carp.h +index 9504a8e..d1e3368 100644 +--- a/src/ip_carp.h ++++ b/src/ip_carp.h +@@ -70,7 +70,7 @@ struct carp_header { + u_int16_t carp_cksum; + u_int32_t carp_counter[2]; + unsigned char carp_md[20]; /* SHA1 HMAC */ +-} __packed; ++} __attribute__((packed)); + + #define CARP_DFLTTL 255 + +-- +2.17.1 + diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-down.sh b/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-down.sh index a431c32..27e0d2b 100644 --- a/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-down.sh +++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-down.sh @@ -4,4 +4,4 @@ exec 2> /dev/null #/sbin/ip addr del "$2"/24 dev "$1" # or alternatively: -/sbin/ifconfig "$1":254 down +ifconfig "$1":254 down diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-up.sh b/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-up.sh index c1b8a4f..f81d578 100644 --- a/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-up.sh +++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp/vip-up.sh @@ -4,4 +4,4 @@ exec 2> /dev/null #/sbin/ip addr add "$2"/24 dev "$1" # or alternatively: -/sbin/ifconfig "$1":254 "$2" netmask 255.255.255.0 +ifconfig "$1":254 "$2" netmask 255.255.255.0 diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb index 6f30bf7..4109276 100644 --- a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb +++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb @@ -17,6 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=278a886e91f2f6c983ffdf040130cdc6" SRC_URI = "http://download.pureftpd.org/pub/ucarp/${BPN}-${PV}.tar.gz \ file://ucarp-configure-sha1.patch \ file://ucarp-configure-snprintf.patch \ + file://0001-ip_carp.h-use-__attribute__-packed-instead-of-__pack.patch \ file://ucarp.init \ file://vip-001.conf.example \ file://vip-common.conf \ @@ -31,18 +32,19 @@ SRC_URI[sha256sum] = "f3cc77e28481fd04f62bb3d4bc03104a97dd316c80c0ed04ad7be24b54 inherit autotools gettext systemd DEPENDS = "libpcap" +RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','initscripts-functions','',d)}" -SYSTEMD_SERVICE_${PN} = "ucarp.service" +SYSTEMD_SERVICE:${PN} = "ucarp.service" SYSTEMD_AUTO_ENABLE = "disable" - +export FETCHCMD_wget = "/usr/bin/env wget --secure-protocol=TLSv1_2 -t 2 -T 30 --passive-ftp --no-check-certificate" EXTRA_OECONF += "--sysconfdir=${sysconfdir}/${BPN}" # fix the perms for config.rpath -do_configure_prepend() { +do_configure:prepend() { chmod 755 ${S}/config.rpath } -do_install_append() { +do_install:append() { sed -i -e 's#\(UPSCRIPT=\).*#\1${libexecdir}/vip-up.sh#' \ -e 's#\(DOWNSCRIPT=\).*#\1${libexecdir}/vip-down.sh#' ${WORKDIR}/ucarp.init |