Date   

Minutes: Yocto Project Weekly Triage Meeting 10/28/2021

Trevor Gamblin
 

Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage

Attendees: Alexandre, Anuj, Armin, Joshua, Kiran, Randy, Richard, Saul, Stephen, Steve, Tim, Trevor

ARs:

- Everyone to review Old Milestone bugs and move to 3.5 milestones as necessary

- Richard to add guidance to Bug # 14613

Notes:

N/A

Medium+ 3.5 Unassigned Enhancements/Bugs: 81 (Last week 13; 3.4 bugs merged to this list)

Medium+ 3.99 Unassigned Enhancements/Bugs: 39 (No change)

AB Bugs: 62 (Last week 63)


Re: [Automated-testing] BusyBox pTest failure

Khem Raj
 



On Wed, Oct 27, 2021 at 1:40 PM Richard Purdie <richard.purdie@...> wrote:
On Wed, 2021-10-27 at 16:22 +0530, rpaluri@... wrote:
> Hi,
>     We are executing busybox pTests and we see that the test case execution
> stops at md5sum test case.
> We analyzed and see that the execution gets stuck here at Line no 29.
>  
> Below are the relevant code lines:
> Line no. 28: text="The quick brown fox jumps over the lazy dog"
> Line no. 29: text=`yes "$text" | head -c 9999`
>  
> I executed above two lines on my host machine and the I get the shell prompt
> back but when executed on target machine, I’m not getting the shell prompt, it
> gets stuck.
> /usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"
> /usr/lib/busybox/ptest # text=`yes “$text” | head -c 9999`
> <<get stuck here indefinitely and I don’t get the shell prompt>>
>  
> I modified Line no. 29 as below (removed “ around $text) and the test case
> execution proceeds further with “yes: Broken Pipe” error. With the same
> modification, I don’t see this error on my host machine though.
> Line no. 29: text=`yes $text | head -c 9999`
>  
> /usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"
> /usr/lib/busybox/ptest # text=`yes $text | head -c 9999`
> yes: Broken pipe
>  
> My host machine uses Bash as my default shell where as my target uses busybox
> sh as my default shell. Does this make any difference?
> Any pointers on this will be appreciated.
>

The shell the test is run under could make a difference, it is probably supposed
to be running under busybox's own sh. I think we put the busybox utils into PATH
in the ptest to try and ensure this is the case but you'd have to double check
that.

It seems odd you're hitting that as I'd assume we run the busybox ptests
ourselves and don't see a hang...

It’s also good to post your build configuration that bitbake prints at the beginning of build this could also be other policies like default libc being musl vs glibc is in play etc 


Cheers,

Richard






Re: [Automated-testing] BusyBox pTest failure

Richard Purdie
 

On Wed, 2021-10-27 at 16:22 +0530, rpaluri@codeaurora.org wrote:
Hi,
    We are executing busybox pTests and we see that the test case execution
stops at md5sum test case.
We analyzed and see that the execution gets stuck here at Line no 29.
 
Below are the relevant code lines:
Line no. 28: text="The quick brown fox jumps over the lazy dog"
Line no. 29: text=`yes "$text" | head -c 9999`
 
I executed above two lines on my host machine and the I get the shell prompt
back but when executed on target machine, I’m not getting the shell prompt, it
gets stuck.
/usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"
/usr/lib/busybox/ptest # text=`yes “$text” | head -c 9999`
<<get stuck here indefinitely and I don’t get the shell prompt>>
 
I modified Line no. 29 as below (removed “ around $text) and the test case
execution proceeds further with “yes: Broken Pipe” error. With the same
modification, I don’t see this error on my host machine though.
Line no. 29: text=`yes $text | head -c 9999`
 
/usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"
/usr/lib/busybox/ptest # text=`yes $text | head -c 9999`
yes: Broken pipe
 
My host machine uses Bash as my default shell where as my target uses busybox
sh as my default shell. Does this make any difference?
Any pointers on this will be appreciated.
The shell the test is run under could make a difference, it is probably supposed
to be running under busybox's own sh. I think we put the busybox utils into PATH
in the ptest to try and ensure this is the case but you'd have to double check
that.

It seems odd you're hitting that as I'd assume we run the busybox ptests
ourselves and don't see a hang...

Cheers,

Richard


[meta-selinux][dunfell][PATCH 3/3] libselinux: Fix restorecon_set_sehandle.patch context

Jason Andryuk
 

0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch added
in commit d6ff5a0e67af "libselinux: Backport NULL pointer fix from 3.1"
fails to apply because there is a extra level in the patch context.
The patch cannot apply and do_patch fails. Fix the context so it builds
again.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
...-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch b/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
index 8a9fb7c..f392f68 100644
--- a/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
+++ b/recipes-security/selinux/libselinux/0001-Fix-NULL-pointer-use-in-selinux_restorecon_set_sehandle.patch
@@ -17,8 +17,8 @@ Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>

diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
index d1ce830c5..6993be6fd 100644
---- a/libselinux/src/selinux_restorecon.c
-+++ b/libselinux/src/selinux_restorecon.c
+--- libselinux/src/selinux_restorecon.c
++++ libselinux/src/selinux_restorecon.c
@@ -1154,6 +1154,8 @@ void selinux_restorecon_set_sehandle(struct selabel_handle *hndl)
size_t num_specfiles, fc_digest_len;

--
2.31.1


[meta-selinux][dunfell][PATCH 2/3] Remove e2fsprogs override

Jason Andryuk
 

commit b2b3ea27e3e3 "e2fsprogs: Superseded by upstream." removed
lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch from SRC_URI. It was
no longer applied, but the file was not deleted. Do that now.

e2fsprogs_%.bbappend/e2fsprogs_selinux.inc now do nothing, so remove
them as well.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
.../e2fsprogs/e2fsprogs_%.bbappend | 1 -
.../e2fsprogs/e2fsprogs_selinux.inc | 1 -
...t2fs-ext2_ext_attr.h-add-xattr-index.patch | 20 -------------------
3 files changed, 22 deletions(-)
delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
delete mode 100644 recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch

diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
deleted file mode 100644
index 7719d3b..0000000
--- a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)}
diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
deleted file mode 100644
index 81fe7b7..0000000
--- a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
+++ /dev/null
@@ -1 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
diff --git a/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch b/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch
deleted file mode 100644
index b87c414..0000000
--- a/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Add xattr name index for xattrs with the 'security' prefix. These are defined
-in the ext(2|3|4)/xattr.h in the kernel. We use the EXT2 prefix for consistency
-with e2fslibs naming.
-
-Signed-off-by: Philip Tricca <flihp@twobit.us>
-
-Index: e2fsprogs-1.42.9/lib/ext2fs/ext2_ext_attr.h
-===================================================================
---- e2fsprogs-1.42.9.orig/lib/ext2fs/ext2_ext_attr.h
-+++ e2fsprogs-1.42.9/lib/ext2fs/ext2_ext_attr.h
-@@ -15,6 +15,9 @@
- /* Maximum number of references to one attribute block */
- #define EXT2_EXT_ATTR_REFCOUNT_MAX 1024
-
-+/* Name indexes */
-+#define EXT2_XATTR_INDEX_SECURITY 6
-+
- struct ext2_ext_attr_header {
- __u32 h_magic; /* magic number for identification */
- __u32 h_refcount; /* reference count */
--
2.31.1


[meta-selinux][dunfell][PATCH 1/3] e2fsprogs: Remove misc_create_inode.c-label_rootfs.patch

Jason Andryuk
 

An equivalent patch was merged into 1.45.7: commit 7616fd6a599e
"create_inode: set xattrs to the root directory as well". The existing
one still applies and actualy breaks building because of duplicate
lables. Remove it.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
---
.../e2fsprogs/e2fsprogs_selinux.inc | 2 -
.../misc_create_inode.c-label_rootfs.patch | 45 -------------------
2 files changed, 47 deletions(-)
delete mode 100644 recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch

diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
index 9cbb7fe..81fe7b7 100644
--- a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
+++ b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
@@ -1,3 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://misc_create_inode.c-label_rootfs.patch"
diff --git a/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch b/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
deleted file mode 100644
index 046e521..0000000
--- a/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Philip Tricca <flihp@twobit.us>
-To: tytso@mit.edu
-Cc: liezhi.yang@windriver.com
-Date: Sat, 20 Feb 2016 18:58:58 +0000
-Subject: [PATCH] misc/create_inode.c: Copy xattrs from root directory when populating fs.
-
-When copying a file system using the -d option the xattrs from the root
-directory need to be copied before the populate_fs recusion starts.
-
-Signed-off-by: Philip Tricca <flihp@twobit.us>
-Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
-
----
- misc/create_inode.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/misc/create_inode.c b/misc/create_inode.c
-index a7b6d348..cfd15922 100644
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -979,6 +979,13 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
- return retval;
- }
-
-+ retval = set_inode_xattr(fs, root, source_dir);
-+ if (retval) {
-+ com_err(__func__, retval,
-+ _("while setting xattrs for \"%s\""), source_dir);
-+ goto out;
-+ }
-+
- file_info.path_len = 0;
- file_info.path_max_len = 255;
- file_info.path = calloc(file_info.path_max_len, 1);
-@@ -987,6 +994,7 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
- &file_info, fs_callbacks);
-
- free(file_info.path);
-+out:
- free(hdlinks.hdl);
- return retval;
- }
---
-2.11.1
-
--
2.31.1


[meta-selinux][dunfell][PATCH 0/3] Fix dunfell build

Jason Andryuk
 

meta-selinux fails to build libselinux and e2fsprogs. These patches
fix that and then removes the unused e2fsprogs overrides.

Jason Andryuk (3):
e2fsprogs: Remove misc_create_inode.c-label_rootfs.patch
Remove e2fsprogs override
libselinux: Fix restorecon_set_sehandle.patch context

.../e2fsprogs/e2fsprogs_%.bbappend | 1 -
.../e2fsprogs/e2fsprogs_selinux.inc | 3 --
...t2fs-ext2_ext_attr.h-add-xattr-index.patch | 20 ---------
.../misc_create_inode.c-label_rootfs.patch | 45 -------------------
...e-in-selinux_restorecon_set_sehandle.patch | 4 +-
5 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend
delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
delete mode 100644 recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch
delete mode 100644 recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch

--
2.31.1


[PATCH yocto-autobuilder-helper] scripts: run-docs-build: patch yocto-3.3 and 3.4 releases

Quentin Schulz
 

Both releases are missing an important patch that changes the displayed
version from dev to the appropriate release number.

This is confusing to the user and probably breaks some assumptions in
some scripts.

Ideally, the tags should have been moved with those patches applied to
their respective branch but that is not a git best practice so we're
stuck with this "hack" instead.

3.3.x releases aren't impacted as they got the patch applied.

Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---

Not tested.

scripts/run-docs-build | 8 +++
.../0001-conf-update-for-release.patch | 48 +++++++++++++++++
.../0001-conf-update-for-release.patch | 54 +++++++++++++++++++
3 files changed, 110 insertions(+)
create mode 100644 scripts/yocto-3.3/0001-conf-update-for-release.patch
create mode 100644 scripts/yocto-3.4/0001-conf-update-for-release.patch

diff --git a/scripts/run-docs-build b/scripts/run-docs-build
index b2828e3..76693a7 100755
--- a/scripts/run-docs-build
+++ b/scripts/run-docs-build
@@ -7,6 +7,7 @@ ypdocs=$2/documentation/
bbdocs=$3/doc/
docs_buildtools=/srv/autobuilder/autobuilder.yoctoproject.org/pub/buildtools/x86_64-buildtools-docs-nativesdk-standalone-3.2+snapshot-20201105.sh
outputdir=$builddir/output
+scriptdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"


cd $builddir
@@ -84,6 +85,13 @@ for tag in $(git tag --list 'yocto-*'); do
if [ "$first" = "$v_sphinx" ]; then
cd $ypdocs
git checkout $tag
+ # yocto-3.3 and yocto-3.4 were tagged before the current_version in
+ # conf.py was changed resulting in sphinx believing these are
+ # development branches which breaks all sorts of assumptions. Moving a
+ # tag isn't best practice so we just patch the releases here instead.
+ if [ "$tag" = "yocto-3.3" ] || [ "$tag" = "yocto-3.4" ]; then
+ git am "${scriptdir}/${tag}/0001-conf-update-for-release.patch"
+ fi
make clean
make publish
version=$(echo $tag | cut -c7-)
diff --git a/scripts/yocto-3.3/0001-conf-update-for-release.patch b/scripts/yocto-3.3/0001-conf-update-for-release.patch
new file mode 100644
index 0000000..79b4cde
--- /dev/null
+++ b/scripts/yocto-3.3/0001-conf-update-for-release.patch
@@ -0,0 +1,48 @@
+From 02f6e97894aa768ca1a7546646c35a175aca9a33 Mon Sep 17 00:00:00 2001
+From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
+Date: Fri, 1 Oct 2021 17:21:48 +0200
+Subject: [PATCH] conf: update for release 3.3
+
+conf.py:
+* set version to 3.3
+
+switchers.js:
+* add 3.3 release
+* update 'dev' to 3.4
+
+Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
+---
+ documentation/conf.py | 2 +-
+ documentation/sphinx-static/switchers.js | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/documentation/conf.py b/documentation/conf.py
+index 5a2e25f7b..ab1b2b14c 100644
+--- a/documentation/conf.py
++++ b/documentation/conf.py
+@@ -16,7 +16,7 @@ import os
+ import sys
+ import datetime
+
+-current_version = "dev"
++current_version = "3.3"
+
+ # String used in sidebar
+ version = 'Version: ' + current_version
+diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js
+index 7a4edc9e7..96efab2e8 100644
+--- a/documentation/sphinx-static/switchers.js
++++ b/documentation/sphinx-static/switchers.js
+@@ -2,7 +2,8 @@
+ 'use strict';
+
+ var all_versions = {
+- 'dev': 'dev (3.3)',
++ 'dev': 'dev (3.4)',
++ '3.3': '3.3',
+ '3.2.3': '3.2.3',
+ '3.1.6': '3.1.6',
+ '3.0.4': '3.0.4',
+--
+2.31.1
+
diff --git a/scripts/yocto-3.4/0001-conf-update-for-release.patch b/scripts/yocto-3.4/0001-conf-update-for-release.patch
new file mode 100644
index 0000000..a940eb0
--- /dev/null
+++ b/scripts/yocto-3.4/0001-conf-update-for-release.patch
@@ -0,0 +1,54 @@
+From f6dcef2532c741c8b3ad251152b45e4079062ee3 Mon Sep 17 00:00:00 2001
+From: Quentin Schulz <quentin.schulz@theobroma-systems.com>
+Date: Thu, 21 Oct 2021 10:36:37 +0200
+Subject: [PATCH] [honister] conf: update for release 3.4
+
+conf.py:
+* set version to 3.4
+
+switchers.js:
+* add 3.4 release
+* update 'dev' to 3.5
+
+Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
+---
+
+Not tested + Assumed to be enough
+No need to wait for the new release as the honister branch will be
+integrated in the docs only when tagged but let's make sure we don't
+forget to do this change before tagging a release.
+
+ documentation/conf.py | 2 +-
+ documentation/sphinx-static/switchers.js | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/documentation/conf.py b/documentation/conf.py
+index 8e0847938..104b49ea0 100644
+--- a/documentation/conf.py
++++ b/documentation/conf.py
+@@ -16,7 +16,7 @@ import os
+ import sys
+ import datetime
+
+-current_version = "dev"
++current_version = "3.4"
+
+ # String used in sidebar
+ version = 'Version: ' + current_version
+diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js
+index 1e37b625a..6038dbb5a 100644
+--- a/documentation/sphinx-static/switchers.js
++++ b/documentation/sphinx-static/switchers.js
+@@ -2,7 +2,8 @@
+ 'use strict';
+
+ var all_versions = {
+- 'dev': 'dev (3.4)',
++ 'dev': 'dev (3.5)',
++ '3.4': '3.4',
+ '3.3.3': '3.3.3',
+ '3.2.4': '3.2.4',
+ '3.1.11': '3.1.11',
+--
+2.31.1
+
--
2.31.1


[PATCH yocto-autobuilder-helper] scripts: run-docs-build: build latest BB and YP releases

Quentin Schulz
 

honister and 1.52 Bitbake branch were recently released, so let's build
those too.

Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
---
scripts/run-docs-build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/run-docs-build b/scripts/run-docs-build
index 76693a7..3db4a97 100755
--- a/scripts/run-docs-build
+++ b/scripts/run-docs-build
@@ -35,7 +35,7 @@ mkdir $outputdir/bitbake/next
cp -r ./_build/final/* $outputdir/bitbake/next

# stable branches
-for branch in 1.46 1.48 1.50; do
+for branch in 1.46 1.48 1.50 1.52; do
git checkout $branch
make clean
make publish
@@ -68,7 +68,7 @@ mkdir $outputdir/next
cp -r ./_build/final/* $outputdir/next

# stable branches
-for branch in dunfell gatesgarth hardknott; do
+for branch in dunfell gatesgarth hardknott honister; do
cd $ypdocs
git checkout $branch
make clean
--
2.31.1


BusyBox pTest failure

rpaluri@...
 

Hi,

    We are executing busybox pTests and we see that the test case execution stops at md5sum test case.

We analyzed and see that the execution gets stuck here at Line no 29.

 

Below are the relevant code lines:

Line no. 28: text="The quick brown fox jumps over the lazy dog"

Line no. 29: text=`yes "$text" | head -c 9999`

 

I executed above two lines on my host machine and the I get the shell prompt back but when executed on target machine, I’m not getting the shell prompt, it gets stuck.

/usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"

/usr/lib/busybox/ptest # text=`yes “$text” | head -c 9999`

<<get stuck here indefinitely and I don’t get the shell prompt>>

 

I modified Line no. 29 as below (removed “ around $text) and the test case execution proceeds further with “yes: Broken Pipe” error. With the same modification, I don’t see this error on my host machine though.

Line no. 29: text=`yes $text | head -c 9999`

 

/usr/lib/busybox/ptest # text="The quick brown fox jumps over the lazy dog"

/usr/lib/busybox/ptest # text=`yes $text | head -c 9999`

yes: Broken pipe

 

My host machine uses Bash as my default shell where as my target uses busybox sh as my default shell. Does this make any difference?

Any pointers on this will be appreciated.

 

Thanks,

Ravi

 


Re: [meta-cgl][PATCH 1/2] crmsh: fix deprecation on collections.MutableSet

Jeremy Puhlman
 

Series merged. Thanks.

On 10/26/2021 12:45 AM, Yi Zhao wrote:
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'

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
...x-deprecation-on-collections.Mutable.patch | 52 +++++++++++++++++++
.../recipes-cgl/crmsh/crmsh_4.3.1.bb | 1 +
2 files changed, 53 insertions(+)
create mode 100644 meta-cgl-common/recipes-cgl/crmsh/crmsh/0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch

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.3.1.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
index 75e720b..0b6ecd3 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
@@ -15,6 +15,7 @@ RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash python3-doct
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
file://tweaks_for_build.patch \
+ file://0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch \
"
SRCREV = "00ec69054edecd068deda54c6184c0385d90ebd2"


[meta-selinux][PATCH] sysvinit: sync bbappend to 3.0

Yi Zhao
 

The sysvinit in oe-core has been upgraded to 3.0. Update the bbappend to
adapt it.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../{sysvinit_2.9%.bbappend => sysvinit_3.%.bbappend} | 0
recipes-core/sysvinit/sysvinit_selinux.inc | 4 ----
2 files changed, 4 deletions(-)
rename recipes-core/sysvinit/{sysvinit_2.9%.bbappend => sysvinit_3.%.bbappend} (100%)

diff --git a/recipes-core/sysvinit/sysvinit_2.9%.bbappend b/recipes-core/sysvinit/sysvinit_3.%.bbappend
similarity index 100%
rename from recipes-core/sysvinit/sysvinit_2.9%.bbappend
rename to recipes-core/sysvinit/sysvinit_3.%.bbappend
diff --git a/recipes-core/sysvinit/sysvinit_selinux.inc b/recipes-core/sysvinit/sysvinit_selinux.inc
index 480bde7..1bdca98 100644
--- a/recipes-core/sysvinit/sysvinit_selinux.inc
+++ b/recipes-core/sysvinit/sysvinit_selinux.inc
@@ -1,7 +1,3 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-B = "${S}"
-
inherit selinux

DEPENDS += "${LIBSELINUX}"
--
2.25.1


[meta-security][PATCH] tpm2-openssl: add new pkg

Armin Kuster
 

openssl 3.x support for tpm2 tss function found in tpm2-ssl

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb

diff --git a/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb b/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb
new file mode 100644
index 0000000..f6a694c
--- /dev/null
+++ b/meta-tpm/recipes-tpm2/tpm2-openssl/tpm2-openssl_1.0.bb
@@ -0,0 +1,11 @@
+SUMMARY = "Provider for integration of TPM 2.0 to OpenSSL 3.0"
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b75785ac083d3c3ca04d99d9e4e1fbab"
+
+SRC_URI = "git://github.com/tpm2-software/tpm2-openssl.git;protocol=https;branch=master"
+
+SRCREV = "66e34f9e45c3697590cced1e4d3f35993a822f8b"
+
+S = "${WORKDIR}/git"
+
+inherit pkgconfig
--
2.25.1


Yocto Project Status WW43`21

Stephen Jolley
 

Current Dev Position: YP 3.5 M1

Next Deadline: 6th Dec. 2021 YP 3.5 M1 build

 

Next Team Meetings:

 

Key Status/Updates:

  • YP 3.4 has been released. Thanks to everyone who contributed!
  • YP 3.5 Planning document: https://docs.google.com/document/d/1OXw-NKoL_Vb9RWI6sRPs3zTcAn4hHPtG0Y2BIs7xIzo/edit?usp=sharing
  • Patches to master are continuing to merge including a large number of version upgrades this week.
  • We have 1,288 patches in OE-Core, a third of those are marked as “Pending”. Help in determining what to do with those would be most welcome. Richard cleaned up and submitted a batch of 12 to the libtool project this week as an example of what can be done. Several gcc patches could be dropped or merged too.
  • Intermittent issues continue to rise, particularly with some seemingly network related gremlin somewhere. Help is very much welcome on these issues. You can see the list of failures we’re continuing to see by searching for the “AB-INT” tag in bugzilla: https://bugzilla.yoctoproject.org/buglist.cgi?quicksearch=AB-INT

 

Ways to contribute:

 

YP 3.5 Milestone Dates:

  • YP 3.5 M1 build date 2021/12/06
  • YP 3.5 M1 Release date 2021/12/17
  • YP 3.5 M2 build date 2022/01/10
  • YP 3.5 M2 Release date 2022/1/21
  • YP 3.5 M3 build date 2022/2/21
  • YP 3.5 M3 Release date 2022/03/04
  • YP 3.5 M4 build date 2022/04/04
  • YP 3.5 M4 Release date 2022/04/29

 

Proposed upcoming dot releases:

  • YP 3.3.4 build date 2021/11/01
  • YP 3.3.4 Release date 2021/11/12
  • YP 3.1.12 build date 2021/11/15
  • YP 3.1.12 Release date 2021/11/26
  • YP 3.4.1 build date 2021/11/22
  • YP 3.4.1 Release date 2021/12/03
  • YP 3.1.13 build date 2021/12/13
  • YP 3.1.13 Release date 2021/12/22
  • YP 3.1.14 build date 2022/01/24
  • YP 3.1.14 Release date 2022/02/04
  • YP 3.4.2 build date 2022/02/07
  • YP 3.4.2 Release date 2022/02/18
  • YP 3.1.15 build date 2022/03/14
  • YP 3.1.15 Release date 2022/03/25
  • YP 3.4.3 build date 2022/03/21
  • YP 3.4.3 Release date 2022/04/01
  • YP 3.1.16 build date 2022/04/25
  • YP 3.1.16 Release date 2022/05/06

 

Tracking Metrics:

 

The Yocto Project’s technical governance is through its Technical Steering Committee, more information is available at:

https://wiki.yoctoproject.org/wiki/TSC

 

The Status reports are now stored on the wiki at: https://wiki.yoctoproject.org/wiki/Weekly_Status

 

[If anyone has suggestions for other information you’d like to see on this weekly status update, let us know!]

 

Thanks,

 

Stephen K. Jolley

Yocto Project Program Manager

(    Cell:                (208) 244-4460

* Email:              sjolley.yp.pm@...

 


[meta-security][PATCH 4/4] openssl-tpm-engine: fix build issue with openssl 3

Armin Kuster
 

ERROR: openssl-tpm-engine-0.5.0-r0 do_package: QA Issue: openssl-tpm-engine: Files/directories were installed but not shipped in any package:
/usr/lib/engines-3/tpm.so

fix engine locations

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb b/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
index 9ad8967..dab1589 100644
--- a/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
+++ b/meta-tpm/recipes-tpm/openssl-tpm-engine/openssl-tpm-engine_0.5.0.bb
@@ -46,17 +46,17 @@ do_configure:prepend() {
touch NEWS AUTHORS ChangeLog README
}

-FILES:${PN}-staticdev += "${libdir}/ssl/engines-1.1/tpm.la"
+FILES:${PN}-staticdev += "${libdir}/ssl/engines-3/tpm.la"
FILES:${PN}-dbg += "\
- ${libdir}/ssl/engines-1.1/.debug \
- ${libdir}/engines-1.1/.debug \
- ${prefix}/local/ssl/lib/engines-1.1/.debug \
+ ${libdir}/ssl/engines-3/.debug \
+ ${libdir}/engines-3/.debug \
+ ${prefix}/local/ssl/lib/engines-3/.debug \
"
FILES:${PN} += "\
- ${libdir}/ssl/engines-1.1/tpm.so* \
- ${libdir}/engines-1.1/tpm.so* \
+ ${libdir}/ssl/engines-3/tpm.so* \
+ ${libdir}/engines-3/tpm.so* \
${libdir}/libtpm.so* \
- ${prefix}/local/ssl/lib/engines-1.1/tpm.so* \
+ ${prefix}/local/ssl/lib/engines-3/tpm.so* \
"

RDEPENDS:${PN} += "libcrypto libtspi"
--
2.25.1


[meta-security][PATCH 3/4] tpm2-tools: update to 5.2

Armin Kuster
 

openssl 3.0 support

see https://github.com/tpm2-software/tpm2-tools/releases/tag/5.2

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../tpm2-tools/{tpm2-tools_5.0.bb => tpm2-tools_5.2.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-tpm/recipes-tpm2/tpm2-tools/{tpm2-tools_5.0.bb => tpm2-tools_5.2.bb} (81%)

diff --git a/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.0.bb b/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb
similarity index 81%
rename from meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.0.bb
rename to meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb
index dbd324a..6e95a0e 100644
--- a/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.0.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_5.2.bb
@@ -8,6 +8,6 @@ DEPENDS = "tpm2-abrmd tpm2-tss openssl curl autoconf-archive"

SRC_URI = "https://github.com/tpm2-software/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.gz"

-SRC_URI[sha256sum] = "e1b907fe29877628052e08ad84eebc6c3f7646d29505ed4862e96162a8c91ba1"
+SRC_URI[sha256sum] = "c0b402f6a7b3456e8eb2445211e2d41c46c7e769e05fe4d8909ff64119f7a630"

inherit autotools pkgconfig bash-completion
--
2.25.1


[meta-security][PATCH 2/4] apparmor: Add a python 3.10 compatability patch

Armin Kuster
 

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
recipes-mac/AppArmor/apparmor_3.0.1.bb | 4 +--
recipes-mac/AppArmor/files/py3_10_fixup.patch | 35 +++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
create mode 100644 recipes-mac/AppArmor/files/py3_10_fixup.patch

diff --git a/recipes-mac/AppArmor/apparmor_3.0.1.bb b/recipes-mac/AppArmor/apparmor_3.0.1.bb
index dca53a3..389e72a 100644
--- a/recipes-mac/AppArmor/apparmor_3.0.1.bb
+++ b/recipes-mac/AppArmor/apparmor_3.0.1.bb
@@ -16,15 +16,15 @@ DEPENDS = "bison-native apr gettext-native coreutils-native swig-native"
SRC_URI = " \
git://gitlab.com/apparmor/apparmor.git;protocol=https;branch=apparmor-3.0 \
file://run-ptest \
- file://disable_perl_h_check.patch \
file://crosscompile_perl_bindings.patch \
file://0001-Makefile.am-suppress-perllocal.pod.patch \
file://0001-Revert-profiles-Update-make-check-to-select-tools-ba.patch \
file://0001-Makefile-fix-hardcoded-installation-directories.patch \
file://0001-rc.apparmor.debian-add-missing-functions.patch \
+ file://py3_10_fixup.patch \
"

-SRCREV = "b0f08aa9d678197b8e3477c2fbff790f50a1de5e"
+SRCREV = "b23de501807b8b5793e9654da8688b5fd3281154"
S = "${WORKDIR}/git"

PARALLEL_MAKE = ""
diff --git a/recipes-mac/AppArmor/files/py3_10_fixup.patch b/recipes-mac/AppArmor/files/py3_10_fixup.patch
new file mode 100644
index 0000000..05f8460
--- /dev/null
+++ b/recipes-mac/AppArmor/files/py3_10_fixup.patch
@@ -0,0 +1,35 @@
+m4/ax_python_devel.m4: do not check for distutils
+
+With py 3.10 this prints a deprecation warning which is
+taken as an error. Upstream should rework the code to not
+use distuils.
+
+Upstream-Status: Inappropriate [needs a proper fix upstream]
+Signed-off-by: Armin Kuster <akuster808@gmail.com>
+
+Index: git/libraries/libapparmor/m4/ac_python_devel.m4
+===================================================================
+--- git.orig/libraries/libapparmor/m4/ac_python_devel.m4
++++ git/libraries/libapparmor/m4/ac_python_devel.m4
+@@ -66,21 +66,6 @@ variable to configure. See ``configure -
+ fi
+
+ #
+- # Check if you have distutils, else fail
+- #
+- AC_MSG_CHECKING([for the distutils Python package])
+- ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
+- if test -z "$ac_distutils_result"; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
+- AC_MSG_ERROR([cannot import Python module "distutils".
+-Please check your Python installation. The error was:
+-$ac_distutils_result])
+- PYTHON_VERSION=""
+- fi
+-
+- #
+ # Check for Python include path
+ #
+ AC_MSG_CHECKING([for Python include path])
--
2.25.1


[meta-security][PATCH 1/4] opendnssec: blacklist do to ldns being blacklisted

Armin Kuster
 

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
recipes-core/packagegroup/packagegroup-core-security.bb | 1 -
.../opendnssec/{opendnssec_2.1.9.bb => opendnssec_2.1.10.bb} | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
rename recipes-security/opendnssec/{opendnssec_2.1.9.bb => opendnssec_2.1.10.bb} (88%)

diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb
index 6375e24..e9dad5b 100644
--- a/recipes-core/packagegroup/packagegroup-core-security.bb
+++ b/recipes-core/packagegroup/packagegroup-core-security.bb
@@ -39,7 +39,6 @@ RDEPENDS:packagegroup-security-utils = "\
python3-fail2ban \
softhsm \
libest \
- opendnssec \
sshguard \
${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \
${@bb.utils.contains("DISTRO_FEATURES", "pam", "sssd google-authenticator-libpam", "",d)} \
diff --git a/recipes-security/opendnssec/opendnssec_2.1.9.bb b/recipes-security/opendnssec/opendnssec_2.1.10.bb
similarity index 88%
rename from recipes-security/opendnssec/opendnssec_2.1.9.bb
rename to recipes-security/opendnssec/opendnssec_2.1.10.bb
index 6c1bd46..6b53711 100644
--- a/recipes-security/opendnssec/opendnssec_2.1.9.bb
+++ b/recipes-security/opendnssec/opendnssec_2.1.10.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://dist.opendnssec.org/source/opendnssec-${PV}.tar.gz \
file://libdns_conf_fix.patch \
"

-SRC_URI[sha256sum] = "6d1d466c8d7f507f3e665f4bfe4d16a68d6bff9d7c2ab65f852e2b2a821c28b5"
+SRC_URI[sha256sum] = "c0a8427de241118dccbf7abc508e4dd53fb75b45e9f386addbadae7ecc092756"

inherit autotools pkgconfig perlnative

@@ -32,3 +32,5 @@ do_install:append () {
}

RDEPENDS:${PN} = "softhsm"
+
+PNBLACKLIST[opendnssec] ?= "Needs porting to openssl 3.x"
--
2.25.1


[meta-cgl][PATCH 2/2] crmsh: add UPSTREAM_CHECK_GITTAGREGEX

Yi Zhao
 

Add UPSTREAM_CHECK_GITTAGREGEX to check the correct latest version.

Before the patch:
$ devtool latest-version crmsh
INFO: Current version: 4.3.1
INFO: Latest version: 12
INFO: Latest version's commit: 3308c27651a3657a019d7dc313435060f68454c5

After the patch:
$ devtool latest-version crmsh
INFO: Current version: 4.3.1
INFO: Latest version: 4.3.1
INFO: Latest version's commit: 00ec69054edecd068deda54c6184c0385d90ebd2

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb | 2 ++
1 file changed, 2 insertions(+)

diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
index 0b6ecd3..531a053 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
@@ -20,6 +20,8 @@ SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \

SRCREV = "00ec69054edecd068deda54c6184c0385d90ebd2"

+UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))$"
+
inherit autotools-brokensep setuptools3

export HOST_SYS
--
2.25.1


[meta-cgl][PATCH 1/2] crmsh: fix deprecation on collections.MutableSet

Yi Zhao
 

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'

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
...x-deprecation-on-collections.Mutable.patch | 52 +++++++++++++++++++
.../recipes-cgl/crmsh/crmsh_4.3.1.bb | 1 +
2 files changed, 53 insertions(+)
create mode 100644 meta-cgl-common/recipes-cgl/crmsh/crmsh/0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch

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.3.1.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
index 75e720b..0b6ecd3 100644
--- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
+++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb
@@ -15,6 +15,7 @@ RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash python3-doct
S = "${WORKDIR}/git"
SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \
file://tweaks_for_build.patch \
+ file://0001-orderedset.py-fix-deprecation-on-collections.Mutable.patch \
"

SRCREV = "00ec69054edecd068deda54c6184c0385d90ebd2"
--
2.25.1

1921 - 1940 of 57064