subtree updates

meta-security: 93232ae6d5..6466c6fb02:
  Armin Kuster (1):
        tpm-tools: fix build issue

poky: dc29017614..7d2f118cb6:
  Alexander Kanavin (3):
        python3: apply test skipping patch unconditionally
        selftest: do not hardcode /tmp/sdk
        bootchart2: update 0.14.8 -> 0.14.9

  Andrej Valek (1):
        busybox: add tmpdir option into mktemp applet

  Bruce Ashfield (7):
        linux-yocto/5.4: update to v5.4.124
        linux-yocto/5.4: update to v5.4.125
        linux-yocto/5.4: update to v5.4.128
        linux-yocto/5.4: update to v5.4.129
        linux-yocto/5.4: update to v5.4.131
        linux-yocto/5.4: update to v5.4.132
        kernel-devsrc: fix 32bit ARM devsrc builds

  Chen Qi (1):
        busybox: fix CVE-2021-28831

  Denys Dmytriyenko (1):
        bitbake: providers: replace newly added logger.warn() with logger.warning()

  Florian Amstutz (1):
        devtool: deploy-target: Fix preserving attributes when using --strip

  Khem Raj (1):
        webkitgtk: Upgrade to 2.28.4

  Marek Vasut (1):
        update-rc.d: update SRCREV to pull in fix for non-bash shell support

  Michael Ho (1):
        sstate.bbclass: fix errors about read-only sstate mirrors

  Minjae Kim (3):
        rpm: fix CVE-2021-3421
        gstreamer-plugins-base: fix CVE-2021-3522
        dhcp: fix CVE-2021-25217

  Richard Purdie (16):
        kernel: Fix interaction when packaging disabled
        kernel-devicetree: Fix interaction when packaging disabled
        perf: Use python3targetconfig to ensure we use target libraries
        package_pkgdata: Avoid task hash mismatches for generic task changes
        oeqa/selftest/runcmd: Tweal test timeouts
        sstate/staging: Handle directory creation race issue
        oeqa/selftest/archiver: Allow tests to ignore empty directories
        webkitgtk: upgrade 2.28.2 -> 2.28.3
        dwarfsrcfiles: Avoid races over debug-link files
        oeqa/selftest/multiprocesslauch: Fix test race
        report-error: Drop pointless inherit
        pseudo: Add uninative configuration sanity check
        pseudo: Update to latest version including statx fix
        sstate: Drop pseudo exclusion
        bitbake: data_smart/parse: Allow ':' characters in variable/function names
        bitbake: data_smart: Allow colon in variable expansion regex

  Steve Sakoman (6):
        glibc: update to lastest 2.31 release HEAD
        bluez: fix CVE-2021-3588
        gstreamer-plugins-base: ignore CVE-2021-3522 since it is fixed
        gstreamer-plugins-good: ignore CVE-2021-3497/8 since they are fixed
        documentation: prepare for 3.1.10 release
        poky.conf: Bump version for 3.1.10 release

  Tim Orling (2):
        python3: skip tests requiring tools-sdk
        python3: upgrade 3.8.10 -> 3.8.11

  Tomasz Dziendzielski (1):
        bitbake: BBHandler: Don't classify shell functions that names start with "python*" as python function

  Zoltán Böszörményi (1):
        tzdata: Allow controlling zoneinfo binary format

meta-openembedded: c38d2a74f7..85f8047c71:
  Adrian Zaharia (1):
        ntp: fix ntpdate to wait for subprocesses

  Armin Kuster (4):
        dovecot: add CVE-2016-4983 to allowlist
        mariadb: update to 10.4.20
        hiawatha: fix url.
        wireshark: update to 3.2.15

  Armin kuster (1):
        postgresql: update to 12.7

  Bruce Ashfield (1):
        vboxguestdrivers: fix build against kernel v5.10+

  Changqing Li (2):
        nginx: fix CVE-2021-23017
        php: allow php as empty

  Chen Qi (1):
        python3-django: upgrade to 2.2.20

  Diego Santa Cruz (1):
        php: split out phpdbg into a separate package

  Gianfranco (5):
        vboxguestdrivers: upgrade 6.1.16 -> 6.1.18
        vboxguestdrivers: Add patch proposed upstream to fix a build failure on i386
        vboxguestdrivers: upgrade 6.1.18 -> 6.1.20
        vboxguestdrivers: upgrade 6.1.20 -> 6.1.22
        vboxguestdrivers: add a fix for build failure with kernel 5.13

  Gianfranco Costamagna (3):
        vboxguestdrivers: upgrade 6.1.6 -> 6.1.12
        vboxguestdrivers: upgrade 6.1.12 -> 6.1.14 Drop kernel 5.8 compatibility patch, now part of upstream codebase
        vboxguestdrivers: upgrade 6.1.14 -> 6.1.16

  Hongxu Jia (1):
        vboxguestdrivers: fix failed to compile with kernel 5.8.0

  Jate Sujjavanich (1):
        ufw: backport patches, update RRECOMMENDS, python3 support, tests

  Khem Raj (5):
        tracker-miners: Check for commercial license to enable ffmpeg
        sysprof: Enable sysprofd/libsysprof only when polkit in DISTRO_FEATURES
        vboxguestdrivers: Fix build with kernel 5.8
        vboxguestdrivers: Add __divmoddi4 builtin support
        libdevmapper,lvm2: Do not inherit license

  Li Wang (1):
        apache2: fix CVE-2020-13950 CVE-2020-35452 CVE-2021-26690 CVE-2021-26691 CVE-2021-30641

  Marek Vasut (1):
        nss: Fix build on Centos 7

  Masaki Ambai (1):
        nss: add CVE-2006-5201 to allowlist

  Mingli Yu (1):
        php: Upgrade to 7.4.16

  Nicolas Dechesne (4):
        python3-markupsafe: remove recipe
        python3-jinja2: remove recipe
        python3-{pyyaml,cython,pyparsing}: move from meta-python to meta-oe
        ostree: Do not check for meta-python

  Sekine Shigeki (1):
        add CVE-2011-2411 to allowlist

  Stefan Ghinea (1):
        python3-django: fix CVE-2021-28658

  Trevor Gamblin (5):
        python3-django: upgrade 2.2.7 -> 2.2.13
        python3-django: upgrade 2.2.13 -> 2.2.16
        python3-django: upgrade 2.2.20 -> 2.2.22
        python3-django: upgrade 2.2.22 -> 2.2.23
        python3-django: upgrade 2.2.23 -> 2.2.24

  ito-yuichi@fujitsu.com (1):
        cyrus-sasl: add CVE-2020-8032 to allowlist

meta-raspberrypi: f0c75016f0..59c2d6f7a8:
  Omer Akram (1):
        Update raspberrypi firmware to 20210527
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2e79fff133f97a0afa01ba390435aa22142bf976

4 files changed, 23 insertions, 28 deletions

diff --git a/poky/meta/lib/oeqa/selftest/cases/archiver.py b/poky/meta/lib/oeqa/selftest/cases/archiver.py
index bc5447d2a3..6a5c8ec71e 100644
--- a/poky/meta/lib/oeqa/selftest/cases/archiver.py
+++ b/poky/meta/lib/oeqa/selftest/cases/archiver.py
@@ -35,11 +35,11 @@ class Archiver(OESelftestTestCase):
         src_path = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['TARGET_SYS'])
 
         # Check that include_recipe was included
-        included_present = len(glob.glob(src_path + '/%s-*' % include_recipe))
+        included_present = len(glob.glob(src_path + '/%s-*/*' % include_recipe))
         self.assertTrue(included_present, 'Recipe %s was not included.' % include_recipe)
 
         # Check that exclude_recipe was excluded
-        excluded_present = len(glob.glob(src_path + '/%s-*' % exclude_recipe))
+        excluded_present = len(glob.glob(src_path + '/%s-*/*' % exclude_recipe))
         self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % exclude_recipe)
 
     def test_archiver_filters_by_type(self):
@@ -67,11 +67,11 @@ class Archiver(OESelftestTestCase):
         src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS'])
 
         # Check that target_recipe was included
-        included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipe))
+        included_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipe))
         self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipe)
 
         # Check that native_recipe was excluded
-        excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipe))
+        excluded_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipe))
         self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipe)
 
     def test_archiver_filters_by_type_and_name(self):
@@ -104,17 +104,17 @@ class Archiver(OESelftestTestCase):
         src_path_native = os.path.join(bb_vars['DEPLOY_DIR_SRC'], bb_vars['BUILD_SYS'])
 
         # Check that target_recipe[0] and native_recipes[1] were included
-        included_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[0]))
+        included_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipes[0]))
         self.assertTrue(included_present, 'Recipe %s was not included.' % target_recipes[0])
 
-        included_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[1]))
+        included_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipes[1]))
         self.assertTrue(included_present, 'Recipe %s was not included.' % native_recipes[1])
 
         # Check that native_recipes[0] and target_recipes[1] were excluded
-        excluded_present = len(glob.glob(src_path_native + '/%s-*' % native_recipes[0]))
+        excluded_present = len(glob.glob(src_path_native + '/%s-*/*' % native_recipes[0]))
         self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % native_recipes[0])
 
-        excluded_present = len(glob.glob(src_path_target + '/%s-*' % target_recipes[1]))
+        excluded_present = len(glob.glob(src_path_target + '/%s-*/*' % target_recipes[1]))
         self.assertFalse(excluded_present, 'Recipe %s was not excluded.' % target_recipes[1])
 
 
diff --git a/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py b/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
index a7214beb4c..bbf67bf9c9 100644
--- a/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
+++ b/poky/meta/lib/oeqa/selftest/cases/oelib/utils.py
@@ -64,7 +64,7 @@ class TestMultiprocessLaunch(TestCase):
         import bb
 
         def testfunction(item, d):
-            if item == "2" or item == "1":
+            if item == "2":
                 raise KeyError("Invalid number %s" % item)
             return "Found %s" % item
 
@@ -99,5 +99,4 @@ class TestMultiprocessLaunch(TestCase):
         # Assert the function prints exceptions
         with captured_output() as (out, err):
             self.assertRaises(bb.BBHandledException, multiprocess_launch, testfunction, ["1", "2", "3", "4", "5", "6"], d, extraargs=(d,))
-        self.assertIn("KeyError: 'Invalid number 1'", out.getvalue())
         self.assertIn("KeyError: 'Invalid number 2'", out.getvalue())
diff --git a/poky/meta/lib/oeqa/selftest/cases/runcmd.py b/poky/meta/lib/oeqa/selftest/cases/runcmd.py
index fa6113d7fa..e9612389fe 100644
--- a/poky/meta/lib/oeqa/selftest/cases/runcmd.py
+++ b/poky/meta/lib/oeqa/selftest/cases/runcmd.py
@@ -27,8 +27,8 @@ class RunCmdTests(OESelftestTestCase):
 
     # The delta is intentionally smaller than the timeout, to detect cases where
     # we incorrectly apply the timeout more than once.
-    TIMEOUT = 5
-    DELTA = 3
+    TIMEOUT = 10
+    DELTA = 8
 
     def test_result_okay(self):
         result = runCmd("true")
diff --git a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
index 976b513727..353d411681 100644
--- a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -14,11 +14,6 @@ from oeqa.core.decorator.data import skipIfNotQemu
 
 class TestExport(OESelftestTestCase):
 
-    @classmethod
-    def tearDownClass(cls):
-        runCmd("rm -rf /tmp/sdk")
-        super(TestExport, cls).tearDownClass()
-
     def test_testexport_basic(self):
         """
         Summary: Check basic testexport functionality with only ping test enabled.
@@ -95,19 +90,20 @@ class TestExport(OESelftestTestCase):
         msg = "Couldn't find SDK tarball: %s" % tarball_path
         self.assertEqual(os.path.isfile(tarball_path), True, msg)
 
-        # Extract SDK and run tar from SDK
-        result = runCmd("%s -y -d /tmp/sdk" % tarball_path)
-        self.assertEqual(0, result.status, "Couldn't extract SDK")
+        with tempfile.TemporaryDirectory() as tmpdirname:
+            # Extract SDK and run tar from SDK
+            result = runCmd("%s -y -d %s" % (tarball_path, tmpdirname))
+            self.assertEqual(0, result.status, "Couldn't extract SDK")
 
-        env_script = result.output.split()[-1]
-        result = runCmd(". %s; which tar" % env_script, shell=True)
-        self.assertEqual(0, result.status, "Couldn't setup SDK environment")
-        is_sdk_tar = True if "/tmp/sdk" in result.output else False
-        self.assertTrue(is_sdk_tar, "Couldn't setup SDK environment")
+            env_script = result.output.split()[-1]
+            result = runCmd(". %s; which tar" % env_script, shell=True)
+            self.assertEqual(0, result.status, "Couldn't setup SDK environment")
+            is_sdk_tar = True if tmpdirname in result.output else False
+            self.assertTrue(is_sdk_tar, "Couldn't setup SDK environment")
 
-        tar_sdk = result.output
-        result = runCmd("%s --version" % tar_sdk)
-        self.assertEqual(0, result.status, "Couldn't run tar from SDK")
+            tar_sdk = result.output
+            result = runCmd("%s --version" % tar_sdk)
+            self.assertEqual(0, result.status, "Couldn't run tar from SDK")
 
 
 class TestImage(OESelftestTestCase):