[PATCH 1/4] webkitgtk: adjust patch status

[PATCH 1/4] webkitgtk: adjust patch status

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...indGObjectIntrospection.cmake-prefix-variables-obta.patch | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
index bccf74d9c9..2379924cc9 100644
--- a/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
+++ b/meta/recipes-sato/webkit/webkitgtk/0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch
@@ -4,7 +4,10 @@ Date: Tue, 27 Oct 2015 16:02:19 +0200
 Subject: [PATCH] FindGObjectIntrospection.cmake: prefix variables obtained
  from pkg-config with PKG_CONFIG_SYSROOT_DIR
 
-Upstream-Status: Submitted [https://bugs.webkit.org/show_bug.cgi?id=232933]
+See discussion at https://bugs.webkit.org/show_bug.cgi?id=232933 for
+reasons why this is not approproiate for upstream submission.
+
+Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 ---
-- 
2.30.2

[PATCH 2/4] python3-psutil: enable ptest

[Alexander Kanavin]

Also, replace a mass-test-disabling patch with more targeted fixes and
submit them upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../distro/include/ptest-packagelists.inc     |   1 +
 .../0001-fix-failure-test-cases.patch         | 197 ------------------
 ...im-possible-dirty-suffix-from-free-V.patch |  27 +++
 ...rectly-skip-test-if-setup.py-does-no.patch |  27 +++
 ...e-mountpoint-as-df-argument-and-not-.patch |  27 +++
 ...y-drop-test-for-presence-of-io_count.patch |  29 +++
 ...drop-initial-check-for-ionice-class-.patch |  27 +++
 .../python/python3-psutil/run-ptest           |   3 +
 .../python/python3-psutil_5.9.0.bb            |  15 +-
 9 files changed, 150 insertions(+), 203 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
 create mode 100644 meta/recipes-devtools/python/python3-psutil/run-ptest

diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
index b51cce4d9e..0e1083646e 100644
--- a/meta/conf/distro/include/ptest-packagelists.inc
+++ b/meta/conf/distro/include/ptest-packagelists.inc
@@ -57,6 +57,7 @@ PTESTS_FAST = "\
     python3-markupsafe-ptest \
     python3-more-itertools-ptest \
     python3-pluggy-ptest \
+    python3-psutil-ptest \
     python3-pyasn1-ptest \
     python3-pytz-ptest \
     python3-wcwidth-ptest \
diff --git a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch b/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
deleted file mode 100644
index 34ea03b27f..0000000000
--- a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 8b4e38958ff8bdbb3ece4796bfa2d3b6f7536f71 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 23 Feb 2022 11:54:40 +0800
-Subject: [PATCH] fix failure test cases
-
-The test cases is not robust enough. skip some cases that is
-not suitable for all conditions.
-
-* test_io_counters failed when kernel config CONFIG_TASKSTATS
-  and CONFIG_TASK_IO_ACCOUNTING are not enable in OE 
-* test_setup_script failed since oe don't install setup.py
-* test_used failed since oe use git source for free, so the version
-  is 3.3.17-dirty
-* test_weird_environ failed since gcc not installed
-* test_debug failed since it is designed to run when PSUTIL_DEBUG is set
-* test_against_findmnt/test_comparisons/test_disk_partitions_mocked/
-  test_disk_partitions is not suitable for Linux nfs boot
-
-Upstream-Status: Pending
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- psutil/tests/test_contracts.py | 1 +
- psutil/tests/test_linux.py     | 8 ++++++--
- psutil/tests/test_misc.py      | 4 ++++
- psutil/tests/test_process.py   | 5 +++++
- psutil/tests/test_system.py    | 1 +
- psutil/tests/test_unicode.py   | 4 +++-
- 6 files changed, 20 insertions(+), 3 deletions(-)
-
-diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
-index 7401cc1..bf0fca0 100755
---- a/psutil/tests/test_contracts.py
-+++ b/psutil/tests/test_contracts.py
-@@ -172,6 +172,7 @@ class TestAvailProcessAPIs(PsutilTestCase):
-     def test_rlimit(self):
-         self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD)
- 
-+    @unittest.skip("broken on OE since kernel config maye not be enabled")
-     def test_io_counters(self):
-         hasit = hasattr(psutil.Process, "io_counters")
-         self.assertEqual(hasit, False if MACOS or SUNOS else True)
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index 20e28d2..66b6dda 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -196,8 +196,9 @@ def get_free_version_info():
-     out = sh(["free", "-V"]).strip()
-     if 'UNKNOWN' in out:
-         raise unittest.SkipTest("can't determine free version")
--    return tuple(map(int, out.split()[-1].split('.')))
--
-+    vlist = out.split()[-1].split('.')
-+    vlist[:] = [n.split('-')[0] for n in vlist]
-+    return tuple(map(int, vlist))
- 
- @contextlib.contextmanager
- def mock_open_content(for_path, content):
-@@ -1289,6 +1290,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
-         finder.ask_sys_class_block()
- 
-     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Broken for oe")
-     def test_comparisons(self):
-         finder = RootFsDeviceFinder()
-         self.assertIsNotNone(finder.find())
-@@ -1311,11 +1313,13 @@ class TestRootFsDeviceFinder(PsutilTestCase):
- 
-     @unittest.skipIf(not which("findmnt"), "findmnt utility not available")
-     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Broken for oe")
-     def test_against_findmnt(self):
-         psutil_value = RootFsDeviceFinder().find()
-         findmnt_value = sh("findmnt -o SOURCE -rn /")
-         self.assertEqual(psutil_value, findmnt_value)
- 
-+    @unittest.skip("Broken for oe")
-     def test_disk_partitions_mocked(self):
-         with mock.patch(
-                 'psutil._pslinux.cext.disk_partitions',
-diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
-index d946eb6..121004a 100755
---- a/psutil/tests/test_misc.py
-+++ b/psutil/tests/test_misc.py
-@@ -54,6 +54,8 @@ from psutil.tests import unittest
- # ===================================================================
- 
- 
-+PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG', 0))
-+
- class TestMisc(PsutilTestCase):
- 
-     def test_process__repr__(self, func=repr):
-@@ -368,6 +370,7 @@ class TestMisc(PsutilTestCase):
- 
-     # XXX: https://github.com/pypa/setuptools/pull/2896
-     @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug")
-+    @unittest.skip("OE run this test outof source tree")
-     def test_setup_script(self):
-         setup_py = os.path.join(ROOT_DIR, 'setup.py')
-         if CI_TESTING and not os.path.exists(setup_py):
-@@ -401,6 +404,7 @@ class TestMisc(PsutilTestCase):
-                 reload_module(psutil)
-             self.assertIn("version conflict", str(cm.exception).lower())
- 
-+    @unittest.skipIf(not PSUTIL_DEBUG, "env PSUTIL_DEBUG not set")
-     def test_debug(self):
-         if PY3:
-             from io import StringIO
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index c9059e3..a34ba3d 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -36,6 +36,7 @@ from psutil._compat import PY3
- from psutil._compat import FileNotFoundError
- from psutil._compat import long
- from psutil._compat import super
-+from psutil._compat import which
- from psutil.tests import APPVEYOR
- from psutil.tests import CI_TESTING
- from psutil.tests import GITHUB_ACTIONS
-@@ -726,6 +727,7 @@ class TestProcess(PsutilTestCase):
-             self.assertEqual(' '.join(p.cmdline()), ' '.join(cmdline))
- 
-     @unittest.skipIf(PYPY, "broken on PYPY")
-+    @unittest.skipIf(not which("gcc"), "gcc not installed")
-     def test_long_cmdline(self):
-         testfn = self.get_testfn()
-         create_exe(testfn)
-@@ -740,6 +742,7 @@ class TestProcess(PsutilTestCase):
-         assert pyexe.startswith(name), (pyexe, name)
- 
-     @unittest.skipIf(PYPY, "unreliable on PYPY")
-+    @unittest.skipIf(not which("gcc"), "gcc not installed")
-     def test_long_name(self):
-         testfn = self.get_testfn(suffix="0123456789" * 2)
-         create_exe(testfn)
-@@ -750,6 +753,7 @@ class TestProcess(PsutilTestCase):
-     @unittest.skipIf(SUNOS, "broken on SUNOS")
-     @unittest.skipIf(AIX, "broken on AIX")
-     @unittest.skipIf(PYPY, "broken on PYPY")
-+    @unittest.skipIf(not which("gcc"), "gcc not installed")
-     def test_prog_w_funky_name(self):
-         # Test that name(), exe() and cmdline() correctly handle programs
-         # with funky chars such as spaces and ")", see:
-@@ -1408,6 +1412,7 @@ class TestProcess(PsutilTestCase):
- 
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-+    @unittest.skipIf(not which("gcc"), "gcc not installed")
-     def test_weird_environ(self):
-         # environment variables can contain values without an equals sign
-         code = textwrap.dedent("""
-diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
-index db2cb34..5ee519f 100755
---- a/psutil/tests/test_system.py
-+++ b/psutil/tests/test_system.py
-@@ -580,6 +580,7 @@ class TestDiskAPIs(PsutilTestCase):
-     def test_disk_usage_bytes(self):
-         psutil.disk_usage(b'.')
- 
-+    @unittest.skip("Broken for oe")
-     def test_disk_partitions(self):
-         def check_ntuple(nt):
-             self.assertIsInstance(nt.device, str)
-diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py
-index e635726..7ba5b0f 100755
---- a/psutil/tests/test_unicode.py
-+++ b/psutil/tests/test_unicode.py
-@@ -86,6 +86,7 @@ from psutil import POSIX
- from psutil import WINDOWS
- from psutil._compat import PY3
- from psutil._compat import u
-+from psutil._compat import which
- from psutil.tests import APPVEYOR
- from psutil.tests import ASCII_FS
- from psutil.tests import CI_TESTING
-@@ -156,7 +157,7 @@ def try_unicode(suffix):
- # FS APIs
- # ===================================================================
- 
--
-+@unittest.skipIf(not which("gcc"), "gcc not installed")
- class BaseUnicodeTest(PsutilTestCase):
-     funky_suffix = None
- 
-@@ -169,6 +170,7 @@ class BaseUnicodeTest(PsutilTestCase):
- @serialrun
- @unittest.skipIf(ASCII_FS, "ASCII fs")
- @unittest.skipIf(PYPY and not PY3, "too much trouble on PYPY2")
-+@unittest.skipIf(not which("gcc"), "gcc not installed")
- class TestFSAPIs(BaseUnicodeTest):
-     """Test FS APIs with a funky, valid, UTF8 path name."""
- 
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch b/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
new file mode 100644
index 0000000000..f43bcd3604
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
@@ -0,0 +1,27 @@
+From a5341e9ab25da217de49f80b2dd42dd40124d863 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 11:30:37 +0200
+Subject: [PATCH] test_linux.py: trim possible -dirty suffix from 'free -V'
+ output
+
+This can happen if free was built from git.
+
+Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ psutil/tests/test_linux.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index 20e28d2..7eb1c0b 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -196,7 +196,7 @@ def get_free_version_info():
+     out = sh(["free", "-V"]).strip()
+     if 'UNKNOWN' in out:
+         raise unittest.SkipTest("can't determine free version")
+-    return tuple(map(int, out.split()[-1].split('.')))
++    return tuple(map(int, out.split()[-1].split('-')[0].split('.')))
+ 
+ 
+ @contextlib.contextmanager
diff --git a/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch b/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
new file mode 100644
index 0000000000..ba2ef91f03
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
@@ -0,0 +1,27 @@
+From f51162f9625e9ea95c0972b5363d38526de74b4c Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 11:32:39 +0200
+Subject: [PATCH] test_misc.py: correctly skip test if setup.py does not exist
+
+This can happen if installed tests are run in a non-CI environment:
+$ python3 -m psutil.tests
+
+Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ psutil/tests/test_misc.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
+index d946eb6..72b23ef 100755
+--- a/psutil/tests/test_misc.py
++++ b/psutil/tests/test_misc.py
+@@ -370,7 +370,7 @@ class TestMisc(PsutilTestCase):
+     @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug")
+     def test_setup_script(self):
+         setup_py = os.path.join(ROOT_DIR, 'setup.py')
+-        if CI_TESTING and not os.path.exists(setup_py):
++        if CI_TESTING or not os.path.exists(setup_py):
+             return self.skipTest("can't find setup.py")
+         module = import_module_by_path(setup_py)
+         self.assertRaises(SystemExit, module.setup)
diff --git a/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch b/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
new file mode 100644
index 0000000000..59b0862b70
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
@@ -0,0 +1,27 @@
+From 6bef0cf58f4c734bdbcb8b272ee621d532ed6b98 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 11:43:34 +0200
+Subject: [PATCH] test_posix.py: use mountpoint as df argument, and not device
+
+This is more reliable as in virtual machines such as qemu there may
+not be an accurate mapping to devices.
+
+Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ psutil/tests/test_posix.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
+index 31b8192..22fb518 100755
+--- a/psutil/tests/test_posix.py
++++ b/psutil/tests/test_posix.py
+@@ -392,7 +392,7 @@ class TestSystemAPIs(PsutilTestCase):
+         for part in psutil.disk_partitions(all=False):
+             usage = psutil.disk_usage(part.mountpoint)
+             try:
+-                total, used, free, percent = df(part.device)
++                total, used, free, percent = df(part.mountpoint)
+             except RuntimeError as err:
+                 # see:
+                 # https://travis-ci.org/giampaolo/psutil/jobs/138338464
diff --git a/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch b/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
new file mode 100644
index 0000000000..0320076d66
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
@@ -0,0 +1,29 @@
+From e79bd02a30d8bfeee53568bc9d51258f2022298e Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 12:03:36 +0200
+Subject: [PATCH] test_contracts.py: drop test for presence of io_counters
+
+This may be absent on Linux as well (if the kernel is configured that way),
+so the test becomes meaningless.
+
+Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ psutil/tests/test_contracts.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
+index 7401cc1..5697028 100755
+--- a/psutil/tests/test_contracts.py
++++ b/psutil/tests/test_contracts.py
+@@ -172,10 +172,6 @@ class TestAvailProcessAPIs(PsutilTestCase):
+     def test_rlimit(self):
+         self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD)
+ 
+-    def test_io_counters(self):
+-        hasit = hasattr(psutil.Process, "io_counters")
+-        self.assertEqual(hasit, False if MACOS or SUNOS else True)
+-
+     def test_num_fds(self):
+         self.assertEqual(hasattr(psutil.Process, "num_fds"), POSIX)
+ 
diff --git a/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch b/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
new file mode 100644
index 0000000000..09b429311a
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
@@ -0,0 +1,27 @@
+From 33f1b29a8909dfb4df651003e236049302f16b9d Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 12:13:22 +0200
+Subject: [PATCH] test_process.py: drop initial check for ionice class being
+ IOPriority.IOPRIO_CLASS_NONE
+
+On two of my machines running different distros it's IOPriority.IOPRIO_CLASS_BE.
+
+Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ psutil/tests/test_process.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index c9059e3..af3d924 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -345,8 +345,6 @@ class TestProcess(PsutilTestCase):
+     @unittest.skipIf(not LINUX, "linux only")
+     def test_ionice_linux(self):
+         p = psutil.Process()
+-        if not CI_TESTING:
+-            self.assertEqual(p.ionice()[0], psutil.IOPRIO_CLASS_NONE)
+         self.assertEqual(psutil.IOPRIO_CLASS_NONE, 0)
+         self.assertEqual(psutil.IOPRIO_CLASS_RT, 1)  # high
+         self.assertEqual(psutil.IOPRIO_CLASS_BE, 2)  # normal
diff --git a/meta/recipes-devtools/python/python3-psutil/run-ptest b/meta/recipes-devtools/python/python3-psutil/run-ptest
new file mode 100644
index 0000000000..90900e967b
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-psutil/run-ptest
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+PSUTIL_DEBUG=1 python3 -m psutil.tests 2>&1 | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
diff --git a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb b/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
index df304f01e6..4ea3fcfbbf 100644
--- a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
+++ b/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
@@ -3,15 +3,18 @@ LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b"
 HOMEPAGE = "https://pypi.org/project/psutil/"
 
+SRC_URI += "file://run-ptest \
+           file://0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch \
+           file://0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch \
+           file://0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch \
+           file://0004-test_contracts.py-drop-test-for-presence-of-io_count.patch \
+           file://0005-test_process.py-drop-initial-check-for-ionice-class-.patch \
+           "
 SRC_URI[sha256sum] = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"
 
-inherit pypi setuptools3
+inherit pypi setuptools3 ptest
 
-SRC_URI += "file://0001-fix-failure-test-cases.patch"
-
-PACKAGES =+ "${PN}-tests"
-
-FILES:${PN}-tests += " \
+FILES:${PN}-ptest += " \
     ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \
     ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \
 "
-- 
2.30.2

Re: [OE-core] [PATCH 2/4] python3-psutil: enable ptest

[Alexandre Belloni]

Hello Alex,

new ptest failures with this:

https://autobuilder.yoctoproject.org/typhoon/#builders/82/builds/3125/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#builders/81/builds/3376/steps/13/logs/stdio

On 14/04/2022 10:57:08+0200, Alexander Kanavin wrote:
> Also, replace a mass-test-disabling patch with more targeted fixes and
> submit them upstream.
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>  .../distro/include/ptest-packagelists.inc     |   1 +
>  .../0001-fix-failure-test-cases.patch         | 197 ------------------
>  ...im-possible-dirty-suffix-from-free-V.patch |  27 +++
>  ...rectly-skip-test-if-setup.py-does-no.patch |  27 +++
>  ...e-mountpoint-as-df-argument-and-not-.patch |  27 +++
>  ...y-drop-test-for-presence-of-io_count.patch |  29 +++
>  ...drop-initial-check-for-ionice-class-.patch |  27 +++
>  .../python/python3-psutil/run-ptest           |   3 +
>  .../python/python3-psutil_5.9.0.bb            |  15 +-
>  9 files changed, 150 insertions(+), 203 deletions(-)
>  delete mode 100644 meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
>  create mode 100644 meta/recipes-devtools/python/python3-psutil/run-ptest
> 
> diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc
> index b51cce4d9e..0e1083646e 100644
> --- a/meta/conf/distro/include/ptest-packagelists.inc
> +++ b/meta/conf/distro/include/ptest-packagelists.inc
> @@ -57,6 +57,7 @@ PTESTS_FAST = "\
>      python3-markupsafe-ptest \
>      python3-more-itertools-ptest \
>      python3-pluggy-ptest \
> +    python3-psutil-ptest \
>      python3-pyasn1-ptest \
>      python3-pytz-ptest \
>      python3-wcwidth-ptest \
> diff --git a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch b/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
> deleted file mode 100644
> index 34ea03b27f..0000000000
> --- a/meta/recipes-devtools/python/python3-psutil/0001-fix-failure-test-cases.patch
> +++ /dev/null
> @@ -1,197 +0,0 @@
> -From 8b4e38958ff8bdbb3ece4796bfa2d3b6f7536f71 Mon Sep 17 00:00:00 2001
> -From: Changqing Li <changqing.li@windriver.com>
> -Date: Wed, 23 Feb 2022 11:54:40 +0800
> -Subject: [PATCH] fix failure test cases
> -
> -The test cases is not robust enough. skip some cases that is
> -not suitable for all conditions.
> -
> -* test_io_counters failed when kernel config CONFIG_TASKSTATS
> -  and CONFIG_TASK_IO_ACCOUNTING are not enable in OE 
> -* test_setup_script failed since oe don't install setup.py
> -* test_used failed since oe use git source for free, so the version
> -  is 3.3.17-dirty
> -* test_weird_environ failed since gcc not installed
> -* test_debug failed since it is designed to run when PSUTIL_DEBUG is set
> -* test_against_findmnt/test_comparisons/test_disk_partitions_mocked/
> -  test_disk_partitions is not suitable for Linux nfs boot
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Changqing Li <changqing.li@windriver.com>
> ----
> - psutil/tests/test_contracts.py | 1 +
> - psutil/tests/test_linux.py     | 8 ++++++--
> - psutil/tests/test_misc.py      | 4 ++++
> - psutil/tests/test_process.py   | 5 +++++
> - psutil/tests/test_system.py    | 1 +
> - psutil/tests/test_unicode.py   | 4 +++-
> - 6 files changed, 20 insertions(+), 3 deletions(-)
> -
> -diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
> -index 7401cc1..bf0fca0 100755
> ---- a/psutil/tests/test_contracts.py
> -+++ b/psutil/tests/test_contracts.py
> -@@ -172,6 +172,7 @@ class TestAvailProcessAPIs(PsutilTestCase):
> -     def test_rlimit(self):
> -         self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD)
> - 
> -+    @unittest.skip("broken on OE since kernel config maye not be enabled")
> -     def test_io_counters(self):
> -         hasit = hasattr(psutil.Process, "io_counters")
> -         self.assertEqual(hasit, False if MACOS or SUNOS else True)
> -diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
> -index 20e28d2..66b6dda 100755
> ---- a/psutil/tests/test_linux.py
> -+++ b/psutil/tests/test_linux.py
> -@@ -196,8 +196,9 @@ def get_free_version_info():
> -     out = sh(["free", "-V"]).strip()
> -     if 'UNKNOWN' in out:
> -         raise unittest.SkipTest("can't determine free version")
> --    return tuple(map(int, out.split()[-1].split('.')))
> --
> -+    vlist = out.split()[-1].split('.')
> -+    vlist[:] = [n.split('-')[0] for n in vlist]
> -+    return tuple(map(int, vlist))
> - 
> - @contextlib.contextmanager
> - def mock_open_content(for_path, content):
> -@@ -1289,6 +1290,7 @@ class TestRootFsDeviceFinder(PsutilTestCase):
> -         finder.ask_sys_class_block()
> - 
> -     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
> -+    @unittest.skip("Broken for oe")
> -     def test_comparisons(self):
> -         finder = RootFsDeviceFinder()
> -         self.assertIsNotNone(finder.find())
> -@@ -1311,11 +1313,13 @@ class TestRootFsDeviceFinder(PsutilTestCase):
> - 
> -     @unittest.skipIf(not which("findmnt"), "findmnt utility not available")
> -     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
> -+    @unittest.skip("Broken for oe")
> -     def test_against_findmnt(self):
> -         psutil_value = RootFsDeviceFinder().find()
> -         findmnt_value = sh("findmnt -o SOURCE -rn /")
> -         self.assertEqual(psutil_value, findmnt_value)
> - 
> -+    @unittest.skip("Broken for oe")
> -     def test_disk_partitions_mocked(self):
> -         with mock.patch(
> -                 'psutil._pslinux.cext.disk_partitions',
> -diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
> -index d946eb6..121004a 100755
> ---- a/psutil/tests/test_misc.py
> -+++ b/psutil/tests/test_misc.py
> -@@ -54,6 +54,8 @@ from psutil.tests import unittest
> - # ===================================================================
> - 
> - 
> -+PSUTIL_DEBUG = bool(os.getenv('PSUTIL_DEBUG', 0))
> -+
> - class TestMisc(PsutilTestCase):
> - 
> -     def test_process__repr__(self, func=repr):
> -@@ -368,6 +370,7 @@ class TestMisc(PsutilTestCase):
> - 
> -     # XXX: https://github.com/pypa/setuptools/pull/2896
> -     @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug")
> -+    @unittest.skip("OE run this test outof source tree")
> -     def test_setup_script(self):
> -         setup_py = os.path.join(ROOT_DIR, 'setup.py')
> -         if CI_TESTING and not os.path.exists(setup_py):
> -@@ -401,6 +404,7 @@ class TestMisc(PsutilTestCase):
> -                 reload_module(psutil)
> -             self.assertIn("version conflict", str(cm.exception).lower())
> - 
> -+    @unittest.skipIf(not PSUTIL_DEBUG, "env PSUTIL_DEBUG not set")
> -     def test_debug(self):
> -         if PY3:
> -             from io import StringIO
> -diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
> -index c9059e3..a34ba3d 100755
> ---- a/psutil/tests/test_process.py
> -+++ b/psutil/tests/test_process.py
> -@@ -36,6 +36,7 @@ from psutil._compat import PY3
> - from psutil._compat import FileNotFoundError
> - from psutil._compat import long
> - from psutil._compat import super
> -+from psutil._compat import which
> - from psutil.tests import APPVEYOR
> - from psutil.tests import CI_TESTING
> - from psutil.tests import GITHUB_ACTIONS
> -@@ -726,6 +727,7 @@ class TestProcess(PsutilTestCase):
> -             self.assertEqual(' '.join(p.cmdline()), ' '.join(cmdline))
> - 
> -     @unittest.skipIf(PYPY, "broken on PYPY")
> -+    @unittest.skipIf(not which("gcc"), "gcc not installed")
> -     def test_long_cmdline(self):
> -         testfn = self.get_testfn()
> -         create_exe(testfn)
> -@@ -740,6 +742,7 @@ class TestProcess(PsutilTestCase):
> -         assert pyexe.startswith(name), (pyexe, name)
> - 
> -     @unittest.skipIf(PYPY, "unreliable on PYPY")
> -+    @unittest.skipIf(not which("gcc"), "gcc not installed")
> -     def test_long_name(self):
> -         testfn = self.get_testfn(suffix="0123456789" * 2)
> -         create_exe(testfn)
> -@@ -750,6 +753,7 @@ class TestProcess(PsutilTestCase):
> -     @unittest.skipIf(SUNOS, "broken on SUNOS")
> -     @unittest.skipIf(AIX, "broken on AIX")
> -     @unittest.skipIf(PYPY, "broken on PYPY")
> -+    @unittest.skipIf(not which("gcc"), "gcc not installed")
> -     def test_prog_w_funky_name(self):
> -         # Test that name(), exe() and cmdline() correctly handle programs
> -         # with funky chars such as spaces and ")", see:
> -@@ -1408,6 +1412,7 @@ class TestProcess(PsutilTestCase):
> - 
> -     @unittest.skipIf(not HAS_ENVIRON, "not supported")
> -     @unittest.skipIf(not POSIX, "POSIX only")
> -+    @unittest.skipIf(not which("gcc"), "gcc not installed")
> -     def test_weird_environ(self):
> -         # environment variables can contain values without an equals sign
> -         code = textwrap.dedent("""
> -diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
> -index db2cb34..5ee519f 100755
> ---- a/psutil/tests/test_system.py
> -+++ b/psutil/tests/test_system.py
> -@@ -580,6 +580,7 @@ class TestDiskAPIs(PsutilTestCase):
> -     def test_disk_usage_bytes(self):
> -         psutil.disk_usage(b'.')
> - 
> -+    @unittest.skip("Broken for oe")
> -     def test_disk_partitions(self):
> -         def check_ntuple(nt):
> -             self.assertIsInstance(nt.device, str)
> -diff --git a/psutil/tests/test_unicode.py b/psutil/tests/test_unicode.py
> -index e635726..7ba5b0f 100755
> ---- a/psutil/tests/test_unicode.py
> -+++ b/psutil/tests/test_unicode.py
> -@@ -86,6 +86,7 @@ from psutil import POSIX
> - from psutil import WINDOWS
> - from psutil._compat import PY3
> - from psutil._compat import u
> -+from psutil._compat import which
> - from psutil.tests import APPVEYOR
> - from psutil.tests import ASCII_FS
> - from psutil.tests import CI_TESTING
> -@@ -156,7 +157,7 @@ def try_unicode(suffix):
> - # FS APIs
> - # ===================================================================
> - 
> --
> -+@unittest.skipIf(not which("gcc"), "gcc not installed")
> - class BaseUnicodeTest(PsutilTestCase):
> -     funky_suffix = None
> - 
> -@@ -169,6 +170,7 @@ class BaseUnicodeTest(PsutilTestCase):
> - @serialrun
> - @unittest.skipIf(ASCII_FS, "ASCII fs")
> - @unittest.skipIf(PYPY and not PY3, "too much trouble on PYPY2")
> -+@unittest.skipIf(not which("gcc"), "gcc not installed")
> - class TestFSAPIs(BaseUnicodeTest):
> -     """Test FS APIs with a funky, valid, UTF8 path name."""
> - 
> --- 
> -2.25.1
> -
> diff --git a/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch b/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
> new file mode 100644
> index 0000000000..f43bcd3604
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch
> @@ -0,0 +1,27 @@
> +From a5341e9ab25da217de49f80b2dd42dd40124d863 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Wed, 13 Apr 2022 11:30:37 +0200
> +Subject: [PATCH] test_linux.py: trim possible -dirty suffix from 'free -V'
> + output
> +
> +This can happen if free was built from git.
> +
> +Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + psutil/tests/test_linux.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
> +index 20e28d2..7eb1c0b 100755
> +--- a/psutil/tests/test_linux.py
> ++++ b/psutil/tests/test_linux.py
> +@@ -196,7 +196,7 @@ def get_free_version_info():
> +     out = sh(["free", "-V"]).strip()
> +     if 'UNKNOWN' in out:
> +         raise unittest.SkipTest("can't determine free version")
> +-    return tuple(map(int, out.split()[-1].split('.')))
> ++    return tuple(map(int, out.split()[-1].split('-')[0].split('.')))
> + 
> + 
> + @contextlib.contextmanager
> diff --git a/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch b/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
> new file mode 100644
> index 0000000000..ba2ef91f03
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch
> @@ -0,0 +1,27 @@
> +From f51162f9625e9ea95c0972b5363d38526de74b4c Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Wed, 13 Apr 2022 11:32:39 +0200
> +Subject: [PATCH] test_misc.py: correctly skip test if setup.py does not exist
> +
> +This can happen if installed tests are run in a non-CI environment:
> +$ python3 -m psutil.tests
> +
> +Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + psutil/tests/test_misc.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
> +index d946eb6..72b23ef 100755
> +--- a/psutil/tests/test_misc.py
> ++++ b/psutil/tests/test_misc.py
> +@@ -370,7 +370,7 @@ class TestMisc(PsutilTestCase):
> +     @unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug")
> +     def test_setup_script(self):
> +         setup_py = os.path.join(ROOT_DIR, 'setup.py')
> +-        if CI_TESTING and not os.path.exists(setup_py):
> ++        if CI_TESTING or not os.path.exists(setup_py):
> +             return self.skipTest("can't find setup.py")
> +         module = import_module_by_path(setup_py)
> +         self.assertRaises(SystemExit, module.setup)
> diff --git a/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch b/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
> new file mode 100644
> index 0000000000..59b0862b70
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch
> @@ -0,0 +1,27 @@
> +From 6bef0cf58f4c734bdbcb8b272ee621d532ed6b98 Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Wed, 13 Apr 2022 11:43:34 +0200
> +Subject: [PATCH] test_posix.py: use mountpoint as df argument, and not device
> +
> +This is more reliable as in virtual machines such as qemu there may
> +not be an accurate mapping to devices.
> +
> +Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + psutil/tests/test_posix.py | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
> +index 31b8192..22fb518 100755
> +--- a/psutil/tests/test_posix.py
> ++++ b/psutil/tests/test_posix.py
> +@@ -392,7 +392,7 @@ class TestSystemAPIs(PsutilTestCase):
> +         for part in psutil.disk_partitions(all=False):
> +             usage = psutil.disk_usage(part.mountpoint)
> +             try:
> +-                total, used, free, percent = df(part.device)
> ++                total, used, free, percent = df(part.mountpoint)
> +             except RuntimeError as err:
> +                 # see:
> +                 # https://travis-ci.org/giampaolo/psutil/jobs/138338464
> diff --git a/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch b/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
> new file mode 100644
> index 0000000000..0320076d66
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/0004-test_contracts.py-drop-test-for-presence-of-io_count.patch
> @@ -0,0 +1,29 @@
> +From e79bd02a30d8bfeee53568bc9d51258f2022298e Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Wed, 13 Apr 2022 12:03:36 +0200
> +Subject: [PATCH] test_contracts.py: drop test for presence of io_counters
> +
> +This may be absent on Linux as well (if the kernel is configured that way),
> +so the test becomes meaningless.
> +
> +Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + psutil/tests/test_contracts.py | 4 ----
> + 1 file changed, 4 deletions(-)
> +
> +diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
> +index 7401cc1..5697028 100755
> +--- a/psutil/tests/test_contracts.py
> ++++ b/psutil/tests/test_contracts.py
> +@@ -172,10 +172,6 @@ class TestAvailProcessAPIs(PsutilTestCase):
> +     def test_rlimit(self):
> +         self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD)
> + 
> +-    def test_io_counters(self):
> +-        hasit = hasattr(psutil.Process, "io_counters")
> +-        self.assertEqual(hasit, False if MACOS or SUNOS else True)
> +-
> +     def test_num_fds(self):
> +         self.assertEqual(hasattr(psutil.Process, "num_fds"), POSIX)
> + 
> diff --git a/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch b/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
> new file mode 100644
> index 0000000000..09b429311a
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/0005-test_process.py-drop-initial-check-for-ionice-class-.patch
> @@ -0,0 +1,27 @@
> +From 33f1b29a8909dfb4df651003e236049302f16b9d Mon Sep 17 00:00:00 2001
> +From: Alexander Kanavin <alex@linutronix.de>
> +Date: Wed, 13 Apr 2022 12:13:22 +0200
> +Subject: [PATCH] test_process.py: drop initial check for ionice class being
> + IOPriority.IOPRIO_CLASS_NONE
> +
> +On two of my machines running different distros it's IOPriority.IOPRIO_CLASS_BE.
> +
> +Upstream-Status: Submitted [https://github.com/giampaolo/psutil/pull/2097]
> +Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> +---
> + psutil/tests/test_process.py | 2 --
> + 1 file changed, 2 deletions(-)
> +
> +diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
> +index c9059e3..af3d924 100755
> +--- a/psutil/tests/test_process.py
> ++++ b/psutil/tests/test_process.py
> +@@ -345,8 +345,6 @@ class TestProcess(PsutilTestCase):
> +     @unittest.skipIf(not LINUX, "linux only")
> +     def test_ionice_linux(self):
> +         p = psutil.Process()
> +-        if not CI_TESTING:
> +-            self.assertEqual(p.ionice()[0], psutil.IOPRIO_CLASS_NONE)
> +         self.assertEqual(psutil.IOPRIO_CLASS_NONE, 0)
> +         self.assertEqual(psutil.IOPRIO_CLASS_RT, 1)  # high
> +         self.assertEqual(psutil.IOPRIO_CLASS_BE, 2)  # normal
> diff --git a/meta/recipes-devtools/python/python3-psutil/run-ptest b/meta/recipes-devtools/python/python3-psutil/run-ptest
> new file mode 100644
> index 0000000000..90900e967b
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python3-psutil/run-ptest
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +PSUTIL_DEBUG=1 python3 -m psutil.tests 2>&1 | sed -u -e '/\.\.\. ok/ s/^/PASS: /g' -r -e '/\.\.\. (ERROR|FAIL)/ s/^/FAIL: /g' -e '/\.\.\. skipped/ s/^/SKIP: /g' -e 's/ \.\.\. ok//g' -e 's/ \.\.\. ERROR//g' -e 's/ \.\.\. FAIL//g' -e 's/ \.\.\. skipped//g'
> diff --git a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb b/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
> index df304f01e6..4ea3fcfbbf 100644
> --- a/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
> +++ b/meta/recipes-devtools/python/python3-psutil_5.9.0.bb
> @@ -3,15 +3,18 @@ LICENSE = "BSD-3-Clause"
>  LIC_FILES_CHKSUM = "file://LICENSE;md5=e35fd9f271d19d5f742f20a9d1f8bb8b"
>  HOMEPAGE = "https://pypi.org/project/psutil/"
>  
> +SRC_URI += "file://run-ptest \
> +           file://0001-test_linux.py-trim-possible-dirty-suffix-from-free-V.patch \
> +           file://0002-test_misc.py-correctly-skip-test-if-setup.py-does-no.patch \
> +           file://0003-test_posix.py-use-mountpoint-as-df-argument-and-not-.patch \
> +           file://0004-test_contracts.py-drop-test-for-presence-of-io_count.patch \
> +           file://0005-test_process.py-drop-initial-check-for-ionice-class-.patch \
> +           "
>  SRC_URI[sha256sum] = "869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"
>  
> -inherit pypi setuptools3
> +inherit pypi setuptools3 ptest
>  
> -SRC_URI += "file://0001-fix-failure-test-cases.patch"
> -
> -PACKAGES =+ "${PN}-tests"
> -
> -FILES:${PN}-tests += " \
> +FILES:${PN}-ptest += " \
>      ${PYTHON_SITEPACKAGES_DIR}/psutil/test* \
>      ${PYTHON_SITEPACKAGES_DIR}/psutil/__pycache__/test* \
>  "
> -- 
> 2.30.2
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#164399): https://lists.openembedded.org/g/openembedded-core/message/164399
> Mute This Topic: https://lists.openembedded.org/mt/90460265/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[PATCH 3/4] sato: work around missing icons

[Alexander Kanavin]

adwaita icon theme upstream has done significant trimming around app category icons
(fullcolour versions gone completely, 'symbolic' b&w versions still around but marked
as legacy). We can use the symbolic icons for now, but going forwards, apps would
need to provide their own icons. Given that sato is likely to be deprecated in favour
of wayland/weston rather soon, let's use the symbolic icons for now.

[YOCTO #14782]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../gstreamer/gst-examples/gst-player.desktop |  2 +-
 ...sktop-update-icon-to-one-available-i.patch | 25 ++++++++++++++++++
 .../matchbox-config-gtk_0.2.bb                |  4 ++-
 ...ile.c-use-view-refresh-symbolic-icon.patch | 26 +++++++++++++++++++
 .../matchbox-desktop/matchbox-desktop_2.2.bb  |  1 +
 ...l.desktop-use-an-icon-available-in-a.patch | 25 ++++++++++++++++++
 .../matchbox-terminal_0.2.bb                  |  4 ++-
 meta/recipes-sato/puzzles/puzzles_git.bb      |  3 ++-
 .../rxvt-unicode/rxvt-unicode/rxvt.desktop    |  2 +-
 .../shutdown-desktop/shutdown.desktop         |  2 +-
 10 files changed, 88 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch
 create mode 100644 meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch
 create mode 100644 meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch

diff --git a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
index 7ddd456a1e..a5df5c9c84 100644
--- a/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
+++ b/meta/recipes-multimedia/gstreamer/gst-examples/gst-player.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Media Player
 Comment=Basic media player
-Icon=multimedia-player
+Icon=multimedia-player-symbolic
 TryExec=gtk-play
 Exec=gtk-play
 StartupNotify=true
diff --git a/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch
new file mode 100644
index 0000000000..7e75fdab9a
--- /dev/null
+++ b/meta/recipes-sato/matchbox-config-gtk/files/0001-mb-appearance.desktop-update-icon-to-one-available-i.patch
@@ -0,0 +1,25 @@
+From ab2c716bb0679a67dc6b0878ef750d3fdd29edb7 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:19:11 +0200
+Subject: [PATCH] mb-appearance.desktop: update icon to one available in
+ adwaita 42.0
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ appearance/mb-appearance.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/appearance/mb-appearance.desktop b/appearance/mb-appearance.desktop
+index 4db2bbc..cfa5142 100644
+--- a/appearance/mb-appearance.desktop
++++ b/appearance/mb-appearance.desktop
+@@ -2,7 +2,7 @@
+ Name=Appearance
+ Comment=Change the appearance
+ Exec=matchbox-appearance
+-Icon=preferences-desktop-theme
++Icon=preferences-desktop-appearance-symbolic
+ Terminal=false
+ Type=Application
+ Categories=GTK;Settings;DesktopSettings;
diff --git a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
index d951baf361..c91f9a7cc2 100644
--- a/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
+++ b/meta/recipes-sato/matchbox-config-gtk/matchbox-config-gtk_0.2.bb
@@ -12,7 +12,9 @@ RDEPENDS:${PN} = "settings-daemon"
 # SRCREV tagged 0.2
 SRCREV = "ef2192ce98d9374ffdad5f78544c3f8f353c16aa"
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
-           file://no-handed.patch"
+           file://no-handed.patch \
+           file://0001-mb-appearance.desktop-update-icon-to-one-available-i.patch \
+           "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch
new file mode 100644
index 0000000000..7a4db83da2
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch
@@ -0,0 +1,26 @@
+From 764201dff04a7ca1c3862357ea485a6fc624dd00 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:01:30 +0200
+Subject: [PATCH] taku-launcher-tile.c: use view-refresh-symbolic icon
+
+Plain view-refresh is no longer provided in latest adwaita icon theme.
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ libtaku/taku-launcher-tile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libtaku/taku-launcher-tile.c b/libtaku/taku-launcher-tile.c
+index e7f58f3..8bbf2f7 100644
+--- a/libtaku/taku-launcher-tile.c
++++ b/libtaku/taku-launcher-tile.c
+@@ -185,7 +185,7 @@ taku_launcher_tile_new_from_item (TakuMenuItem *item)
+   taku_icon_tile_set_secondary (TAKU_ICON_TILE (tile),
+                                 taku_menu_item_get_description (item));
+   taku_icon_tile_set_pixbuf (TAKU_ICON_TILE (tile),
+-                             get_icon ("view-refresh", size));
++                             get_icon ("view-refresh-symbolic", size));
+ 
+   /* Don't need to update the icon here, because we'll get a style-set signal
+      when the widget is realised which will update the icon. */
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
index b05a9c48ad..c306aba6ec 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.2.bb
@@ -15,6 +15,7 @@ SECTION = "x11/wm"
 SRCREV = "6bc67d09da4147e5552fe30011a05a2c59d2f777"
 SRC_URI = "git://git.yoctoproject.org/${BPN}-2;branch=master \
            file://vfolders/ \
+           file://0001-taku-launcher-tile.c-use-view-refresh-symbolic-icon.patch \
            "
 
 EXTRA_OECONF = "--enable-startup-notification --with-dbus"
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch
new file mode 100644
index 0000000000..48987f9d31
--- /dev/null
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal/0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch
@@ -0,0 +1,25 @@
+From ec16ba4a1cb0e4217910a1b36783f00828bb5dfc Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex@linutronix.de>
+Date: Wed, 13 Apr 2022 22:24:50 +0200
+Subject: [PATCH] matchbox-terminal.desktop: use an icon available in adwaita
+ 42.0
+
+Upstream-Status: Inappropriate [apps need their own icons as of 42.0]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ matchbox-terminal.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/matchbox-terminal.desktop b/matchbox-terminal.desktop
+index c84a24c..fedaf10 100644
+--- a/matchbox-terminal.desktop
++++ b/matchbox-terminal.desktop
+@@ -3,7 +3,7 @@ Type=Application
+ Name=Terminal
+ Comment=When all else fails.
+ Exec=matchbox-terminal
+-Icon=utilities-terminal
++Icon=utilities-terminal-symbolic
+ Terminal=false
+ Categories=GTK;Utility;
+ StartupNotify=true
diff --git a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
index 802ffa971b..048e247b89 100644
--- a/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
+++ b/meta/recipes-sato/matchbox-terminal/matchbox-terminal_0.2.bb
@@ -11,7 +11,9 @@ SECTION = "x11/utils"
 
 #SRCREV tagged 0.2
 SRCREV = "161276d0f5d1be8187010fd0d9581a6feca70ea5"
-SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master"
+SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master \
+           file://0001-matchbox-terminal.desktop-use-an-icon-available-in-a.patch \
+           "
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))"
 
 S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 381d3cc456..6f038cc475 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -23,6 +23,7 @@ DEPENDS += "gtk+3"
 do_install:append () {
     # net conflicts with Samba, so rename it
     mv ${D}${bindir}/net ${D}${bindir}/puzzles-net
+    rm ${D}/${datadir}/applications/net.desktop
 
     # Create desktop shortcuts
     install -d ${D}/${datadir}/applications/
@@ -36,7 +37,7 @@ do_install:append () {
 [Desktop Entry]
 Name=$title
 Exec=${bindir}/$prog
-Icon=applications-games
+Icon=applications-games-symbolic
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
index 882ea41136..84a8ba7dc5 100644
--- a/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
+++ b/meta/recipes-sato/rxvt-unicode/rxvt-unicode/rxvt.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=Terminal
 Comment=A unicode capable rxvt clone
 Exec=rxvt
-Icon=terminal
+Icon=utilities-terminal-symbolic
 Terminal=false
 Type=Application
 Categories=Utility;TerminalEmulator;
diff --git a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
index 662659afc2..bc437ca2de 100644
--- a/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
+++ b/meta/recipes-sato/shutdown-desktop/shutdown-desktop/shutdown.desktop
@@ -4,7 +4,7 @@ Type=Application
 Name=Shutdown
 Comment=Close down the machine safely
 Exec=poweroff
-Icon=system-shutdown
+Icon=system-shutdown-symbolic
 Terminal=false
 Categories=Utility;
 StartupNotify=true
-- 
2.30.2

[PATCH 4/4] adwaita-icon-theme: upgrade 41.0 -> 42.0

[Alexander Kanavin]

From: wangmy <wangmy@fujitsu.com>

0001-Don-t-use-AC_CANONICAL_HOST.patch
refreshed for version 42.0

0001-Run-installation-commands-as-shell-jobs.patch
removed since it's included in 42.o

(From OE-Core rev: 17a08277854eb1e8776cf7790f6255ea68bf0568)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../0001-Don-t-use-AC_CANONICAL_HOST.patch    |  6 +-
 ...-installation-commands-as-shell-jobs.patch | 84 -------------------
 ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} |  7 +-
 3 files changed, 5 insertions(+), 92 deletions(-)
 delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
 rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%)

diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
index 5afba3c644..32f98e049b 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
@@ -1,4 +1,4 @@
-From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
+From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001
 From: Jussi Kukkonen <jussi.kukkonen@intel.com>
 Date: Tue, 30 May 2017 14:55:49 +0300
 Subject: [PATCH] Don't use AC_CANONICAL_HOST
@@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f2659a5..1e8b016 100644
+index 040975e..5f7b53a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -3,7 +3,6 @@ AC_PREREQ(2.53)
  
- AC_INIT([adwaita-icon-theme], [41.0],
+ AC_INIT([adwaita-icon-theme], [42.0],
          [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
 -AC_CANONICAL_HOST
  AC_CONFIG_MACRO_DIR([m4])
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
deleted file mode 100644
index a1d39cf558..0000000000
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Tue, 13 Jun 2017 18:10:06 +0300
-Subject: [PATCH] Run installation commands as shell jobs
-
-This greatly speeds up installation time on multi-core systems.
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- src/fullcolor/Makefile.am |  5 +++--
- src/spinner/Makefile.am   |  7 ++++---
- src/symbolic/Makefile.am  | 11 ++++++-----
- 3 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
-index d73529b..b7d0808 100644
---- a/src/fullcolor/Makefile.am
-+++ b/src/fullcolor/Makefile.am
-@@ -9,9 +9,10 @@ install-data-local:
- 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
- 			context="`dirname $$file`"; \
- 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
--			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- 		done; \
--	done;
-+	done; \
-+	wait
- 
- ## FIXME we should add a way to remove links generated by icon mapping
- uninstall-local:
-diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
-index c14caf6..322dc0d 100644
---- a/src/spinner/Makefile.am
-+++ b/src/spinner/Makefile.am
-@@ -24,13 +24,14 @@ install-data-local:
- 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
- 		      context="`dirname $$file`"; \
- 		      $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
--		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- 	      done; \
- 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
- 		context="`dirname $$file`"; \
- 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
--		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
--	done
-+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
-+	done; \
-+	wait
- 
- uninstall-local:
- 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
-diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
-index 957c0ee..e1f8818 100644
---- a/src/symbolic/Makefile.am
-+++ b/src/symbolic/Makefile.am
-@@ -34,18 +34,19 @@ install-data-local:
- 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
- 			context="`dirname $$file`"; \
- 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
--			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
-+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
- 		done; \
--	done
-+	done; \
- 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
- 		context="`dirname $$file`"; \
- 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
--		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
-+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
- 		for size in $(symbolic_encode_sizes); do \
- 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
--			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
-+			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
- 		done \
--	done
-+	done; \
-+	wait
- 
- uninstall-local:
- 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
similarity index 87%
rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
index 46f9f4772c..c4f3b1c999 100644
--- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
+++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
@@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
 
 inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
 
-SRC_URI += " \
-           file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
-           file://0001-Run-installation-commands-as-shell-jobs.patch \
-           "
+SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
 
-SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
+SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
 
 DEPENDS += "librsvg-native"
 
-- 
2.30.2

Re: [OE-core] [PATCH 4/4] adwaita-icon-theme: upgrade 41.0 -> 42.0

[Alexandre Belloni]

Hello Alex,

This has been reverted in master and requires fixing

On 14/04/2022 10:57:10+0200, Alexander Kanavin wrote:
> From: wangmy <wangmy@fujitsu.com>
> 
> 0001-Don-t-use-AC_CANONICAL_HOST.patch
> refreshed for version 42.0
> 
> 0001-Run-installation-commands-as-shell-jobs.patch
> removed since it's included in 42.o
> 
> (From OE-Core rev: 17a08277854eb1e8776cf7790f6255ea68bf0568)
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  .../0001-Don-t-use-AC_CANONICAL_HOST.patch    |  6 +-
>  ...-installation-commands-as-shell-jobs.patch | 84 -------------------
>  ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} |  7 +-
>  3 files changed, 5 insertions(+), 92 deletions(-)
>  delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
>  rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%)
> 
> diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> index 5afba3c644..32f98e049b 100644
> --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> @@ -1,4 +1,4 @@
> -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
> +From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001
>  From: Jussi Kukkonen <jussi.kukkonen@intel.com>
>  Date: Tue, 30 May 2017 14:55:49 +0300
>  Subject: [PATCH] Don't use AC_CANONICAL_HOST
> @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
>   1 file changed, 1 deletion(-)
>  
>  diff --git a/configure.ac b/configure.ac
> -index f2659a5..1e8b016 100644
> +index 040975e..5f7b53a 100644
>  --- a/configure.ac
>  +++ b/configure.ac
>  @@ -3,7 +3,6 @@ AC_PREREQ(2.53)
>   
> - AC_INIT([adwaita-icon-theme], [41.0],
> + AC_INIT([adwaita-icon-theme], [42.0],
>           [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
>  -AC_CANONICAL_HOST
>   AC_CONFIG_MACRO_DIR([m4])
> diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> deleted file mode 100644
> index a1d39cf558..0000000000
> --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> +++ /dev/null
> @@ -1,84 +0,0 @@
> -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Tue, 13 Jun 2017 18:10:06 +0300
> -Subject: [PATCH] Run installation commands as shell jobs
> -
> -This greatly speeds up installation time on multi-core systems.
> -
> -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -
> ----
> - src/fullcolor/Makefile.am |  5 +++--
> - src/spinner/Makefile.am   |  7 ++++---
> - src/symbolic/Makefile.am  | 11 ++++++-----
> - 3 files changed, 13 insertions(+), 10 deletions(-)
> -
> -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
> -index d73529b..b7d0808 100644
> ---- a/src/fullcolor/Makefile.am
> -+++ b/src/fullcolor/Makefile.am
> -@@ -9,9 +9,10 @@ install-data-local:
> - 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
> - 			context="`dirname $$file`"; \
> - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> --			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> -+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> - 		done; \
> --	done;
> -+	done; \
> -+	wait
> - 
> - ## FIXME we should add a way to remove links generated by icon mapping
> - uninstall-local:
> -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
> -index c14caf6..322dc0d 100644
> ---- a/src/spinner/Makefile.am
> -+++ b/src/spinner/Makefile.am
> -@@ -24,13 +24,14 @@ install-data-local:
> - 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> - 		      context="`dirname $$file`"; \
> - 		      $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> --		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> -+		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> - 	      done; \
> - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> - 		context="`dirname $$file`"; \
> - 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
> --		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
> --	done
> -+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
> -+	done; \
> -+	wait
> - 
> - uninstall-local:
> - 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
> -index 957c0ee..e1f8818 100644
> ---- a/src/symbolic/Makefile.am
> -+++ b/src/symbolic/Makefile.am
> -@@ -34,18 +34,19 @@ install-data-local:
> - 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> - 			context="`dirname $$file`"; \
> - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> --			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> -+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> - 		done; \
> --	done
> -+	done; \
> - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> - 		context="`dirname $$file`"; \
> - 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
> --		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
> -+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
> - 		for size in $(symbolic_encode_sizes); do \
> - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> --			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
> -+			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
> - 		done \
> --	done
> -+	done; \
> -+	wait
> - 
> - uninstall-local:
> - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> similarity index 87%
> rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> index 46f9f4772c..c4f3b1c999 100644
> --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
>  
>  inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
>  
> -SRC_URI += " \
> -           file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
> -           file://0001-Run-installation-commands-as-shell-jobs.patch \
> -           "
> +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
>  
> -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
> +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
>  
>  DEPENDS += "librsvg-native"
>  
> -- 
> 2.30.2
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#164400): https://lists.openembedded.org/g/openembedded-core/message/164400
> Mute This Topic: https://lists.openembedded.org/mt/90460267/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 4/4] adwaita-icon-theme: upgrade 41.0 -> 42.0

[Alexandre Belloni]

On 14/04/2022 11:07:07+0200, Alexandre Belloni wrote:
> Hello Alex,
> 
> This has been reverted in master and requires fixing

And I see you actually fixed it...

> 
> On 14/04/2022 10:57:10+0200, Alexander Kanavin wrote:
> > From: wangmy <wangmy@fujitsu.com>
> > 
> > 0001-Don-t-use-AC_CANONICAL_HOST.patch
> > refreshed for version 42.0
> > 
> > 0001-Run-installation-commands-as-shell-jobs.patch
> > removed since it's included in 42.o
> > 
> > (From OE-Core rev: 17a08277854eb1e8776cf7790f6255ea68bf0568)
> > 
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >  .../0001-Don-t-use-AC_CANONICAL_HOST.patch    |  6 +-
> >  ...-installation-commands-as-shell-jobs.patch | 84 -------------------
> >  ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} |  7 +-
> >  3 files changed, 5 insertions(+), 92 deletions(-)
> >  delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> >  rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%)
> > 
> > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > index 5afba3c644..32f98e049b 100644
> > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > @@ -1,4 +1,4 @@
> > -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
> > +From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001
> >  From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> >  Date: Tue, 30 May 2017 14:55:49 +0300
> >  Subject: [PATCH] Don't use AC_CANONICAL_HOST
> > @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> >   1 file changed, 1 deletion(-)
> >  
> >  diff --git a/configure.ac b/configure.ac
> > -index f2659a5..1e8b016 100644
> > +index 040975e..5f7b53a 100644
> >  --- a/configure.ac
> >  +++ b/configure.ac
> >  @@ -3,7 +3,6 @@ AC_PREREQ(2.53)
> >   
> > - AC_INIT([adwaita-icon-theme], [41.0],
> > + AC_INIT([adwaita-icon-theme], [42.0],
> >           [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
> >  -AC_CANONICAL_HOST
> >   AC_CONFIG_MACRO_DIR([m4])
> > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> > deleted file mode 100644
> > index a1d39cf558..0000000000
> > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> > +++ /dev/null
> > @@ -1,84 +0,0 @@
> > -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
> > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > -Date: Tue, 13 Jun 2017 18:10:06 +0300
> > -Subject: [PATCH] Run installation commands as shell jobs
> > -
> > -This greatly speeds up installation time on multi-core systems.
> > -
> > -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
> > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > -
> > ----
> > - src/fullcolor/Makefile.am |  5 +++--
> > - src/spinner/Makefile.am   |  7 ++++---
> > - src/symbolic/Makefile.am  | 11 ++++++-----
> > - 3 files changed, 13 insertions(+), 10 deletions(-)
> > -
> > -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
> > -index d73529b..b7d0808 100644
> > ---- a/src/fullcolor/Makefile.am
> > -+++ b/src/fullcolor/Makefile.am
> > -@@ -9,9 +9,10 @@ install-data-local:
> > - 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
> > - 			context="`dirname $$file`"; \
> > - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > --			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > -+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > - 		done; \
> > --	done;
> > -+	done; \
> > -+	wait
> > - 
> > - ## FIXME we should add a way to remove links generated by icon mapping
> > - uninstall-local:
> > -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
> > -index c14caf6..322dc0d 100644
> > ---- a/src/spinner/Makefile.am
> > -+++ b/src/spinner/Makefile.am
> > -@@ -24,13 +24,14 @@ install-data-local:
> > - 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> > - 		      context="`dirname $$file`"; \
> > - 		      $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > --		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > -+		      $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > - 	      done; \
> > - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> > - 		context="`dirname $$file`"; \
> > - 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
> > --		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
> > --	done
> > -+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
> > -+	done; \
> > -+	wait
> > - 
> > - uninstall-local:
> > - 	      for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> > -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
> > -index 957c0ee..e1f8818 100644
> > ---- a/src/symbolic/Makefile.am
> > -+++ b/src/symbolic/Makefile.am
> > -@@ -34,18 +34,19 @@ install-data-local:
> > - 		for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> > - 			context="`dirname $$file`"; \
> > - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > --			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > -+			$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > - 		done; \
> > --	done
> > -+	done; \
> > - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> > - 		context="`dirname $$file`"; \
> > - 		$(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
> > --		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
> > -+		$(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
> > - 		for size in $(symbolic_encode_sizes); do \
> > - 			$(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > --			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
> > -+			$(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
> > - 		done \
> > --	done
> > -+	done; \
> > -+	wait
> > - 
> > - uninstall-local:
> > - 	for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > similarity index 87%
> > rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> > rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > index 46f9f4772c..c4f3b1c999 100644
> > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> > +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
> >  
> >  inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
> >  
> > -SRC_URI += " \
> > -           file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
> > -           file://0001-Run-installation-commands-as-shell-jobs.patch \
> > -           "
> > +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
> >  
> > -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
> > +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
> >  
> >  DEPENDS += "librsvg-native"
> >  
> > -- 
> > 2.30.2
> > 
> 
> > 
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#164400): https://lists.openembedded.org/g/openembedded-core/message/164400
> > Mute This Topic: https://lists.openembedded.org/mt/90460267/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> > 
> 
> 
> -- 
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 4/4] adwaita-icon-theme: upgrade 41.0 -> 42.0

[Alexander Kanavin]

Kind of. Hold this off please, RP has a better plan.

Alex

On Thu, 14 Apr 2022 at 11:19, Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> On 14/04/2022 11:07:07+0200, Alexandre Belloni wrote:
> > Hello Alex,
> >
> > This has been reverted in master and requires fixing
>
> And I see you actually fixed it...
>
> >
> > On 14/04/2022 10:57:10+0200, Alexander Kanavin wrote:
> > > From: wangmy <wangmy@fujitsu.com>
> > >
> > > 0001-Don-t-use-AC_CANONICAL_HOST.patch
> > > refreshed for version 42.0
> > >
> > > 0001-Run-installation-commands-as-shell-jobs.patch
> > > removed since it's included in 42.o
> > >
> > > (From OE-Core rev: 17a08277854eb1e8776cf7790f6255ea68bf0568)
> > >
> > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > ---
> > >  .../0001-Don-t-use-AC_CANONICAL_HOST.patch    |  6 +-
> > >  ...-installation-commands-as-shell-jobs.patch | 84 -------------------
> > >  ...eme_41.0.bb => adwaita-icon-theme_42.0.bb} |  7 +-
> > >  3 files changed, 5 insertions(+), 92 deletions(-)
> > >  delete mode 100644 meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> > >  rename meta/recipes-gnome/gnome/{adwaita-icon-theme_41.0.bb => adwaita-icon-theme_42.0.bb} (87%)
> > >
> > > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > > index 5afba3c644..32f98e049b 100644
> > > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > > +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Don-t-use-AC_CANONICAL_HOST.patch
> > > @@ -1,4 +1,4 @@
> > > -From 63d97fefdbc90f5c68f67bdc30844776d9a1b720 Mon Sep 17 00:00:00 2001
> > > +From 15ffd817b3e334dc7c0508761c7ef417d76379c5 Mon Sep 17 00:00:00 2001
> > >  From: Jussi Kukkonen <jussi.kukkonen@intel.com>
> > >  Date: Tue, 30 May 2017 14:55:49 +0300
> > >  Subject: [PATCH] Don't use AC_CANONICAL_HOST
> > > @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> > >   1 file changed, 1 deletion(-)
> > >
> > >  diff --git a/configure.ac b/configure.ac
> > > -index f2659a5..1e8b016 100644
> > > +index 040975e..5f7b53a 100644
> > >  --- a/configure.ac
> > >  +++ b/configure.ac
> > >  @@ -3,7 +3,6 @@ AC_PREREQ(2.53)
> > >
> > > - AC_INIT([adwaita-icon-theme], [41.0],
> > > + AC_INIT([adwaita-icon-theme], [42.0],
> > >           [http://bugzilla.gnome.org/enter_bug.cgi?product=adwaita-icon-theme])
> > >  -AC_CANONICAL_HOST
> > >   AC_CONFIG_MACRO_DIR([m4])
> > > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch b/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> > > deleted file mode 100644
> > > index a1d39cf558..0000000000
> > > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme/0001-Run-installation-commands-as-shell-jobs.patch
> > > +++ /dev/null
> > > @@ -1,84 +0,0 @@
> > > -From 79da031e9811f3eef34b14cce419be93fea34319 Mon Sep 17 00:00:00 2001
> > > -From: Alexander Kanavin <alex.kanavin@gmail.com>
> > > -Date: Tue, 13 Jun 2017 18:10:06 +0300
> > > -Subject: [PATCH] Run installation commands as shell jobs
> > > -
> > > -This greatly speeds up installation time on multi-core systems.
> > > -
> > > -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/merge_requests/39]
> > > -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > -
> > > ----
> > > - src/fullcolor/Makefile.am |  5 +++--
> > > - src/spinner/Makefile.am   |  7 ++++---
> > > - src/symbolic/Makefile.am  | 11 ++++++-----
> > > - 3 files changed, 13 insertions(+), 10 deletions(-)
> > > -
> > > -diff --git a/src/fullcolor/Makefile.am b/src/fullcolor/Makefile.am
> > > -index d73529b..b7d0808 100644
> > > ---- a/src/fullcolor/Makefile.am
> > > -+++ b/src/fullcolor/Makefile.am
> > > -@@ -9,9 +9,10 @@ install-data-local:
> > > -           for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size && find . -name "*.png"`; do \
> > > -                   context="`dirname $$file`"; \
> > > -                   $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > > --                  $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > > -+                  $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > > -           done; \
> > > --  done;
> > > -+  done; \
> > > -+  wait
> > > -
> > > - ## FIXME we should add a way to remove links generated by icon mapping
> > > - uninstall-local:
> > > -diff --git a/src/spinner/Makefile.am b/src/spinner/Makefile.am
> > > -index c14caf6..322dc0d 100644
> > > ---- a/src/spinner/Makefile.am
> > > -+++ b/src/spinner/Makefile.am
> > > -@@ -24,13 +24,14 @@ install-data-local:
> > > -         for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> > > -                 context="`dirname $$file`"; \
> > > -                 $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > > --                $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > > -+                $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > > -         done; \
> > > -   for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> > > -           context="`dirname $$file`"; \
> > > -           $(mkdir_p) $(DESTDIR)$(themedir)/scalable-up-to-32/$$context; \
> > > --          $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file; \
> > > --  done
> > > -+          $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32/$$file $(DESTDIR)$(themedir)/scalable-up-to-32/$$file & \
> > > -+  done; \
> > > -+  wait
> > > -
> > > - uninstall-local:
> > > -         for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable-up-to-32; find . -name "*.svg"`; do \
> > > -diff --git a/src/symbolic/Makefile.am b/src/symbolic/Makefile.am
> > > -index 957c0ee..e1f8818 100644
> > > ---- a/src/symbolic/Makefile.am
> > > -+++ b/src/symbolic/Makefile.am
> > > -@@ -34,18 +34,19 @@ install-data-local:
> > > -           for file in `cd $(top_srcdir)/$(SVGOUTDIR)/$$size; find . -name "*.png"`; do \
> > > -                   context="`dirname $$file`"; \
> > > -                   $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > > --                  $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file; \
> > > -+                  $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/$$size/$$file $(DESTDIR)$(themedir)/$$size/$$file & \
> > > -           done; \
> > > --  done
> > > -+  done; \
> > > -   for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> > > -           context="`dirname $$file`"; \
> > > -           $(mkdir_p) $(DESTDIR)$(themedir)/scalable/$$context; \
> > > --          $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file; \
> > > -+          $(install_sh_DATA) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $(DESTDIR)$(themedir)/scalable/$$file & \
> > > -           for size in $(symbolic_encode_sizes); do \
> > > -                   $(mkdir_p) $(DESTDIR)$(themedir)/$$size/$$context; \
> > > --                  $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context; \
> > > -+                  $(GTK_ENCODE_SYMBOLIC_SVG) $(top_srcdir)/$(SVGOUTDIR)/scalable/$$file $$size -o $(DESTDIR)$(themedir)/$$size/$$context & \
> > > -           done \
> > > --  done
> > > -+  done; \
> > > -+  wait
> > > -
> > > - uninstall-local:
> > > -   for file in `cd $(top_srcdir)/$(SVGOUTDIR)/scalable; find . -name "*.svg"`; do \
> > > diff --git a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > > similarity index 87%
> > > rename from meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> > > rename to meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > > index 46f9f4772c..c4f3b1c999 100644
> > > --- a/meta/recipes-gnome/gnome/adwaita-icon-theme_41.0.bb
> > > +++ b/meta/recipes-gnome/gnome/adwaita-icon-theme_42.0.bb
> > > @@ -12,12 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \
> > >
> > >  inherit allarch autotools pkgconfig gettext gtk-icon-cache gnomebase
> > >
> > > -SRC_URI += " \
> > > -           file://0001-Don-t-use-AC_CANONICAL_HOST.patch \
> > > -           file://0001-Run-installation-commands-as-shell-jobs.patch \
> > > -           "
> > > +SRC_URI += " file://0001-Don-t-use-AC_CANONICAL_HOST.patch"
> > >
> > > -SRC_URI[archive.sha256sum] = "ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba"
> > > +SRC_URI[archive.sha256sum] = "5e85b5adc8dee666900fcaf271ba717f7dcb9d0a03d96dae08f9cbd27e18b1e0"
> > >
> > >  DEPENDS += "librsvg-native"
> > >
> > > --
> > > 2.30.2
> > >
> >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#164400): https://lists.openembedded.org/g/openembedded-core/message/164400
> > > Mute This Topic: https://lists.openembedded.org/mt/90460267/3617179
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com