Date   

[meta-cgl][PATCH 20/20] Move packagegroups to recipes-core for consistancy sake

Jeremy Puhlman
 

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/conf/layer.conf | 2 --
.../{ => recipes-core}/packagegroups/packagegroup-cgl-applications.bb | 0
.../{ => recipes-core}/packagegroups/packagegroup-cgl-kernel.bb | 0
.../{ => recipes-core}/packagegroups/packagegroup-cgl-middleware.bb | 0
.../{ => recipes-core}/packagegroups/packagegroup-cgl-swdevtools.bb | 0
meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl.bb | 0
6 files changed, 2 deletions(-)
rename meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl-applications.bb (100%)
rename meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl-kernel.bb (100%)
rename meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl-middleware.bb (100%)
rename meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl-swdevtools.bb (100%)
rename meta-cgl-common/{ => recipes-core}/packagegroups/packagegroup-cgl.bb (100%)

diff --git a/meta-cgl-common/conf/layer.conf b/meta-cgl-common/conf/layer.conf
index de64205..a48f96e 100644
--- a/meta-cgl-common/conf/layer.conf
+++ b/meta-cgl-common/conf/layer.conf
@@ -3,8 +3,6 @@ BBPATH .= ":${LAYERDIR}"

# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/images/* \
- ${LAYERDIR}/packagegroups/* \
${LAYERDIR}/recipes-*/*/*.bbappend"

BBFILE_COLLECTIONS += "cgl-common"
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb
similarity index 100%
rename from meta-cgl-common/packagegroups/packagegroup-cgl-applications.bb
rename to meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb
similarity index 100%
rename from meta-cgl-common/packagegroups/packagegroup-cgl-kernel.bb
rename to meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb
similarity index 100%
rename from meta-cgl-common/packagegroups/packagegroup-cgl-middleware.bb
rename to meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb
similarity index 100%
rename from meta-cgl-common/packagegroups/packagegroup-cgl-swdevtools.bb
rename to meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb
diff --git a/meta-cgl-common/packagegroups/packagegroup-cgl.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb
similarity index 100%
rename from meta-cgl-common/packagegroups/packagegroup-cgl.bb
rename to meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb
--
2.13.3


[meta-cgl][PATCH 17/20] pacemaker: Update to 2.0.3

Jeremy Puhlman
 


[meta-cgl][PATCH 19/20] initramfs-cgl-boot: Do not presume layer is inside corebase

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
index 5265bf0..1a2dd1d 100644
--- a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
+++ b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb
@@ -1,7 +1,9 @@
SUMMARY = "Support for having multipath iSCSI devices as root file system"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-cgl/COPYING.MIT;md5=838c366f69b72c5df05c96dff79b35f2"
-SRC_URI = "file://init-boot.sh"
+LIC_FILES_CHKSUM = "file://../COPYING.MIT;md5=838c366f69b72c5df05c96dff79b35f2"
+SRC_URI = "file://init-boot.sh \
+ file://COPYING.MIT \
+"

do_install() {
install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
--
2.13.3


[meta-cgl][PATCH 16/20] ocfs2-tools: update to 1.8.6

Jeremy Puhlman
 

* Drop patcehes moved upstream.
* Update license for address changes in document

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
...s2-use-sys-sysmacros.h-include-for-makede.patch | 47 ------------
...cfs2-fix-compile-error-when-glibc-upgrade.patch | 88 ----------------------
.../{ocfs2-tools_1.8.5.bb => ocfs2-tools_1.8.6.bb} | 8 +-
3 files changed, 3 insertions(+), 140 deletions(-)
delete mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
delete mode 100644 meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch
rename meta-cgl-common/recipes-cgl/ocfs2-tools/{ocfs2-tools_1.8.5.bb => ocfs2-tools_1.8.6.bb} (93%)

diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
deleted file mode 100644
index ddc43aa..0000000
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/0001-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 03be837c7d0b9be393ffb555879c49e6212fbd0f Mon Sep 17 00:00:00 2001
-From: Valentin Vidic <Valentin.Vidic@...>
-Date: Thu, 25 Jan 2018 13:05:27 +0100
-Subject: [PATCH] mounted.ocfs2: use <sys/sysmacros.h> include for makedev
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- mounted.c: In function "build_partition_list":
- mounted.c:354:13: warning: In the GNU C Library, "makedev" is defined
- by <sys/sysmacros.h>. For historical compatibility, it is
- currently defined by <sys/types.h> as well, but we plan to
- remove this soon. To use "makedev", include <sys/sysmacros.h>
- directly. If you did not intend to use a system-defined macro
- "makedev", you should undefine it after including <sys/types.h>.
- makedev(major, minor), &devname);
- ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Fix the below error:
-/usr/src/debug/ocfs2-tools/1.8.5-r0/git/mounted.ocfs2/mounted.c:354: undefined reference to `makedev'
-collect2: error: ld returned 1 exit status
-Makefile:36: recipe for target 'mounted.ocfs2' failed
-make[1]: *** [mounted.ocfs2] Error 1
-
-Upstream-Status: Backport[https://github.com/markfasheh/ocfs2-tools/commit/03be837c7d0b9be393ffb555879c49e6212fbd0f]
-
-Signed-off-by: Mingli Yu <Mingli.Yu@...>
----
- mounted.ocfs2/mounted.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mounted.ocfs2/mounted.c b/mounted.ocfs2/mounted.c
-index 1576f902..090ab4ed 100644
---- a/mounted.ocfs2/mounted.c
-+++ b/mounted.ocfs2/mounted.c
-@@ -25,7 +25,7 @@
- #define _LARGEFILE64_SOURCE
- #define _GNU_SOURCE /* Because libc really doesn't want us using O_DIRECT? */
-
--#include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <errno.h>
---
-2.17.1
-
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch
deleted file mode 100644
index 5eb2a61..0000000
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools/ocfs2-fix-compile-error-when-glibc-upgrade.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 0ffd58b223e24779420130522ea8ee359505f493 Mon Sep 17 00:00:00 2001
-From: Gang He <ghe@...>
-Date: Mon, 4 Sep 2017 14:08:59 +0800
-Subject: [PATCH] fsck.ocfs2: fix compile error when glibc upgrade
-
-When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
-the compile error messages like,
-
-In file included from /usr/include/string.h:431:0,
- from ../include/ocfs2/ocfs2.h:41,
- from pass4.c:32:
-include/strings.h:37:1: error: unknown type name 'errcode_t'; did you mean 'mode_t'?
- errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
- ^~~~~~~~~
- mode_t
-
-
-Upstream-Status: Backport [https://github.com/markfasheh/ocfs2-tools/commit/0ffd58b223e24779420130522ea8ee359505f493]
-
-Signed-off-by: Jackie Huang <jackie.huang@...>
----
- fsck.ocfs2/Makefile | 2 +-
- fsck.ocfs2/include/{strings.h => o2fsck_strings.h} | 0
- fsck.ocfs2/pass2.c | 2 +-
- fsck.ocfs2/pass5.c | 2 +-
- fsck.ocfs2/strings.c | 2 +-
- 5 files changed, 4 insertions(+), 4 deletions(-)
- rename fsck.ocfs2/include/{strings.h => o2fsck_strings.h} (100%)
-
-diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
-index 051ed74..baf1994 100644
---- a/fsck.ocfs2/Makefile
-+++ b/fsck.ocfs2/Makefile
-@@ -64,7 +64,7 @@ HFILES = include/fsck.h \
- include/problem.h \
- include/refcount.h \
- include/slot_recovery.h \
-- include/strings.h \
-+ include/o2fsck_strings.h \
- include/util.h
-
-
-diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h
-similarity index 100%
-rename from fsck.ocfs2/include/strings.h
-rename to fsck.ocfs2/include/o2fsck_strings.h
-diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c
-index 181febb..a48a50b 100644
---- a/fsck.ocfs2/pass2.c
-+++ b/fsck.ocfs2/pass2.c
-@@ -43,7 +43,7 @@
- #include "fsck.h"
- #include "pass2.h"
- #include "problem.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- static const char *whoami = "pass2";
-diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c
-index 5c2d899..bfad1b7 100644
---- a/fsck.ocfs2/pass5.c
-+++ b/fsck.ocfs2/pass5.c
-@@ -40,7 +40,7 @@
- #include "fsck.h"
- #include "pass5.h"
- #include "problem.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- static const char *whoami = "pass5";
-diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c
-index 4ad3782..8a7a8d9 100644
---- a/fsck.ocfs2/strings.c
-+++ b/fsck.ocfs2/strings.c
-@@ -31,7 +31,7 @@
- #include "ocfs2/ocfs2.h"
-
- #include "fsck.h"
--#include "strings.h"
-+#include "o2fsck_strings.h"
- #include "util.h"
-
- struct string_entry {
---
-2.7.4
-
diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
similarity index 93%
rename from meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
rename to meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
index a0376ec..bc0551b 100644
--- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.5.bb
+++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb
@@ -10,19 +10,17 @@ ext3."
HOMEPAGE = "http://oss.oracle.com/projects/ocfs2-tools/"
SECTION = "System Environment/Base"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ef380476f642c20ebf40fecb0add2ec"

SRC_URI = "git://github.com/markfasheh/ocfs2-tools \
file://0003-vendor-common-o2cb.ocf-add-new-conf-file.patch \
- file://ocfs2-fix-compile-error-when-glibc-upgrade.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-mounted.ocfs2-use-sys-sysmacros.h-include-for-makede.patch \
"
-SRCREV = "f1b4d073f08679f97b64b3eb88e586032f92a701"
+SRCREV = "4d76ceb4aa7aaa1fd595368089e99575d708f719"
S = "${WORKDIR}/git"

inherit autotools-brokensep pkgconfig systemd
@@ -35,7 +33,7 @@ DEPENDS = "corosync pacemaker \
# 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 chkconfig glib-2.0 \
+RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0 \
${@bb.utils.contains('DISTRO_FEATURES','systemd','lsbinitscripts','',d)}"

ASNEEDED_pn-${PN} = ""
--
2.13.3


[meta-cgl][PATCH 15/20] crmsh: Update to 4.20

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/recipes-cgl/crmsh/{crmsh_3.0.3.bb => crmsh_4.20.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-cgl/crmsh/{crmsh_3.0.3.bb => crmsh_4.20.bb} (84%)

diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb
similarity index 84%
rename from meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
rename to meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb
index 6d2902c..0eb1e58 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb
@@ -14,13 +14,13 @@ DEPENDS = "asciidoc-native \
RDEPENDS_${PN} = "pacemaker python-lxml gawk bash"

S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=crmsh-3.0 \
+SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
file://tweaks_for_build.patch \
"

-SRCREV = "41845ca5511b844593cf25ae4eb7f307aa78c5be"
+SRCREV = "d10d2fbdd1b357500387bebb432c68e88748526b"

-inherit autotools-brokensep distutils3-base
+inherit autotools-brokensep setuptools3

export HOST_SYS
export BUILD_SYS
--
2.13.3


[meta-cgl][PATCH 08/20] resource-agents: Update to 4.5.0

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Refesh patches.
Drop already encorperated

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../resource-agents/01-disable-doc-build.patch | 12 ++++---
.../02-set-OCF_ROOT_DIR-to-libdir-ocf.patch | 4 +--
.../03-fix-header-defs-lookup.patch | 4 +--
.../resource-agents/fix-install-sh-not-found.patch | 22 ++++++-------
...uilds-when-srcdir-and-builddir-are-sepera.patch | 37 ----------------------
...ce-agents_4.0.1.bb => resource-agents_4.5.0.bb} | 10 +++---
6 files changed, 28 insertions(+), 61 deletions(-)
delete mode 100644 meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
rename meta-cgl-common/recipes-cgl/cluster-resource-agents/{resource-agents_4.0.1.bb => resource-agents_4.5.0.bb} (91%)

diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch
index 7c67ecc..f136ec8 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/01-disable-doc-build.patch
@@ -4,21 +4,23 @@ Date: Tue, 30 Jun 2015 16:42:48 +0800
Subject: [PATCH] disable doc build

Signed-off-by: Bian Naimeng <biannm@...>
-
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
-index 1769c6e..d66b2ae 100644
+index 0f2e5dcf..65619424 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -37,7 +37,7 @@ RGMANAGER = with
+@@ -39,7 +39,7 @@ RGMANAGER = with
endif

if BUILD_LINUX_HA
--SUBDIRS += include heartbeat tools ldirectord doc
-+SUBDIRS += include heartbeat tools ldirectord
+-SUBDIRS += include heartbeat tools ldirectord doc systemd
++SUBDIRS += include heartbeat tools ldirectord systemd
LINUX_HA = without
else
LINUX_HA = with
+--
+2.23.0
+
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch
index 683f3db..ca36bc6 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/02-set-OCF_ROOT_DIR-to-libdir-ocf.patch
@@ -10,10 +10,10 @@ Signed-off-by: Bian Naimeng <biannm@...>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
-index 3bb0b7d..ca30182 100644
+index 1eb65cf3..066d126f 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -405,7 +405,7 @@ dnl Variables needed for substitution
+@@ -425,7 +425,7 @@ dnl Variables needed for substitution
AC_CHECK_HEADERS(heartbeat/glue_config.h)

if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch
index 0ef2b45..fb578cb 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/03-fix-header-defs-lookup.patch
@@ -10,10 +10,10 @@ Signed-off-by: Bian Naimeng <biannm@...>
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
-index ca30182..83a698d 100644
+index 066d126f..32a76169 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -140,9 +140,8 @@ extract_header_define() {
+@@ -160,9 +160,8 @@ extract_header_define() {
Cfile=$srcdir/extract_define.$2.${$}
printf "#include <stdio.h>\n" > ${Cfile}.c
printf "#include <%s>\n" $1 >> ${Cfile}.c
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
index fbded10..d5d0d8a 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fix-install-sh-not-found.patch
@@ -19,13 +19,13 @@ Signed-off-by: Hongxu Jia <hongxu.jia@...>
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
-index 83a698d..2082d43 100644
+index 32a76169..d682ad78 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -23,13 +23,20 @@ AC_INIT([resource-agents],
+@@ -22,6 +22,13 @@ dnl checks for system services
+ AC_INIT([resource-agents],
m4_esyscmd([make/git-version-gen .tarball-version]),
- [to_be_defined@...])
-
+ [developers@...])
+AC_CONFIG_AUX_DIR(.)
+
+dnl
@@ -33,20 +33,20 @@ index 83a698d..2082d43 100644
+dnl
+
+AM_INIT_AUTOMAKE([1.10.1 foreign dist-bzip2])
-+
+
AC_USE_SYSTEM_EXTENSIONS

- CRM_DTD_VERSION="1.0"
+@@ -29,7 +36,6 @@ CRM_DTD_VERSION="1.0"

PKG_FEATURES=""

-AC_CONFIG_AUX_DIR(.)
- AC_CANONICAL_HOST
+ AC_CONFIG_MACRO_DIR([m4])

- dnl Where #defines go (e.g. `AC_CHECK_HEADERS' below)
-@@ -76,12 +83,6 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"],
- [AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])])
- AM_CONDITIONAL([HAVE_SYSTEMD], [test "x$with_systemdsystemunitdir" != "xno"])
+ AC_CANONICAL_HOST
+@@ -96,12 +102,6 @@ AC_ARG_WITH([systemdtmpfilesdir],
+ fi
+ AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdtmpfilesdir" -a "x$with_systemdtmpfilesdir" != xno ])

-dnl
-dnl AM_INIT_AUTOMAKE([1.11.1 foreign dist-bzip2 dist-xz])
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
deleted file mode 100644
index dbafc68..0000000
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents/fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 40227e4ac8c95fb0175cbc4856103b5ca4c6824c Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@...>
-Date: Thu, 1 Jun 2017 10:34:38 +0800
-Subject: [PATCH] fs.sh: fix builds when srcdir and builddir are seperated
-
-It fails to find fs.sh.in when srddir and builddir are not the same:
-
-make[5]: Entering directory '/path/to/builddir/rgmanager/src/resources'
-cat fs.sh.in | sed \
- -e 's#@''LOGDIR@#/var/log/cluster#g' \
- > fs.sh.out
- cat: fs.sh.in: No such file or directorychmod +x fs.sh.out
- mv fs.sh.out fs.sh
-
-Add abs_srcdir to fix this.
-
-Upstream-Status: Submitted [https://github.com/ClusterLabs/resource-agents/pull/986]
-
-Signed-off-by: Jackie Huang <jackie.huang@...>
-
----
- rgmanager/src/resources/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rgmanager/src/resources/Makefile.am b/rgmanager/src/resources/Makefile.am
-index de88c69..30b3be9 100644
---- a/rgmanager/src/resources/Makefile.am
-+++ b/rgmanager/src/resources/Makefile.am
-@@ -68,7 +68,7 @@ rngdir = ${CLUSTERDATA}/relaxng
- rng_DATA = $(DTD) $(XSL) $(RESRNG)
-
- $(TARGET):
-- cat $@.in | sed \
-+ cat $(abs_srcdir)/$@.in | sed \
- -e 's#@''LOGDIR@#${LOGDIR}#g' \
- > $@.out
- chmod +x $@.out
diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.0.1.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
similarity index 91%
rename from meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.0.1.bb
rename to meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
index ba00a80..83ef913 100644
--- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.0.1.bb
+++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb
@@ -14,16 +14,16 @@ LICENSE_${PN}-extra = "GPLv3"
LICENSE_${PN}-extra-dbg = "GPLv3"
LICENSE_ldirectord = "GPLv2+"

-SRC_URI = "https://codeload.github.com/ClusterLabs/resource-agents/tar.gz/v${PV};downloadfilename=${BPN}-${PV}.tar.gz \
+SRC_URI = "git://github.com/ClusterLabs/resource-agents \
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://fs.sh-fix-builds-when-srcdir-and-builddir-are-sepera.patch \
"

-SRC_URI[md5sum] = "8530431861e659d4ce2f04afcc4efc03"
-SRC_URI[sha256sum] = "863f83c724bad3a8bcff12b9c8712406c43e010041868826cad7b78fd8cfb9fb"
+SRCREV = "fee181320547365d7f8c88cca2b32801412b933d"
+
+S="${WORKDIR}/git"

LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
@@ -47,6 +47,8 @@ inherit autotools systemd pkgconfig
CACHED_CONFIGUREVARS += " \
ac_cv_path_GREP=grep \
ac_cv_path_TEST=test \
+ ac_cv_path_BASH_SHELL=/bin/bash \
+ ac_cv_path_PYTHON="/usr/bin/env python3" \
"

EXTRA_OECONF += "--disable-fatal-warnings \
--
2.13.3


[meta-cgl][PATCH 13/20] libsocket6-perl: update to 0.29

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

* license checksum changed because they add more info above the license.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../perl/{libsocket6-perl_0.28.bb => libsocket6-perl_0.29.bb} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libsocket6-perl_0.28.bb => libsocket6-perl_0.29.bb} (72%)

diff --git a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
similarity index 72%
rename from meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb
rename to meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
index f76ff22..0d133c6 100644
--- a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.28.bb
+++ b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Perl extensions for IPv6"
HOMEPAGE = "https://metacpan.org/release/Socket6"
SECTION = "libs"
LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://README;beginline=31;md5=aa15b0e3744ac40eaada8738eccd24df"
+LIC_FILES_CHKSUM = "file://README;beginline=43;md5=b2bfcdf2de2e951c8e4ed544e942d8e1"
PR = "r2"

BBCLASSEXTEND = "native"
@@ -10,11 +10,10 @@ BBCLASSEXTEND = "native"
CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
BUILD_CFLAGS += "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"

-SRC_URI = "http://search.cpan.org/CPAN/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV} \
+SRC_URI = "https://cpan.metacpan.org/authors/id/U/UM/UMEMOTO/Socket6-${PV}.tar.gz;name=socket6-perl-${PV} \
file://0001-socket6-perl-fix-configure-error.patch \
"
-SRC_URI[socket6-perl-0.28.md5sum] = "aa8489135a3dbcec6233396e1aeb043b"
-SRC_URI[socket6-perl-0.28.sha256sum] = "bfd49ab99f3197c99285fed4683c4edc06277c1e4453f593e694d7bff0974586"
+SRC_URI[socket6-perl-0.29.sha256sum] = "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114"

S = "${WORKDIR}/Socket6-${PV}"

--
2.13.3


[meta-cgl][PATCH 14/20] libmailtools-perl: update 2.21

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../perl/{libmailtools-perl_2.20.bb => libmailtools-perl_2.21.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libmailtools-perl_2.20.bb => libmailtools-perl_2.21.bb} (74%)

diff --git a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
similarity index 74%
rename from meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb
rename to meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
index dec7979..8bbbde5 100644
--- a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.20.bb
+++ b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "MailTools is a set of Perl modules related to mail applications"
HOMEPAGE = "http://search.cpan.org/dist/MailTools/"
SECTION = "libs"
LICENSE = "Artistic-1.0 | GPL-1.0+"
-LIC_FILES_CHKSUM = "file://lib/Mail/Mailer.pod;beginline=144;md5=641bd171b1aaabba1fc83ac0a98a2d30"
+LIC_FILES_CHKSUM = "file://lib/Mail/Mailer.pod;beginline=150;md5=641bd171b1aaabba1fc83ac0a98a2d30"
DEPENDS = " \
libtest-pod-perl-native \
libtimedate-perl-native \
@@ -18,8 +18,7 @@ BBCLASSEXTEND = "native"
PR = "r2"

SRC_URI = "http://search.cpan.org/CPAN/authors/id/M/MA/MARKOV/MailTools-${PV}.tar.gz"
-SRC_URI[md5sum] = "53e9d35256c3fd7cef0e4a24b15e9512"
-SRC_URI[sha256sum] = "f55606f7a9cc342ee9d5f996e2b6a4c0047e2ee47cd88c3250ecf0d0c5fb3196"
+SRC_URI[sha256sum] = "4ad9bd6826b6f03a2727332466b1b7d29890c8d99a32b4b3b0a8d926ee1a44cb"

S = "${WORKDIR}/MailTools-${PV}"

--
2.13.3


[meta-cgl][PATCH 12/20] libwww-perl: update to 6.43

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../recipes-perl/perl/{libwww-perl_6.36.bb => libwww-perl_6.43.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-perl/perl/{libwww-perl_6.36.bb => libwww-perl_6.43.bb} (66%)

diff --git a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
similarity index 66%
rename from meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb
rename to meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
index 816f4f8..07fadb7 100644
--- a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.36.bb
+++ b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb
@@ -15,9 +15,8 @@ BBCLASSEXTEND = "native"

PR = "r2"

-SRC_URI = "https://cpan.metacpan.org/authors/id/E/ET/ETHER/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}"
-SRC_URI[libwww-perl-6.36.md5sum] = "20062717e4084d2f56d84c7ab4c91ec1"
-SRC_URI[libwww-perl-6.36.sha256sum] = "75c034ab4b37f4b9506dc644300697505582cf9545bcf2e2079e7263f675290a"
+SRC_URI = "https://cpan.metacpan.org/authors/id/O/OA/OALDERS/libwww-perl-${PV}.tar.gz;name=libwww-perl-${PV}"
+SRC_URI[libwww-perl-6.43.sha256sum] = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"

S = "${WORKDIR}/libwww-perl-${PV}"

--
2.13.3


[meta-cgl][PATCH 11/20] linux-yocto: Update the append for 5.x

Jeremy Puhlman
 

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../linux/{linux-yocto_4.%.bbappend => linux-yocto_5.%.bbappend} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename meta-cgl-common/recipes-kernel/linux/{linux-yocto_4.%.bbappend => linux-yocto_5.%.bbappend} (100%)

diff --git a/meta-cgl-common/recipes-kernel/linux/linux-yocto_4.%.bbappend b/meta-cgl-common/recipes-kernel/linux/linux-yocto_5.%.bbappend
similarity index 100%
rename from meta-cgl-common/recipes-kernel/linux/linux-yocto_4.%.bbappend
rename to meta-cgl-common/recipes-kernel/linux/linux-yocto_5.%.bbappend
--
2.13.3


[meta-cgl][PATCH 09/20] monit: Lives in meta-oe now, remove

Jeremy Puhlman
 

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../monit/files/enable-etc-monit.d-include.patch | 9 ----
meta-cgl-common/recipes-cgl/monit/files/init | 42 ---------------
meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb | 59 ----------------------
3 files changed, 110 deletions(-)
delete mode 100644 meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
delete mode 100644 meta-cgl-common/recipes-cgl/monit/files/init
delete mode 100644 meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb

diff --git a/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch b/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
deleted file mode 100644
index 23971a1..0000000
--- a/meta-cgl-common/recipes-cgl/monit/files/enable-etc-monit.d-include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/monitrc 2014-03-27 13:27:21.000000000 +0100
-+++ b/monitrc 2014-03-31 13:12:49.515395387 +0200
-@@ -248,5 +248,5 @@
- ## It is possible to include additional configuration parts from other files or
- ## directories.
- #
--# include /etc/monit.d/*
-+include /etc/monit.d/*
- #
diff --git a/meta-cgl-common/recipes-cgl/monit/files/init b/meta-cgl-common/recipes-cgl/monit/files/init
deleted file mode 100644
index 325a552..0000000
--- a/meta-cgl-common/recipes-cgl/monit/files/init
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# This is an init script for openembedded
-# Copy it to /etc/init.d/monit and type
-# > update-rc.d monit defaults 99
-#
-monit=/usr/bin/monit
-pidfile=/var/run/monit.pid
-monit_args="-c /etc/monitrc"
-
-test -x "$monit" || exit 0
-
-case "$1" in
- start)
- echo -n "Starting Monit"
- start-stop-daemon --start --quiet --exec $monit -- $monit_args
- RETVAL=$?
- echo "."
- ;;
- stop)
- echo -n "Stopping Monit"
- start-stop-daemon --stop --quiet --pidfile $pidfile
- RETVAL=$?
- echo "."
- ;;
- restart)
- $0 stop
- $0 start
- RETVAL=$?
- ;;
- status)
- $monit $monit_args status
- RETVAL=$?
- echo "."
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-exit $RETVAL
-
diff --git a/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
deleted file mode 100644
index 6ec1a21..0000000
--- a/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-SUMMARY = "Monit is a tool used for system monitoring and error recovery"
-DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \
- processes, programs, files, directories and filesystems on a UNIX system. \
- Monit conducts automatic maintenance and repair and can execute meaningful \
- causal actions in error situations. \
- "
-HOMEPAGE = "http://mmonit.com/monit/"
-
-LICENSE = "AGPLv3"
-LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"
-
-DEPENDS = "openssl zlib virtual/crypt"
-
-SRC_URI = "\
- http://mmonit.com/monit/dist/${BP}.tar.gz \
- file://enable-etc-monit.d-include.patch \
- file://init \
- "
-
-SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df"
-SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2"
-
-INITSCRIPT_NAME = "monit"
-INITSCRIPT_PARAMS = "defaults 99"
-
-inherit autotools-brokensep update-rc.d systemd
-
-SYSTEMD_PACKAGES = "${PN}"
-SYSTEMD_SERVICE_${PN} = "monit.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
-PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
-
-EXTRA_OECONF = "\
- libmonit_cv_setjmp_available=no \
- libmonit_cv_vsnprintf_c99_conformant=no \
- --with-ssl-lib-dir=${STAGING_LIBDIR} \
- --with-ssl-incl-dir=${STAGING_INCDIR} \
- "
-
-do_configure_prepend() {
- rm -rf ${S}/m4
-}
-
-do_install_append() {
- install -d ${D}${sysconfdir}/init.d/
- install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/monit
-
- install -m 600 ${S}/monitrc ${D}${sysconfdir}/monitrc
- install -m 700 -d ${D}${sysconfdir}/monit.d/
- sed -i -e 's:# set daemon 120:set daemon 120:' \
- -e 's:include /etc/monit.d/:include /${sysconfdir}/monit.d/:' \
- ${D}${sysconfdir}/monitrc
-
- install -D -m 0644 ${S}/system/startup/monit.service ${D}${systemd_system_unitdir}/monit.service
-}
-
-CONFFILES_${PN} += "${sysconfdir}/monitrc"
--
2.13.3


[meta-cgl][PATCH 10/20] core-image-cgl-*: Move to recipe directory

Jeremy Puhlman
 

* lsb content has been moved out to meta-lsb.
* Configure image to build with or with out lsb image present.
* Add warning about CGL compliance and lsb requirement and option
to squelch warning.

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../{ => recipes-core}/images/core-image-cgl-initramfs.bb | 0
meta-cgl-common/{ => recipes-core}/images/core-image-cgl.bb | 10 +++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
rename meta-cgl-common/{ => recipes-core}/images/core-image-cgl-initramfs.bb (100%)
rename meta-cgl-common/{ => recipes-core}/images/core-image-cgl.bb (54%)

diff --git a/meta-cgl-common/images/core-image-cgl-initramfs.bb b/meta-cgl-common/recipes-core/images/core-image-cgl-initramfs.bb
similarity index 100%
rename from meta-cgl-common/images/core-image-cgl-initramfs.bb
rename to meta-cgl-common/recipes-core/images/core-image-cgl-initramfs.bb
diff --git a/meta-cgl-common/images/core-image-cgl.bb b/meta-cgl-common/recipes-core/images/core-image-cgl.bb
similarity index 54%
rename from meta-cgl-common/images/core-image-cgl.bb
rename to meta-cgl-common/recipes-core/images/core-image-cgl.bb
index 86bf7d4..4a7d4f7 100644
--- a/meta-cgl-common/images/core-image-cgl.bb
+++ b/meta-cgl-common/recipes-core/images/core-image-cgl.bb
@@ -1,6 +1,14 @@
-require recipes-extended/images/core-image-lsb.bb
+require ${@bb.utils.contains("BBFILE_COLLECTIONS", "lsb", "recipes-lsb/images/core-image-lsb.bb", "recipes-core/images/core-image-base.bb", d)}


+LSB_WARN ?= "1"
+python () {
+ lsb_warn = d.getVar("LSB_WARN")
+ if bb.utils.contains("BBFILE_COLLECTIONS", "lsb", "1", "0", d) == "0" and lsb_warn == "1":
+ bb.warn("CGL compliance requires lsb, and meta-lsb is not included.\n" + \
+ "To disable this warning set LSB_WARN='0'")
+}
+
VALGRIND ?= ""
VALGRIND_powerpc ?= "valgrind"
VALGRIND_e500v2 ?= ""
--
2.13.3


[meta-cgl][PATCH 07/20] cluster-glue: Update to current

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

* Fix various mutlilib issues.
* Update python3 issues
* License updates were change of address for FSF

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
.../cluster-glue/0001-Update-for-python3.patch | 260 +++++++++++++++++++++
.../cluster-glue/cluster-glue_1.0.12.bb | 20 +-
2 files changed, 273 insertions(+), 7 deletions(-)
create mode 100644 meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-Update-for-python3.patch

diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-Update-for-python3.patch b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-Update-for-python3.patch
new file mode 100644
index 0000000..e089dc4
--- /dev/null
+++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue/0001-Update-for-python3.patch
@@ -0,0 +1,260 @@
+From 3ac95d9da4e207f5d1db14ecbf9c10c13247dd45 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman <jpuhlman@...>
+Date: Wed, 19 Feb 2020 22:35:51 +0000
+Subject: [PATCH] Update for python3
+
+Upstream-Status: Inappropriate
+---
+ lib/plugins/stonith/external/dracmc-telnet | 10 +++++-----
+ lib/plugins/stonith/external/ibmrsa-telnet | 8 ++++----
+ lib/plugins/stonith/external/riloe | 30 +++++++++++++++---------------
+ lib/plugins/stonith/ribcl.py.in | 20 ++++++++++----------
+ 4 files changed, 34 insertions(+), 34 deletions(-)
+
+diff --git a/lib/plugins/stonith/external/dracmc-telnet b/lib/plugins/stonith/external/dracmc-telnet
+index 78c01453..7fbed86b 100644
+--- a/lib/plugins/stonith/external/dracmc-telnet
++++ b/lib/plugins/stonith/external/dracmc-telnet
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ # vim: set filetype=python
+ #######################################################################
+ #
+@@ -74,7 +74,7 @@ class DracMC(telnetlib.Telnet):
+
+ def _get_timestamp(self):
+ ct = time.time()
+- msecs = (ct - long(ct)) * 1000
++ msecs = (ct - int(ct)) * 1000
+ return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S",
+ time.localtime(ct)), msecs)
+
+@@ -170,7 +170,7 @@ class DracMCStonithPlugin:
+
+ def _get_timestamp(self):
+ ct = time.time()
+- msecs = (ct - long(ct)) * 1000
++ msecs = (ct - int(ct)) * 1000
+ return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S",
+ time.localtime(ct)), msecs)
+
+@@ -200,7 +200,7 @@ class DracMCStonithPlugin:
+ self._parameters['cyclades_port'])
+ c.login(self._parameters['username'],
+ self._parameters['password'])
+- except Exception, args:
++ except Exception as args:
+ if "Connection reset by peer" in str(args):
+ self._echo_debug("Someone is already logged in... retry=%s" % tries)
+ c.close()
+@@ -362,7 +362,7 @@ class DracMCStonithPlugin:
+ func = getattr(self, cmd, self.not_implemented)
+ rc = func()
+ return(rc)
+- except Exception, args:
++ except Exception as args:
+ self.echo_log("err", 'Exception raised:', str(args))
+ if self._connection:
+ self.echo_log("err", self._connection.get_history())
+diff --git a/lib/plugins/stonith/external/ibmrsa-telnet b/lib/plugins/stonith/external/ibmrsa-telnet
+index adb2a3eb..0a3ce3c2 100644
+--- a/lib/plugins/stonith/external/ibmrsa-telnet
++++ b/lib/plugins/stonith/external/ibmrsa-telnet
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python3
+ # vim: set filetype=python
+ #######################################################################
+ #
+@@ -71,7 +71,7 @@ class RSABoard(telnetlib.Telnet):
+
+ def _get_timestamp(self):
+ ct = time.time()
+- msecs = (ct - long(ct)) * 1000
++ msecs = (ct - int(ct)) * 1000
+ return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S",
+ time.localtime(ct)), msecs)
+
+@@ -149,7 +149,7 @@ class RSAStonithPlugin:
+
+ def _get_timestamp(self):
+ ct = time.time()
+- msecs = (ct - long(ct)) * 1000
++ msecs = (ct - int(ct)) * 1000
+ return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S",
+ time.localtime(ct)), msecs)
+
+@@ -305,7 +305,7 @@ class RSAStonithPlugin:
+ func = getattr(self, cmd, self.not_implemented)
+ rc = func()
+ return(rc)
+- except Exception, args:
++ except Exception as args:
+ self.echo_log("err", 'Exception raised:', str(args))
+ if self._connection:
+ self.echo_log("err", self._connection.get_history())
+diff --git a/lib/plugins/stonith/external/riloe b/lib/plugins/stonith/external/riloe
+index 412873f5..370fd57f 100644
+--- a/lib/plugins/stonith/external/riloe
++++ b/lib/plugins/stonith/external/riloe
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ #
+ # Stonith module for RILOE Stonith device
+ #
+@@ -35,7 +35,7 @@ import os
+ import socket
+ import subprocess
+ import xml.dom.minidom
+-import httplib
++import http.client
+ import time
+ import re
+
+@@ -163,12 +163,12 @@ info = {
+ }
+
+ if cmd in info:
+- print info[cmd]
++ print(info[cmd])
+ sys.exit(0)
+
+ if cmd == 'getconfignames':
+ for arg in [ "hostlist", "ilo_hostname", "ilo_user", "ilo_password", "ilo_can_reset", "ilo_protocol", "ilo_powerdown_method", "ilo_proxyhost", "ilo_proxyport"]:
+- print arg
++ print(arg)
+ sys.exit(0)
+
+ if not rihost:
+@@ -257,7 +257,7 @@ def read_resp(node):
+ '''
+ msg = ""
+ str_status = ""
+- for attr in node.attributes.keys():
++ for attr in list(node.attributes.keys()):
+ if attr == A_STATUS:
+ str_status = node.getAttribute(attr)
+ elif attr == A_MSG:
+@@ -285,7 +285,7 @@ def read_power(node):
+ variable correspondingly.
+ '''
+ global power
+- for attr in node.attributes.keys():
++ for attr in list(node.attributes.keys()):
+ if attr == A_POWER_STATE:
+ power_state = node.getAttribute(attr).upper()
+ else:
+@@ -339,18 +339,18 @@ def open_ilo(host):
+ fatal("Error status=: %s" %(response))
+ import ssl
+ sock = ssl.wrap_socket(proxy)
+- h=httplib.HTTPConnection('localhost')
++ h=http.client.HTTPConnection('localhost')
+ h.sock=sock
+ return h
+ else:
+- return httplib.HTTPSConnection(host)
+- except socket.gaierror, msg:
++ return http.client.HTTPSConnection(host)
++ except socket.gaierror as msg:
+ fatal("%s: %s" %(msg,host))
+- except socket.sslerror, msg:
++ except socket.sslerror as msg:
+ fatal("%s for %s" %(msg,host))
+- except socket.error, msg:
++ except socket.error as msg:
+ fatal("%s while talking to %s" %(msg,host))
+- except ImportError, msg:
++ except ImportError as msg:
+ fatal("ssl support missing (%s)" %msg)
+
+ def send_request(req,proc_f):
+@@ -364,7 +364,7 @@ def send_request(req,proc_f):
+ c = open_ilo(rihost)
+ try:
+ c.send(req+'\r\n')
+- except socket.error, msg:
++ except socket.error as msg:
+ fatal("%s, while talking to %s" %(msg,rihost))
+ t_end = time.time()
+ my_debug("request sent in %0.2f s" % ((t_end-t_begin)))
+@@ -377,7 +377,7 @@ def send_request(req,proc_f):
+ if not reply:
+ break
+ result.append(reply)
+- except socket.error, msg:
++ except socket.error as msg:
+ if msg[0] == 6: # connection closed
+ break
+ my_err("%s, while talking to %s" %(msg,rihost))
+@@ -393,7 +393,7 @@ def send_request(req,proc_f):
+ reply = re.sub("<(RIBCL.*)/>", r"<\1>", reply)
+ try:
+ doc = xml.dom.minidom.parseString(reply)
+- except xml.parsers.expat.ExpatError,msg:
++ except xml.parsers.expat.ExpatError as msg:
+ fatal("malformed response: %s\n%s"%(msg,reply))
+ rc = proc_f(doc)
+ doc.unlink()
+diff --git a/lib/plugins/stonith/ribcl.py.in b/lib/plugins/stonith/ribcl.py.in
+index 0733bb24..3533dee3 100644
+--- a/lib/plugins/stonith/ribcl.py.in
++++ b/lib/plugins/stonith/ribcl.py.in
+@@ -1,4 +1,4 @@
+-#!@TRAGET_PYTHON@
++#!/usr/bin/env python3
+
+
+ #
+@@ -18,7 +18,7 @@
+
+ import sys
+ import socket
+-from httplib import *
++from http.client import *
+ from time import sleep
+
+
+@@ -29,7 +29,7 @@ try:
+ host = argv[1].split('.')[0]+'-rm'
+ cmd = argv[2]
+ except IndexError:
+- print "Not enough arguments"
++ print("Not enough arguments")
+ sys.exit(1)
+
+
+@@ -66,7 +66,7 @@ try:
+ else:
+ acmds.append(login + todo[cmd] + logout)
+ except KeyError:
+- print "Invalid command: "+ cmd
++ print("Invalid command: "+ cmd)
+ sys.exit(1)
+
+
+@@ -88,13 +88,13 @@ try:
+ sleep(1)
+
+
+-except socket.gaierror, msg:
+- print msg
++except socket.gaierror as msg:
++ print(msg)
+ sys.exit(1)
+-except socket.sslerror, msg:
+- print msg
++except socket.sslerror as msg:
++ print(msg)
+ sys.exit(1)
+-except socket.error, msg:
+- print msg
++except socket.error as msg:
++ print(msg)
+ sys.exit(1)
+
+--
+2.13.3
+
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 749ce8c..d9df83b 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
@@ -4,8 +4,8 @@ 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"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
- file://COPYING.LIB;md5=243b725d71bb5df4a1e5920b344b86ad \
+LIC_FILES_CHKSUM = "file://COPYING;md5=b70d30a00a451e19d7449d7465d02601 \
+ file://COPYING.LIB;md5=c386bfabdebabbdc1f28e9fde4f4df6d \
"

DEPENDS = "libxml2 libtool glib-2.0 bzip2 util-linux net-snmp openhpi"
@@ -14,14 +14,15 @@ SRC_URI = " \
git://github.com/ClusterLabs/${BPN}.git \
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"

-SRCREV = "1bc77825c0cfb0c80f9c82a061af7ede68676cb4"
+SRCREV = "fd5a3befacd23d056a72cacd2b8ad6bba498e56b"

-inherit autotools useradd pkgconfig systemd
+inherit autotools useradd pkgconfig systemd multilib_script multilib_header

SYSTEMD_SERVICE_${PN} = "logd.service"
SYSTEMD_AUTO_ENABLE = "disable"
@@ -30,6 +31,7 @@ HA_USER = "hacluster"
HA_GROUP = "haclient"

S = "${WORKDIR}/git"
+PV = "1.0.12+git${SRCPV}"

PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_system_unitdir},--without-systemdsystemunitdir,systemd"
@@ -48,6 +50,8 @@ USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER
"
GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}"

+MULTILIB_SCRIPTS = "${PN}:${sbindir}/cibsecret"
+
do_configure_prepend() {
ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml
}
@@ -57,6 +61,8 @@ do_install_append() {
install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue
install -d ${D}${sysconfdir}/tmpfiles.d
install -m 0644 ${WORKDIR}/tmpfiles ${D}${sysconfdir}/tmpfiles.d/${PN}.conf
+
+ oe_multilib_header heartbeat/glue_config.h
}

pkg_postinst_${PN} () {
@@ -86,9 +92,9 @@ PACKAGES =+ "\
${PN}-plugin-interfacemgr-dbg \
${PN}-plugin-interfacemgr-staticdev \
${PN}-lrmtest \
- ${PN}-plugin-compress \
- ${PN}-plugin-compress-dbg \
- ${PN}-plugin-compress-staticdev \
+ ${PN}-plugin-compress \
+ ${PN}-plugin-compress-dbg \
+ ${PN}-plugin-compress-staticdev \
"

FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\
--
2.13.3


[meta-cgl][PATCH 06/20] pacemaker: fix depend issues for py2 removal

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
index df02f40..3a8db77 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
@@ -11,7 +11,7 @@ HOMEPAGE = "http://www.clusterlabs.org"
LICENSE = "GPLv2+ & LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=000212f361a81b100d9d0f0435040663"

-DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python-native"
+DEPENDS = "corosync libxslt libxml2 gnutls resource-agents libqb python3-native"

SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=1.1 \
file://0001-pacemaker-fix-xml-config.patch \
@@ -95,7 +95,7 @@ FILES_${PN} += " ${datadir}/snmp \
${libdir}/${PYTHON_DIR}/site-packages \
"
FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug"
-RDEPENDS_${PN} = "bash python perl libqb ${PN}-cli-utils"
+RDEPENDS_${PN} = "bash python3-core perl libqb ${PN}-cli-utils"

SYSTEMD_AUTO_ENABLE = "disable"

--
2.13.3


[meta-cgl][PATCH 04/20] pacemaker: fix parse errors due to python2 removal

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
index feed53d..df02f40 100644
--- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
+++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_1.1.21.bb
@@ -30,7 +30,7 @@ SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc

SRCREV = "f14e36fd4336874705b34266c7cddbe12119106c"

-inherit autotools-brokensep pkgconfig systemd python-dir useradd
+inherit autotools-brokensep pkgconfig systemd python3-dir useradd

S = "${WORKDIR}/git"

--
2.13.3


[meta-cgl][PATCH 03/20] crmsh: fix parse errors due to python2 removal

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
index 040b4d3..6d2902c 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_3.0.3.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/ClusterLabs/${BPN}.git;branch=crmsh-3.0 \

SRCREV = "41845ca5511b844593cf25ae4eb7f307aa78c5be"

-inherit autotools-brokensep distutils-base
+inherit autotools-brokensep distutils3-base

export HOST_SYS
export BUILD_SYS
--
2.13.3


[meta-cgl][PATCH 05/20] cluster-glue: fix depend issues for py2 removal

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb | 4 ++--
1 file changed, 2 insertions(+), 2 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 e0aa2b1..749ce8c 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
@@ -137,6 +137,6 @@ FILES_${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/"

RDEPENDS_${PN} += "perl"
RDEPENDS_${PN}-plugin-stonith2 += "bash"
-RDEPENDS_${PN}-plugin-stonith-external += "bash python perl"
-RDEPENDS_${PN}-plugin-stonith2-ribcl += "python"
+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"
--
2.13.3


[meta-cgl][PATCH 01/20] monit: upgrade 5.25.2 -> 5.26.0

Jeremy Puhlman
 

From: Changqing Li <changqing.li@...>

Signed-off-by: Changqing Li <changqing.li@...>
Signed-off-by: Adrian Dudau <adrian.dudau@...>
---
.../recipes-cgl/monit/{monit_5.25.2.bb => monit_5.26.0.bb} | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-cgl-common/recipes-cgl/monit/{monit_5.25.2.bb => monit_5.26.0.bb} (90%)

diff --git a/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
similarity index 90%
rename from meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
rename to meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
index ab9e922..6ec1a21 100644
--- a/meta-cgl-common/recipes-cgl/monit/monit_5.25.2.bb
+++ b/meta-cgl-common/recipes-cgl/monit/monit_5.26.0.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://mmonit.com/monit/"
LICENSE = "AGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51"

-DEPENDS = "openssl zlib"
+DEPENDS = "openssl zlib virtual/crypt"

SRC_URI = "\
http://mmonit.com/monit/dist/${BP}.tar.gz \
@@ -17,8 +17,8 @@ SRC_URI = "\
file://init \
"

-SRC_URI[md5sum] = "890df599d6c1e9cfbbdd3edbacb7db81"
-SRC_URI[sha256sum] = "aa0ce6361d1155e43e30a86dcff00b2003d434f221c360981ced830275abc64a"
+SRC_URI[md5sum] = "9f7dc65e902c103e4c5891354994c3df"
+SRC_URI[sha256sum] = "87fc4568a3af9a2be89040efb169e3a2e47b262f99e78d5ddde99dd89f02f3c2"

INITSCRIPT_NAME = "monit"
INITSCRIPT_PARAMS = "defaults 99"
--
2.13.3


[meta-cgl][PATCH 02/20] Add zeus to compat list

Jeremy Puhlman
 

From: Jeremy Puhlman <jpuhlman@...>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@...>
---
meta-cgl-common/conf/layer.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-cgl-common/conf/layer.conf b/meta-cgl-common/conf/layer.conf
index 894d6c4..de64205 100644
--- a/meta-cgl-common/conf/layer.conf
+++ b/meta-cgl-common/conf/layer.conf
@@ -13,6 +13,6 @@ BBFILE_PRIORITY_cgl-common = "7"

LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux"

-LAYERSERIES_COMPAT_cgl-common = "warrior"
+LAYERSERIES_COMPAT_cgl-common = "warrior zeus"

require conf/distro/include/cgl_common_security_flags.inc
--
2.13.3


Re: What are the key factors for yocto build speed?

Ross Burton <ross@...>
 

On 18/03/2020 14:09, Mike Looijmans wrote:
Harddisk speed has very little impact on your build time. It helps with the "setscene" parts, but doesn't affect actual compile time at all. I recall someone did a build from RAM disks only on a rig, and it was only about 1 minute faster on a one hour build compared to rotating disks.
My build machine has lots of RAM and I do builds in a 32GB tmpfs with rm_work (and no, I don't build webkit, which would make this impractical).

As you say, with sufficient RAM the build speed is practically the same as on disks due to the caching (especially if you tune the mount options), so I'd definitely spend money on more RAM instead of super-fast disks. I just prefer doing tmpfs builds because it saves my spinning rust. :)

Ross

8961 - 8980 of 57800