subtree updates

poky: 387ab5f18b..eaf8ce9d39:
  Alejandro Hernandez Samaniego (1):
        rootfs.py: dont try to list installed packages for baremetal images

  Alex Stewart (1):
        maintainers: update opkg maintainer

  Alexander Kanavin (26):
        devtool/upgrade: correctly clean up when recipe filename isn't yet known
        devtool/upgrade: catch bb.fetch2.decodeurl errors
        scripts/oe-setup-builddir: make it known where configurations come from
        bluez5: update 5.64 -> 5.65
        libwpe: upgrade 1.12.0 -> 1.12.2
        ell: upgrade 0.49 -> 0.50
        iso-codes: upgrade 4.10.0 -> 4.11.0
        libcap: upgrade 2.64 -> 2.65
        libwebp: upgrade 1.2.2 -> 1.2.3
        mobile-broadband-provider-info: upgrade 20220511 -> 20220725
        webkitgtk: upgrade 2.36.4 -> 2.36.5
        weston: upgrade 10.0.1 -> 10.0.2
        tzdata: upgrade 2022a -> 2022b
        xz: update 5.2.5 -> 5.2.6
        gdk-pixbuf: upgrade 2.42.6 -> 2.42.8
        gdk-pixbuf: update 2.42.8 -> 2.42.9
        epiphany: upgrade 42.3 -> 42.4
        glib-networking: upgrade 2.72.1 -> 2.72.2
        libjpeg-turbo: upgrade 2.1.3 -> 2.1.4
        libwebp: upgrade 1.2.3 -> 1.2.4
        wireless-regdb: upgrade 2022.06.06 -> 2022.08.12
        wpebackend-fdo: upgrade 1.12.0 -> 1.12.1
        bind: upgrade 9.18.4 -> 9.18.5
        lighttpd: upgrade 1.4.65 -> 1.4.66
        rpm: update 4.17.0 -> 4.17.1
        tzdata: update to 2022d

  Alexandre Belloni (3):
        ruby: drop capstone support
        runqemu: display host uptime when starting
        oeqa/runtime/dnf: fix typo

  Andrei Gherzan (4):
        linux-yocto: Fix COMPATIBLE_MACHINE regex match
        shadow: Enable subid support
        rootfspostcommands.py: Cleanup subid backup files generated by shadow-utils
        shadow: Avoid nss warning/error with musl

  Anuj Mittal (1):
        poky.conf: add ubuntu-22.04 to tested distros

  Aryaman Gupta (2):
        bitbake: bitbake: runqueue: add cpu/io pressure regulation
        bitbake: bitbake: runqueue: add memory pressure regulation

  Awais Belal (1):
        kernel-fitimage.bbclass: only package unique DTBs

  Beniamin Sandu (1):
        libpam: use /run instead of /var/run in systemd tmpfiles

  Bertrand Marquis (1):
        sysvinit-inittab/start_getty: Fix respawn too fast

  Bruce Ashfield (16):
        lttng-modules: fix 5.19+ build
        lttng-modules: fix build against mips and v5.19 kernel
        lttng-modules: replace mips compaction fix with upstream change
        linux-yocto/5.15: update to v5.15.60
        linux-yocto/5.15: update to v5.15.62
        linux-yocto/5.10: update to v5.10.136
        linux-yocto/5.10: update to v5.10.137
        linux-yocto/5.10: update to v5.10.141
        linux-yocto/5.10: update to v5.10.143
        linux-yocto/5.15: update to v5.15.63
        linux-yocto/5.15: update to v5.15.65
        linux-yocto/5.15: update to v5.15.68
        linux-yocto/5.15: cfg: fix ACPI warnings for -tiny
        kernel-yocto: allow patch author date to be commit date
        kern-tools: fix queue processing in relative TOPDIR configurations
        kern-tools: allow 'y' or 'm' to avoid config audit warnings

  Changqing Li (1):
        apt: fix nativesdk-apt build failure during the second time build

  Chee Yang Lee (1):
        sqlite: add CVE-2022-35737 patch to SRC_URI

  Daiane Angolini (1):
        python3-pip: Fix RDEPENDS after the update

  Daniel McGregor (1):
        coreutils: add openssl PACKAGECONFIG

  Denys Dmytriyenko (1):
        glibc-locale: explicitly remove empty dirs in ${libdir}

  Dmitry Baryshkov (2):
        linux-firmware: upgrade 20220708 -> 20220913
        linux-firmware: package new Qualcomm firmware

  Enrico Scholz (5):
        npm: replace 'npm pack' call by 'tar czf'
        npm: return content of 'package.json' in 'npm_pack'
        npm: take 'version' directly from 'package.json'
        lib:npm_registry: initial checkin
        npm: use npm_registry to cache package

  Ernst Sjöstrand (1):
        cve-check: Don't use f-strings

  Florin Diaconescu (4):
        expat: upgrade 2.4.7 -> 2.4.8
        expat: upgrade 2.4.8 -> 2.4.9
        rsync: update 3.2.3 -> 3.2.4
        rsync: update 3.2.4 -> 3.2.5

  Gennaro Iorio (1):
        bitbake: fetch2: gitsm: fix incorrect handling of git submodule relative urls

  He Zhe (3):
        lttng-tools: Disable on qemuriscv32
        stress-cpu: disable float128 math on powerpc64 to avoid SIGILL
        lttng-tools: Disable on riscv32

  Hitendra Prajapati (5):
        gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow
        gnutls: CVE-2022-2509 Double free during gnutls_pkcs7_verify
        zlib: CVE-2022-37434 a heap-based buffer over-read
        libtiff: CVE-2022-34526 A stack overflow was discovered
        Revert "gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow"

  Jacob Kroon (1):
        bitbake: bitbake-user-manual: Correct description of the ??= operator

  Jon Mason (2):
        ref-manual: add numa to machine features
        oeqa/parselogs: add qemuarmv5 arm-charlcd masking

  Jose Quaresma (7):
        archiver.bbclass: remove unsed do_deploy_archives[dirs]
        create-spdx: ignore packing control files from ipk and deb
        archiver.bbclass: some recipes that uses the kernelsrc bbclass uses the shared source
        linux-yocto: prepend the the value with a space when append to KERNEL_EXTRA_ARGS
        bitbake: bitbake: bitbake-user-manual: hashserv can be accessed on a dedicated domain
        bitbake: bb/utils: remove: check the path again the expand python glob
        bitbake: bb/utils: movefile: use the logger for printing

  Joshua Watt (4):
        bitbake: utils: Pass lock argument in fileslocked
        classes: cve-check: Get shared database lock
        oeqa: qemurunner: Report UNIX Epoch timestamp on login
        bitbake: siggen: Fix insufficent entropy in sigtask file names

  Kai Kang (1):
        packagegroup-self-hosted: update for strace

  Khem Raj (15):
        libxml2: Ignore CVE-2016-3709
        connman: Backports for security fixes
        cracklib: Drop using register keyword
        tcp-wrappers: Fix implicit-function-declaration warnings
        xinetd: Pass missing -D_GNU_SOURCE
        watchdog: Include needed system header for function decls
        pinentry: enable _XOPEN_SOURCE on musl for wchar usage in curses
        apr: Use correct strerror_r implementation based on libc type
        gcr: Define _GNU_SOURCE
        apr: Cache configure tests which use AC_TRY_RUN
        autoconf: Fix strict prototype errors in generated tests
        autoconf: Update K & R stype functions
        webkitgtk: Upgrade to 2.36.6 minor update
        webkitgtk: Update to 2.36.7
        rpm: Remove -Wimplicit-function-declaration warnings

  Kristian Amlie (1):
        externalsrc: Don't wipe out src dir when EXPORT_FUNCTIONS is used.

  LUIS ENRIQUEZ (1):
        kernel-fitimage.bbclass: add padding algorithm property in config nodes

  Mark Hatle (1):
        runqemu: Add missing space on default display option

  Martin Beeger (1):
        cmake: remove CMAKE_ASM_FLAGS variable in toolchain file

  Martin Jansa (2):
        libxml2: Port gentest.py to Python-3
        create-pull-request: don't switch the git remote protocol to git://

  Mateusz Marciniec (1):
        util-linux: Remove --enable-raw from EXTRA_OECONF

  Michael Opdenacker (7):
        migration guides: add missing release notes
        bitbake: doc: bitbake-user-manual: add explicit target for crates fetcher
        bitbake: doc: bitbake-user-manual: document npm and npmsw fetchers
        bitbake: bitbake-user-manual: npm fetcher: improve description of SRC_URI format
        poky.yaml.in: update version requirements
        migration-guides: add 4.0.4 release notes
        dev-manual: fix reference to BitBake user manual

  Mihai Lindner (1):
        create-spdx: Fix supplier field

  Mikko Rapeli (7):
        boost: fix install of fiber shared libraries
        bitbake: event.py: ignore exceptions from stdout and sterr operations in atexit
        u-boot: switch from append to += in SRC_URI
        glibc-tests: use += instead of :append
        go-native: switch from SRC_URI:append to SRC_URI +=
        python3-rfc3986-validator: switch from SRC_URI:append to SRC_URI +=
        linux-libc-headers: switch from SRC_URI:append to SRC_URI +=

  Ming Liu (1):
        meta: introduce UBOOT_MKIMAGE_KERNEL_TYPE

  Mingli Yu (1):
        busybox: add devmem 128-bit support

  Neil Horman (1):
        bitbake: Fix npm to use https rather than http

  Ola x Nilsson (1):
        bitbake: ConfHandler: Remove lingering close

  Otavio Salvador (1):
        bitbake: toaster: fix kirkstone version

  Paul Eggleton (1):
        relocate_sdk.py: ensure interpreter size error causes relocation to fail

  Pavel Zhukov (4):
        package_rpm: Do not replace square brackets in %files
        parselogs: Ignore xf86OpenConsole error
        core-image.bbclass: Exclude openssh complementary packages
        bitbake: gitsm: Error out if submodule refers to parent repo

  Peter Bergin (1):
        rootfs-postcommands.bbclass: avoid moving ssh host keys if etc is writable

  Peter Kjellerstedt (1):
        cairo: Adapt the license information based on what is being built

  Peter Marko (1):
        create-spdx: handle links to inaccessible locations

  Rajesh Dangi (2):
        linux-yocto/5.15: update genericx86* machines to v5.15.59
        linux-yocto/5.10: update genericx86* machines to v5.10.135

  Randy MacLeod (1):
        vim: update from 9.0.0063 to 9.0.0115

  Rasmus Villemoes (1):
        bitbake.conf: set BB_DEFAULT_UMASK using ??=

  Richard Purdie (25):
        nativesdk: Clear TUNE_FEATURES
        selftest/wic: Tweak test case to not depend on kernel size
        bitbake: runqueue: Change pressure file warning to a note
        perf: Fix reproducibility issues with 5.19 onwards
        vim: Upgrade 9.0.0115 -> 9.0.0242
        vim: Upgrade 9.0.0242 -> 9.0.0341
        pseudo: Update to include recent upstream minor fixes
        bitbake: runqueue: Fix unihash cache mismatch issues
        bitbake: cooker: Drop sre_constants usage
        bitbake: ConfHandler/BBHandler: Improve comment error messages and add tests
        bitbake: fetch2: Ensure directory exists before creating symlink
        gcc-multilib-config: Fix i686 toolchain relocation issues
        kernel: Always set CC and LD for the kernel build
        kernel: Use consistent make flags for menuconfig
        vim: Upgrade 9.0.0341 -> 9.0.0453
        build-appliance-image: Update to kirkstone head revision
        libpng: upgrade 1.6.37 -> 1.6.38
        vim: Upgrade 9.0.453 -> 9.0.541
        perf: Fix for recent kernel upgrades
        vim: Upgrade 9.0.0541 -> 9.0.0598
        bitbake: runqueue: Ensure deferred tasks are sorted by multiconfig
        bitbake: runqueue: Improve deadlock warning messages
        bitbake: runqueue: Drop deadlock breaking force fail
        bitbake: bitbake: Add copyright headers where missing
        bitbake: asyncrpc/client: Fix unix domain socket chdir race issues

  Robert Joslyn (2):
        curl: Backport patch for CVE-2022-35252
        tzdata: Update from 2022b to 2022c

  Roland Hieber (1):
        devtool: error out when workspace is using old override syntax

  Ross Burton (8):
        oeqa/qemurunner: add run_serial() comment
        oeqa/selftest: rename git.py to intercept.py
        oeqa/gotoolchain: put writable files in the Go module cache
        oeqa/gotoolchain: set CGO_ENABLED=1
        wic: add target tools to PATH when executing native commands
        wic/bootimg-efi: use cross objcopy when building unified kernel image
        wic: depend on cross-binutils
        cve-check: close cursors as soon as possible

  Ruiqiang Hao (2):
        gcc: add arm-v9 support
        tune-neoversen2: support tune-neoversen2 base on armv9a

  Sakib Sajal (9):
        qemu: fix CVE-2021-3507
        qemu: fix CVE-2021-3929
        qemu: fix CVE-2021-4158
        qemu: fix CVE-2022-0358
        qemu: fix CVE-2022-0216
        u-boot: fix CVE-2022-33103
        u-boot: fix CVE-2022-30552
        u-boot: fix CVE-2022-33967
        go: update v1.17.12 -> v1.17.13

  Samuli Piippo (2):
        Revert "gcc-cross-canadian: Add symlink to real-ld alongside other symlinks"
        gcc-cross-canadian: add default plugin linker

  Shubham Kulkarni (1):
        sanity: add a comment to ensure CONNECTIVITY_CHECK_URIS is correct

  Steve Sakoman (3):
        lttng-modules: fix build for kernel 5.10.137
        poky.conf: bump version for 4.0.4
        system-requirements.rst: Add Ubuntu 22.04 to list of supported distros

  Sundeep KOKKONDA (1):
        glibc: stable 2.35 branch updates.

  Teoh Jay Shen (3):
        go: fix CVE-2022-27664
        inetutils: fix CVE-2022-39028 - remote DoS vulnerability in inetutils-telnetd
        bind: upgrade 9.18.6 -> 9.18.7

  Ulrich Ölmann (1):
        scripts/runqemu.README: fix typos and trailing whitespaces

  Xiangyu Chen (1):
        ltp: Fix pread02 case trigger the glibc overflow detection

  Yang Xu (1):
        insane.bbclass: Skip patches not in oe-core by full path

  Yongxin Liu (1):
        grub2: fix several CVEs

  ghassaneben (1):
        sqlite: fix CVE-2022-35737

  niko.mauno@vaisala.com (2):
        systemd: Fix unwritable /var/lock when no sysvinit handling
        systemd: Add 'no-dns-fallback' PACKAGECONFIG option

  pgowda (3):
        binutils : CVE-2022-38533
        binutils: fix CVE-2022-38126
        binutils : Fix CVE-2022-38127

  wangmy (10):
        libcap: upgrade 2.63 -> 2.64
        libtasn1: upgrade 4.18.0 -> 4.19.0
        liburcu: upgrade 0.13.1 -> 0.13.2
        libwpe: upgrade 1.12.2 -> 1.12.3
        libatomic-ops: upgrade 7.6.12 -> 7.6.14
        lz4: upgrade 1.9.3 -> 1.9.4
        cracklib: upgrade 2.9.7 -> 2.9.8
        vala: upgrade 0.56.2 -> 0.56.3
        lighttpd: upgrade 1.4.64 -> 1.4.65
        bind: upgrade 9.18.5 -> 9.18.6

meta-raspberrypi: 0135a02ea5..dacad9302a:
  Lluis Campos (1):
        rpi-cmdline: do_compile: Use pure Python syntax to get `CMDLINE`

  Vinicius Aquino (1):
        raspberrypi-firmware: Update to 20220830 snapshot

meta-openembedded: acbe748798..744a4b6eda:
  Changqing Li (2):
        fuse3: support ptest
        fuse3: fix ptest test_passthrough_hp failure

  Chen Qi (1):
        polkit: refresh patch

  Enrico Scholz (1):
        nodejs-oe-cache-native: initial checkin

  Hitendra Prajapati (1):
        wireshark: CVE-2022-3190 Infinite loop in legacy style dissector

  Hitomi Hasegawa (1):
        libsdl: add CVE-2019-14906 to allowlist

  Jose Quaresma (2):
        wireguard-module: 1.0.20210219 -> 1.0.20220627
        wireguard-tools: Add a new package for wg-quick

  Justin Bronder (1):
        lmdb: only set SONAME on the shared library

  Khem Raj (5):
        audit: Upgrade to 3.0.8 and fix build with linux 5.17+
        ntpsec: Add -D_GNU_SOURCE and fix building with devtool
        gd: Fix build with clang-15
        safec: Remove unused variable 'len'
        audit: Revert the tweak done in configure step in do_install

  Lei Maohui (1):
        xrdp: Fix buildpaths warning.

  Martin Jansa (1):
        libcec: fix runtime dependencies for ${PN}-examples

  Mingli Yu (1):
        postgresql: make sure pam conf installed when pam enabled

  Ovidiu Panait (1):
        net-snmp: upgrade 5.9.1 -> 5.9.3

  Richard Purdie (1):
        lmdb: Don't inherit base

  Sakib Sajal (1):
        minicoredumper: retry elf parsing as long as needed

  Saul Wold (10):
        libipc-signal-perl: Fix LICENSE string
        libdigest-hmac-perl: Fix LICENSE string
        libio-socket-ssl-perl: Fix LICENSE string
        libdigest-sha1-perl: Fix LICENSE string
        libmime-types-perl: Fix LICENSE string
        libauthen-sasl-perl: Fix LICENSE string
        libnet-ldap-perl: Fix LICENSE string
        libxml-libxml-perl: Fix LICENSE string
        libnet-telnet-perl: Fix LICENSE string
        libproc-waitstat-perl: Fix LICENSE string

  Steffen Olsen (1):
        postgreql: Fix pg_config not working after buildpaths patch

  Wang Mingyu (3):
        php: upgrade 8.1.8 -> 8.1.9
        postgresql: upgrade 14.4 -> 14.5
        tcpreplay: upgrade 4.4.1 -> 4.4.2

  Yi Zhao (6):
        libldb: upgrade 2.3.3 -> 2.3.4
        samba: upgrade 4.14.13 -> 4.14.14
        samba: fix buildpaths issue
        frr: Security fix CVE-2022-37035
        open-vm-tools: Security fix CVE-2022-31676
        frr: Security fix CVE-2022-37032

  wangmy (2):
        php: upgrade 8.1.9 -> 8.1.10
        dnsmasq: upgrade 2.86 -> 2.87

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I02f0e5b5dcf292a12933c694a10d0946b0edcbc4

13 files changed, 198 insertions, 16 deletions

diff --git a/poky/meta/lib/oe/cve_check.py b/poky/meta/lib/oe/cve_check.py
index aa06497727..f40f16d7ab 100644
--- a/poky/meta/lib/oe/cve_check.py
+++ b/poky/meta/lib/oe/cve_check.py
@@ -143,7 +143,7 @@ def get_cpe_ids(cve_product, version):
         else:
             vendor = "*"
 
-        cpe_id = f'cpe:2.3:a:{vendor}:{product}:{version}:*:*:*:*:*:*:*'
+        cpe_id = 'cpe:2.3:a:{}:{}:{}:*:*:*:*:*:*:*'.format(vendor, product, version)
         cpe_ids.append(cpe_id)
 
     return cpe_ids
diff --git a/poky/meta/lib/oe/npm_registry.py b/poky/meta/lib/oe/npm_registry.py
new file mode 100644
index 0000000000..96c0affb45
--- /dev/null
+++ b/poky/meta/lib/oe/npm_registry.py
@@ -0,0 +1,169 @@
+import bb
+import json
+import subprocess
+
+_ALWAYS_SAFE = frozenset('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+                         'abcdefghijklmnopqrstuvwxyz'
+                         '0123456789'
+                         '_.-~')
+
+MISSING_OK = object()
+
+REGISTRY = "https://registry.npmjs.org"
+
+# we can not use urllib.parse here because npm expects lowercase
+# hex-chars but urllib generates uppercase ones
+def uri_quote(s, safe = '/'):
+    res = ""
+    safe_set = set(safe)
+    for c in s:
+        if c in _ALWAYS_SAFE or c in safe_set:
+            res += c
+        else:
+            res += '%%%02x' % ord(c)
+    return res
+
+class PackageJson:
+    def __init__(self, spec):
+        self.__spec = spec
+
+    @property
+    def name(self):
+        return self.__spec['name']
+
+    @property
+    def version(self):
+        return self.__spec['version']
+
+    @property
+    def empty_manifest(self):
+        return {
+            'name': self.name,
+            'description': self.__spec.get('description', ''),
+            'versions': {},
+        }
+
+    def base_filename(self):
+        return uri_quote(self.name, safe = '@')
+
+    def as_manifest_entry(self, tarball_uri):
+        res = {}
+
+        ## NOTE: 'npm install' requires more than basic meta information;
+        ## e.g. it takes 'bin' from this manifest entry but not the actual
+        ## 'package.json'
+        for (idx,dflt) in [('name', None),
+                           ('description', ""),
+                           ('version', None),
+                           ('bin', MISSING_OK),
+                           ('man', MISSING_OK),
+                           ('scripts', MISSING_OK),
+                           ('directories', MISSING_OK),
+                           ('dependencies', MISSING_OK),
+                           ('devDependencies', MISSING_OK),
+                           ('optionalDependencies', MISSING_OK),
+                           ('license', "unknown")]:
+            if idx in self.__spec:
+                res[idx] = self.__spec[idx]
+            elif dflt == MISSING_OK:
+                pass
+            elif dflt != None:
+                res[idx] = dflt
+            else:
+                raise Exception("%s-%s: missing key %s" % (self.name,
+                                                           self.version,
+                                                           idx))
+
+        res['dist'] = {
+            'tarball': tarball_uri,
+        }
+
+        return res
+
+class ManifestImpl:
+    def __init__(self, base_fname, spec):
+        self.__base = base_fname
+        self.__spec = spec
+
+    def load(self):
+        try:
+            with open(self.filename, "r") as f:
+                res = json.load(f)
+        except IOError:
+            res = self.__spec.empty_manifest
+
+        return res
+
+    def save(self, meta):
+        with open(self.filename, "w") as f:
+            json.dump(meta, f, indent = 2)
+
+    @property
+    def filename(self):
+        return self.__base + ".meta"
+
+class Manifest:
+    def __init__(self, base_fname, spec):
+        self.__base = base_fname
+        self.__spec = spec
+        self.__lockf = None
+        self.__impl = None
+
+    def __enter__(self):
+        self.__lockf = bb.utils.lockfile(self.__base + ".lock")
+        self.__impl  = ManifestImpl(self.__base, self.__spec)
+        return self.__impl
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        bb.utils.unlockfile(self.__lockf)
+
+class NpmCache:
+    def __init__(self, cache):
+        self.__cache = cache
+
+    @property
+    def path(self):
+        return self.__cache
+
+    def run(self, type, key, fname):
+        subprocess.run(['oe-npm-cache', self.__cache, type, key, fname],
+                       check = True)
+
+class NpmRegistry:
+    def __init__(self, path, cache):
+        self.__path = path
+        self.__cache = NpmCache(cache + '/_cacache')
+        bb.utils.mkdirhier(self.__path)
+        bb.utils.mkdirhier(self.__cache.path)
+
+    @staticmethod
+    ## This function is critical and must match nodejs expectations
+    def _meta_uri(spec):
+        return REGISTRY + '/' + uri_quote(spec.name, safe = '@')
+
+    @staticmethod
+    ## Exact return value does not matter; just make it look like a
+    ## usual registry url
+    def _tarball_uri(spec):
+        return '%s/%s/-/%s-%s.tgz' % (REGISTRY,
+                                      uri_quote(spec.name, safe = '@'),
+                                      uri_quote(spec.name, safe = '@/'),
+                                      spec.version)
+
+    def add_pkg(self, tarball, pkg_json):
+        pkg_json = PackageJson(pkg_json)
+        base = os.path.join(self.__path, pkg_json.base_filename())
+
+        with Manifest(base, pkg_json) as manifest:
+            meta = manifest.load()
+            tarball_uri = self._tarball_uri(pkg_json)
+
+            meta['versions'][pkg_json.version] = pkg_json.as_manifest_entry(tarball_uri)
+
+            manifest.save(meta)
+
+            ## Cache entries are a little bit dependent on the nodejs
+            ## version; version specific cache implementation must
+            ## mitigate differences
+            self.__cache.run('meta', self._meta_uri(pkg_json), manifest.filename);
+            self.__cache.run('tgz',  tarball_uri, tarball);
diff --git a/poky/meta/lib/oe/rootfs.py b/poky/meta/lib/oe/rootfs.py
index 9e6b411fb6..91312f8353 100644
--- a/poky/meta/lib/oe/rootfs.py
+++ b/poky/meta/lib/oe/rootfs.py
@@ -384,6 +384,10 @@ def create_rootfs(d, manifest_dir=None, progress_reporter=None, logcatcher=None)
 
 
 def image_list_installed_packages(d, rootfs_dir=None):
+    # Theres no rootfs for baremetal images
+    if bb.data.inherits_class('baremetal-image', d):
+        return ""
+
     if not rootfs_dir:
         rootfs_dir = d.getVar('IMAGE_ROOTFS')
 
diff --git a/poky/meta/lib/oe/spdx.py b/poky/meta/lib/oe/spdx.py
index 14ca706895..6d56ed90df 100644
--- a/poky/meta/lib/oe/spdx.py
+++ b/poky/meta/lib/oe/spdx.py
@@ -218,7 +218,7 @@ class SPDXPackage(SPDXObject):
     SPDXID = _String()
     versionInfo = _String()
     downloadLocation = _String(default="NOASSERTION")
-    packageSupplier = _String(default="NOASSERTION")
+    supplier = _String(default="NOASSERTION")
     homepage = _String()
     licenseConcluded = _String(default="NOASSERTION")
     licenseDeclared = _String(default="NOASSERTION")
diff --git a/poky/meta/lib/oeqa/runtime/cases/dnf.py b/poky/meta/lib/oeqa/runtime/cases/dnf.py
index f40c63026e..2cfb36425c 100644
--- a/poky/meta/lib/oeqa/runtime/cases/dnf.py
+++ b/poky/meta/lib/oeqa/runtime/cases/dnf.py
@@ -144,7 +144,7 @@ class DnfRepoTest(DnfTest):
         self.assertEqual(0, status, output)
 
     @OETestDepends(['dnf.DnfRepoTest.test_dnf_makecache'])
-    @skipIfNotInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when enable usrmege')
+    @skipIfNotInDataVar('DISTRO_FEATURES', 'usrmerge', 'Test run when enable usrmerge')
     @OEHasPackage('busybox')
     def test_dnf_installroot_usrmerge(self):
         rootpath = '/home/root/chroot/test'
diff --git a/poky/meta/lib/oeqa/runtime/cases/parselogs.py b/poky/meta/lib/oeqa/runtime/cases/parselogs.py
index 1f9365f3a8..2d59bcf5f7 100644
--- a/poky/meta/lib/oeqa/runtime/cases/parselogs.py
+++ b/poky/meta/lib/oeqa/runtime/cases/parselogs.py
@@ -64,6 +64,7 @@ common_errors = [
     "[pulseaudio] authkey.c: Failed to load authentication key",
     "was skipped because of a failed condition check",
     "was skipped because all trigger condition checks failed",
+    "xf86OpenConsole: Switching VT failed",
     ]
 
 video_related = [
@@ -140,6 +141,7 @@ ignore_errors = {
         'Failed to initialize \'/amba/timer@101e3000\': -22',
         'jitterentropy: Initialization failed with host not compliant with requirements: 2',
         'clcd-pl11x: probe of 10120000.display failed with error -2',
+        'arm-charlcd 10008000.lcd: error -ENXIO: IRQ index 0 not found'
         ] + common_errors,
     'qemuarm64' : [
         'Fatal server error:',
diff --git a/poky/meta/lib/oeqa/selftest/cases/fitimage.py b/poky/meta/lib/oeqa/selftest/cases/fitimage.py
index e6bfd1257e..d732a9020d 100644
--- a/poky/meta/lib/oeqa/selftest/cases/fitimage.py
+++ b/poky/meta/lib/oeqa/selftest/cases/fitimage.py
@@ -738,6 +738,7 @@ UBOOT_LOADADDRESS = "0x80000000"
 UBOOT_DTB_LOADADDRESS = "0x82000000"
 UBOOT_ARCH = "arm"
 UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb -p 2000"
+UBOOT_MKIMAGE_KERNEL_TYPE = "kernel"
 UBOOT_EXTLINUX = "0"
 FIT_GENERATE_KEYS = "1"
 KERNEL_IMAGETYPE_REPLACEMENT = "zImage"
@@ -763,6 +764,7 @@ FIT_HASH_ALG = "sha256"
 
         kernel_load = str(get_bb_var('UBOOT_LOADADDRESS'))
         kernel_entry = str(get_bb_var('UBOOT_ENTRYPOINT'))
+        kernel_type = str(get_bb_var('UBOOT_MKIMAGE_KERNEL_TYPE'))
         kernel_compression = str(get_bb_var('FIT_KERNEL_COMP_ALG'))
         uboot_arch = str(get_bb_var('UBOOT_ARCH'))
         fit_hash_alg = str(get_bb_var('FIT_HASH_ALG'))
@@ -775,7 +777,7 @@ FIT_HASH_ALG = "sha256"
             'kernel-1 {',
             'description = "Linux kernel";',
             'data = /incbin/("linux.bin");',
-            'type = "kernel";',
+            'type = "' + kernel_type + '";',
             'arch = "' + uboot_arch + '";',
             'os = "linux";',
             'compression = "' + kernel_compression + '";',
diff --git a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
index c809d7c9b1..978898b86f 100644
--- a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
+++ b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
@@ -43,12 +43,6 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
 
     @classmethod
     def tearDownClass(cls):
-        # Go creates file which are readonly
-        for dirpath, dirnames, filenames in os.walk(cls.tmpdir_SDKQA):
-            for filename in filenames + dirnames:
-                f = os.path.join(dirpath, filename)
-                if not os.path.islink(f):
-                    os.chmod(f, 0o775)
         shutil.rmtree(cls.tmpdir_SDKQA, ignore_errors=True)
         super(oeGoToolchainSelfTest, cls).tearDownClass()
 
@@ -56,6 +50,8 @@ class oeGoToolchainSelfTest(OESelftestTestCase):
         cmd = "cd %s/src/%s/%s; " % (self.go_path, proj, name)
         cmd = cmd + ". %s; " % self.env_SDK
         cmd = cmd + "export GOPATH=%s; " % self.go_path
+        cmd = cmd + "export GOFLAGS=-modcacherw; "
+        cmd = cmd + "export CGO_ENABLED=1; "
         cmd = cmd + "${CROSS_COMPILE}go %s" % gocmd
         return runCmd(cmd).status
 
diff --git a/poky/meta/lib/oeqa/selftest/cases/git.py b/poky/meta/lib/oeqa/selftest/cases/intercept.py
index f12874dc7d..f12874dc7d 100644
--- a/poky/meta/lib/oeqa/selftest/cases/git.py
+++ b/poky/meta/lib/oeqa/selftest/cases/intercept.py
diff --git a/poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py b/poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
index 802a91a488..33bd6df2f3 100644
--- a/poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
+++ b/poky/meta/lib/oeqa/selftest/cases/oelib/buildhistory.py
@@ -3,6 +3,7 @@
 #
 
 import os
+import sys
 from oeqa.selftest.case import OESelftestTestCase
 import tempfile
 import operator
@@ -11,15 +12,14 @@ from oeqa.utils.commands import get_bb_var
 class TestBlobParsing(OESelftestTestCase):
 
     def setUp(self):
-        import time
         self.repo_path = tempfile.mkdtemp(prefix='selftest-buildhistory',
             dir=get_bb_var('TOPDIR'))
 
         try:
             from git import Repo
             self.repo = Repo.init(self.repo_path)
-        except ImportError:
-            self.skipTest('Python module GitPython is not present')
+        except ImportError as e:
+            self.skipTest('Python module GitPython is not present (%s)  (%s)' % (e, sys.path))
 
         self.test_file = "test"
         self.var_map = {}
diff --git a/poky/meta/lib/oeqa/selftest/cases/wic.py b/poky/meta/lib/oeqa/selftest/cases/wic.py
index de74c07a03..49fb6fe52c 100644
--- a/poky/meta/lib/oeqa/selftest/cases/wic.py
+++ b/poky/meta/lib/oeqa/selftest/cases/wic.py
@@ -1420,7 +1420,7 @@ class ModifyTests(WicTestCase):
 
         # list directory content of the first partition
         result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot))
-        self.assertIn('\n%s        ' % kerneltype.upper(), result.output)
+        self.assertIn('\n%s ' % kerneltype.upper(), result.output)
         self.assertIn('\nEFI          <DIR>     ', result.output)
 
         # remove file. EFI partitions are case-insensitive so exercise that too
diff --git a/poky/meta/lib/oeqa/utils/qemurunner.py b/poky/meta/lib/oeqa/utils/qemurunner.py
index 76296d50cd..c19164e6e7 100644
--- a/poky/meta/lib/oeqa/utils/qemurunner.py
+++ b/poky/meta/lib/oeqa/utils/qemurunner.py
@@ -471,9 +471,9 @@ class QemuRunner:
                             self.server_socket = qemusock
                             stopread = True
                             reachedlogin = True
-                            self.logger.debug("Reached login banner in %s seconds (%s)" %
+                            self.logger.debug("Reached login banner in %s seconds (%s, %s)" %
                                               (time.time() - (endtime - self.boottime),
-                                              time.strftime("%D %H:%M:%S")))
+                                              time.strftime("%D %H:%M:%S"), time.time()))
                     else:
                         # no need to check if reachedlogin unless we support multiple connections
                         self.logger.debug("QEMU socket disconnected before login banner reached. (%s)" %
@@ -618,6 +618,8 @@ class QemuRunner:
                 return self.qmp.cmd(command)
 
     def run_serial(self, command, raw=False, timeout=60):
+        # Returns (status, output) where status is 1 on success and 0 on error
+
         # We assume target system have echo to get command status
         if not raw:
             command = "%s; echo $?\n" % command
diff --git a/poky/meta/lib/rootfspostcommands.py b/poky/meta/lib/rootfspostcommands.py
index fdb9f5b850..12f66d2ce2 100644
--- a/poky/meta/lib/rootfspostcommands.py
+++ b/poky/meta/lib/rootfspostcommands.py
@@ -58,3 +58,10 @@ def sort_passwd(sysconfdir):
             remove_backup(filename)
             if os.path.exists(filename):
                  sort_file(filename, mapping)
+    # Drop other known backup shadow-utils.
+    for filename in (
+            'subgid',
+            'subuid',
+        ):
+        filepath = os.path.join(sysconfdir, filename)
+        remove_backup(filepath)