subtree updates

poky: ed4791c8b0..bba3233897:
  Akash Hadke (1):
        glibc: Add fix for data races in pthread_create and TLS access

  Alexander Kanavin (25):
        gnupg: update 2.2.21 -> 2.2.22
        gnupg: update 2.2.23 -> 2.2.26
        tcf-agent: fetching over git:// no longer works
        qemurunner.py: print output from runqemu/qemu-system in stop()
        qemurunner.py: handle getOutput() having nothing to read
        selftest: disable virgl headless test
        wic: keep rootfs_size as integer
        testimage: symlink the task log and qemu console log to tmp/log/oeqa
        bitbake: bitbake: correct the collections vs collections.abc deprecation
        bitbake: bitbake: fix regexp deprecation warnings
        bitbake: bitbake: do not import imp in layerindexlib
        bitbake: bitbake: adjust parser error check for python 3.10 compatibility
        bitbake: bitbake: correct deprecation warning in process.py
        e2fsprogs: update to 1.45.6
        linux-firmware: upgrade 20210511 -> 20210818
        linux-firmware: upgrade 20210818 -> 20210919
        wireless-regdb: upgrade 2021.04.21 -> 2021.07.14
        wireless-regdb: upgrade 2021.07.14 -> 2021.08.28
        ca-certificates: update 20210119 -> 20211016
        tzdata: upgrade 2021a -> 2021d
        tzdata: update 2021d -> 2021e
        linux-firmware: upgrade 20210919 -> 20211027
        libpcre/libpcre2: correct SRC_URI
        lib/oe/reproducible: correctly set .git location when recursively looking for git repos
        parselogs: add a couple systemd false positives

  Alexandre Belloni (1):
        oeqa/selftest/sstatetests: fix typo ware -> were

  Andrej Valek (3):
        mklibs-native: drop deprecated cpp17 exceptions
        vim: add option to disable NLS support
        libpsl: Add config knobs for runtime/builtin conversion choices

  Andrey Zhizhikin (1):
        lttng-modules: do not search in non-existing folder during install

  Anuj Mittal (3):
        glibc-version.inc: remove branch= from GLIBC_GIT_URI
        gstreamer1.0: fix failing ptest
        xserver-xorg: update CVE_PRODUCT

  Armin Kuster (24):
        glibc: Security fix CVE-2021-33574
        glibc: Security fix for CVE-2021-38604
        qemu: Security fix CVE-2020-25085
        qemu: Security fix CVE-2020-25624
        Qemu: Security fix for CVE-2020-25625/2021-3409/2020-17380
        qemu: Security fix for CVE-2020-29443
        qemu: Security fix CVE-2021-20221
        qemu: Security fix CVE-2021-3544
        qemu: Security fixes CVE-2021-3545/6
        binutils: Security fix for CVE-2021-3549
        binutils: Security fix for CVE-2020-16593
        lz4: Security Fix for CVE-2021-3520
        xserver-xorg: Security fix for CVE-2020-14360/-25712
        go: Several Security fixes
        libgcrypt: Security fix CVE-2021-33560
        apr: Security fix for CVE-2021-35940
        libsndfile: Security fix for CVE-2021-3246
        qemu: Security fix CVE-2020-12829
        qemu: Security fix for CVE-2020-27617
        qemu: Security fix for CVE-2020-28916
        nettle: Security fix for CVE-2021-3580
        nettle: Security fix for CVE-2021-20305
        tar: ignore node-tar CVEs
        poky.yaml: fedora33: add missing pkgs

  Bruce Ashfield (21):
        linux-yocto/5.4: update to v5.4.142
        parselogs.py: ignore intermittent CD/DVDROM identification failure
        linux-yocto/5.4: update to v5.4.143
        linux-yocto/5.4: update to v5.4.144
        linux-yocto/5.4: update to v5.4.149
        linux-yocto/5.4: update to v5.4.150
        linux-yocto/5.4: update to v5.4.153
        linux-yocto/5.4: update to v5.4.154
        linux-yocto/5.4: update to v5.4.155
        linux-yocto/5.4: update to v5.4.156
        linux-yocto/5.4: update to v5.4.158
        linux-yocto/5.4: update to v5.4.159
        linux-yocto/5.4: update to v5.4.162
        linux-yocto/5.4: update to v5.4.163
        linux-yocto/5.4: update to v5.4.165
        linux-yocto/5.4: update to v5.4.167
        linux-yocto/5.4: update to v5.4.169
        linux-yocto/5.4: update to v5.4.170
        linux-yocto/5.4: update to v5.4.171
        linux-yocto/5.4: update to v5.4.172
        kernel: introduce python3-dtschema-wrapper

  Chandana kalluri (1):
        scriptutils.py: Add check before deleting path

  Changqing Li (1):
        gdk-pixbuf: fix CVE-2021-20240

  Chris Laplante (1):
        bitbake: compat.py: remove file since it no longer actually implements anything

  Christian Eggers (1):
        binutils: Fix a missing break in case statement

  Claudius Heine (1):
        rng-tools: add systemd-udev-settle wants to service

  Claus Stovgaard (1):
        cups: Fix missing installation of cups sysv init scripts

  Daniel Gomez (1):
        os-release: Add DISTRO_CODENAME as vardeps for do_compile

  Daniel McGregor (1):
        bitbake.conf: Add gpg-agent as a host tool

  Denys Dmytriyenko (1):
        make-mod-scripts: pass CROSS_COMPILE to configure and build

  Dhruva Gole (1):
        scripts/checklayer/common.py: Fixed a minor grammatical error

  Eero Aaltonen (1):
        cmake: FindGTest: Add target for gmock library

  Ernst Sjöstrand (1):
        dropbear: Fix CVE-2020-36254

  Hongxu Jia (1):
        nativesdk-pseudo: Fix to work with glibc 2.34 systems

  Jate Sujjavanich (3):
        libdnf: Backport bugfix for upgrade calc
        dnf: Backport bugfix for upgrade
        bitbake: hashserv: specify loop for asyncio in python < 3.6

  Jon Mason (4):
        Update mailing list address
        core-image-sato: Fix runqemu error for qemuarmv5
        oeqa/manual: Fix no longer valid URLs
        scripts/lib/wic/help.py: Update Fedora Kickstart URLs

  Jose Quaresma (3):
        patch.bbclass: when the patch fails show more info on the fatal error
        sstate: fix touching files inside pseudo
        sstate: another fix for touching files inside pseudo

  Joshua Watt (3):
        bitbake: server: Fix early parsing errors preventing zombie bitbake
        classes/reproducible_build: Use atomic rename for SDE file
        oeqa: reproducible: Fix test not producing diffs

  Justin Bronder (1):
        bitbake: hashserv: let asyncio discover the running loop

  Kai Kang (2):
        squashfs-tools: fix CVE-2021-40153
        speex: fix CVE-2020-23903

  Khem Raj (5):
        m4: Do not use SIGSTKSZ
        gpgme: Use glibc provided closefrom API when available
        webkitgtk: Fix reproducibility in minibrowser
        lrzsz: Use Cross AR during compile
        libunwind: Backport a fix for -fno-common option to compile

  Konrad Weihmann (1):
        cve-check: add lockfile to task

  Lee Chee Yang (1):
        qemu: fix CVE-2021-3527

  Marco Felsch (1):
        bitbake: bitbake: bitbake-layers: add skip reason to output

  Marek Vasut (4):
        image_types: Restore pre-btrfs-tools 4.14.1 mkfs.btrfs shrink behavior
        piglit: upgrade to latest revision
        weston: Backport patches to always activate the top-level surface
        Revert "weston: Use systemd notify,"

  Mark Hatle (2):
        externalsrc: Work with reproducible_build
        reproducible_build: Remove BUILD_REPRODUCIBLE_BINARIES checking

  Markus Volk (2):
        util-linux: disable raw
        wic:direct.py: ignore invalid mountpoints during fstab update

  Marta Rybczynska (5):
        lzo: add CVE_PRODUCT
        python3: upgrade 3.8.11 -> 3.8.12
        libgcrypt: solve CVE-2021-33560 and CVE-2021-40528
        bluez: fix CVE-2021-0129
        grub: fix CVE-2020-14372 and CVE-2020-27779

  Matt Madison (1):
        layer.conf: fix syntax error in PATH setting

  Michael Halstead (3):
        uninative: Upgrade to 3.3, support glibc 2.34
        uninative: Upgrade to 3.4
        releases: update to include 3.1.13

  Michael Opdenacker (5):
        documentation: conf.py: explicit which version of bitbake objects.inv is used
        available release updates
        remove reference to BB_SETSCENE_VERIFY_FUNCTION2
        documentation: further updates for 3.1.13
        ref-manual: fix patch documentation

  Mike Crowe (1):
        curl: Fix CVE-2021-22946 and CVE-2021-22947, whitelist CVE-2021-22945

  Mikko Rapeli (1):
        openssl: update from 1.1.1k to 1.1.1l

  Mingli Yu (3):
        python3-magic: add the missing rdepends
        bootchart2: remove wait_boot logic
        wic: use shutil.which

  Minjae Kim (5):
        vim: fix CVE-2021-3778
        vim: fix 2021-3796
        git: fix CVE-2021-40330
        vim: fix CVE-2021-4069
        inetutils: fix CVE-2021-40491

  Neetika Singh (1):
        glib-2.0: Add security fixes

  Nicolas Dechesne (1):
        rt-tests: set branch name in SRC_URI

  Oleksandr Kravchuk (1):
        mirrors.bbclass: remove dead infozip mirrors

  Oleksandr Popovych (1):
        utils: Reduce the number of calls to the "dirname" command

  Ovidiu Panait (2):
        dbus-test: Remove EXTRA_OECONF_X configs
        dbus,dbus-test: Move common parts to dbus.inc

  Pavel Zhukov (3):
        weston: Use systemd notify,
        busybox: Fix for CVE-2021-42374
        busybox: Fix for CVE-2021-42376

  Peter Bergin (1):
        systemd: add packageconfig for wheel-group

  Purushottam Choudhary (1):
        lighttpd: Add patch for reuse large memory chunks

  Quentin Schulz (1):
        README.OE-Core.md: update URLs

  Ralph Siemsen (1):
        tar: filter CVEs using vendor name

  Ranjitsinh Rathod (6):
        rpm: Add fix for CVE-2021-20266
        rpm: Handle proper return value to avoid major issues
        systemd: Add fix for systemd-networkd crash during free
        curl: Whitelist CVE-2021-22897
        ncurses: Fix for CVE-2021-39537
        libsolv: update tag for missing CVEs

  Ricardo Ribalda Delgado (1):
        wic: misc: Do not find for executables in ASSUME_PROVIDED

  Richard Purdie (91):
        gnupg: upgrade 2.2.20 -> 2.2.21
        sdk: Decouple default install path from built in path
        xdg-utils: Add fix for CVE-2020-27748
        oeqa/runtime/parselogs: Make DVD ata error apply to all qemux86 machines
        flex: Add CVE-2019-6293 to exclusions for checks
        go: Exclude CVE-2021-29923 from report list
        build-appliance-image: Update to dunfell head revision
        poky: Use SDKPATHINSTALL instead of SDKPATH
        build-appliance-image: Update to dunfell head revision
        bitbake: tests/fetch2: Use our own git server for dtc test repo
        vim: Backport fix for CVE-2021-3770
        useradd: Ensure preinst data is expanded correctly in pkgdata
        bash: Ensure deterministic build
        bitbake: ui/taskexp: Improve startup exception handling
        bitbake: ui/taskexp: Fix to work with empty build directories
        bitbake: build: Match markup to real function name
        bitbake: build: Handle SystemExit in python tasks correctly
        bitbake: process: Don't include logs in error message if piping them
        bitbake: build: Avoid duplicating logs in verbose mode
        bitbake: build: Catch and error upon circular task references
        bitbake: data_smart: Improve error display for handled exceptions
        bitbake: cookerdata: Improve missing core layer error message
        bitbake: cookerdata: Show error for no BBLAYERS in bblayers.conf
        bitbake: bitbake-worker: Improve error handling
        bitbake: cookerdata: Show a readable error for invalid multiconfig name
        bitbake: build/msg: Cleanup verbose option handling
        mtd-utils: upgrade 2.1.1 -> 2.1.2
        pybootchart: Avoid divide by zero
        oeqa/qemurunner: Use oe._exit(), not sys.exit()
        libc_package/buildstats: Fix python regex quoting warnings
        oeqa/selftest/gotoolchain: Fix temp file cleanup
        oeqa/buildproject: Ensure temp directories are cleaned up
        glew: Stop polluting /tmp during builds
        bitbake: test/fetch: Update urls to match upstream branch name changes
        bitbake: fetch2/git: Avoid races over mirror tarball creation
        bitbake: fetch2/git: Use os.rename instead of mv
        multilib: Avoid sysroot race issues when multilib enabled
        pseudo: Fix to work with glibc 2.34 systems
        pseudo: Update with fcntl and glibc 2.34 fixes
        package: Ensure pclist files are deterministic and don't use full paths
        mesa: Ensure megadrivers runtime mappings are deterministic
        gnupg: Be deterministic about sendmail
        libtool: Fix lto option passing for reproducible builds
        libtool: Allow libtool-cross to reproduce
        gobject-introspection: Don't write $HOME into scripts
        externalsrc: Fix a source date epoch race in reproducible builds
        libxml2: Use python3targetconfig to fix reproducibility issue
        libnewt: Use python3targetconfig to fix reproducibility issue
        python3: Add a fix for a make install race
        rpm: Deterministically set vendor macro entry
        reproducible_build: Work around caching issues
        base: Clean up unneeded len() calls
        base: Use repr() for printing exceptions
        reproducible_build: Drop obsolete sstate workaround
        git: Fix determinism issue
        bitbake: fetch/git: Handle github dropping git:// support
        bitbake: tests/fetch2: Fix quoting warning
        bitbake: tests/fetch: Update github urls
        bitbake: tests/fetch: Update pcre.org address after github changes
        scripts/convert-srcuri: Backport SRC_URI conversion script from master branch
        meta/scripts: Manual git url branch additions
        bitbake: fetch/wget: Add timeout for checkstatus calls (30s)
        linunistring: Add missing gperf-native dependency
        pseudo: Add in ability to flush database with shutdown request
        pseudo: Add fcntl64 wrapper
        mirrors: Add uninative mirror on kernel.org
        sstate: Ensure SDE is accounted for in package task timestamps
        sstate: Avoid deploy_source_date_epoch sstate when unneeded
        mirrors: Add kernel.org sources mirror for downloads.yoctoproject.org
        build-appliance-image: Update to dunfell head revision
        bitbake: command: Ensure exceptions inheriting from BBHandledException are visible
        bitbake: tinfoil: When sending commands we need to process events
        bitbake: process/knotty: Improve early exception handling
        scripts/oe-package-browser: Handle no packages being built
        reproducible_build/package_XXX: Ensure SDE task is in dependency chain
        bitbake: cooker: Ensure reparsing is handled correctly
        bitbake: bblayers/action: When adding layers, catch BBHandledException
        buildhistory: Fix srcrevs output
        oeqa/parselogs: Fix quoting
        gcc: Add CVE-2021-37322 to the list of CVEs to ignore
        build-appliance-image: Update to dunfell head revision
        bitbake: cooker/command: Add a dummy event for tinfoil testing
        openssl: Add reproducibility fix
        oeqa/selftest/bbtests: Use YP sources mirror instead of GNU
        oeqa/selftest/tinfoil: Update to use test command
        scripts: Update to use exec_module() instead of load_module()
        bitbake: utils: Update to use exec_module() instead of load_module()
        bitbake: tests/fetch: Drop gnu urls from wget connectivity test
        expat: Update HOMEPAGE to current url
        lttng-tools: Add missing DEPENDS on bison-native
        build-appliance-image: Update to dunfell head revision

  Robert P. J. Day (1):
        common-licenses: add "Unlicense" license file

  Ross Burton (20):
        cpio: backport fix for CVE-2021-38185
        libsoup-2.4: remove obsolete intltool dependency
        uninative: Improve glob to handle glibc 2.34
        devtool: fix modify with patches in override directories
        sstate: don't silently handle all exceptions in sstate_checkhashes
        oe/license: implement ast.NodeVisitor.visit_Constant
        license.bbclass: implement ast.NodeVisitor.visit_Constant
        oe/utils: log exceptions in ThreadedWorker functions
        testimage: fix unclosed testdata file
        oeqa/runtime: load modules using importlib
        oeqa/runtime: search sys.path explicitly for modules
        vim: fix CVE-2021-3796, CVE-2021-3872, and CVE-2021-3875
        vim: add patch number to CVE-2021-3778 patch
        vim: fix CVE-2021-3927 and CVE-2021-3928
        gmp: fix CVE-2021-43618
        openssh: remove redundant BSD license
        vim: fix CVE-2021-3968 and CVE-2021-3973
        runqemu: check the qemu PID has been set before kill()ing it
        cve-update-db-native: use fetch task
        xserver-xorg: whitelist two CVEs

  Sakib Sajal (7):
        qemu: fix CVE-2021-20181
        qemu: fix CVE-2021-3416
        qemu: fix CVE-2021-20257
        qemu: fix CVE-2021-3582
        qemu: fix CVE-2021-3607
        qemu: fix CVE-2021-3608
        qemu: fix CVE-2021-3682

  Saloni (1):
        ffmpeg: Add fix for CVEs

  Sana Kazi (1):
        busybox: Fix multiple security issues in awk

  Saul Wold (1):
        gnupg: uprev 2.2.22 -> 2.2.23

  Stefan Herbrechtsmeier (2):
        recipetool: Set master branch only as fallback
        selftest/devtool: Check branch in git fetch

  Stefano Babic (1):
        mtd-utils: upgrade 2.1.2 -> 2.1.3

  Steve Sakoman (36):
        documentation: prepare for 3.1.11 release
        poky.conf: Bump version for 3.1.11 release
        connman: add CVE_PRODUCT
        gcc: fix missing dependencies for selftests
        util-linux: Fix reproducibility
        target/ssh.py: add HostKeyAlgorithms option to test commands
        poky.conf: Add fedora 34 as a supported distro
        poky.conf: Add debian 11 as a supported distro
        selftest/reproducible: adjust exclusion list for dunfell
        waffle: old website is down, update to new project URLs
        stress-ng: convert to git, website is down
        stress-ng: improve reproducibility
        meta: Add explict branch to git SRC_URIs, handle github url changes
        poky.conf: Bump version for 3.1.12 release
        ref-system-requirements.rst: Add Debian 11 to list of supported distros
        ref-system-requirements.rst: Add Fedora 34 to list of supported distros
        documentation: prepare for 3.1.12 release
        python3-magic: add missing DEPENDS
        selftest/reproducible: add webkitgtk back to exclusion list for dunfell
        Revert "vim: fix 2021-3796"
        bind: update to 9.11.33
        bind: update to 9.11.34
        bind: update to 9.11.35
        poky.conf: Bump version for 3.1.13 release
        cve-extra-exclusions: add db CVEs to exclusion list
        selftest: skip virgl test on centos 8 entirely
        selftest: skip virgl test on fedora 34 entirely
        libpcre2: update SRC_URI
        selftest: skip virgl test on fedora 35
        asciidoc: properly detect and compare Python versions >= 3.10
        valgrind: skip flakey ptest (gdbserver_tests/hginfo)
        oeqa/selftest/cases/tinfoil.py: increase timeout 60->120s test_wait_event
        expat fix CVE-2022-22822 through CVE-2022-22827
        expat: fix CVE-2021-45960
        expat: fix CVE-2021-46143
        poky.conf: Bump version for 3.1.14 release

  Teoh Jay Shen (2):
        oeqa/runtime/parselogs: modified drm error in common errors list
        linux-yocto/5.4: update genericx86* machines to v5.4.158

  Tim Orling (1):
        scripts/buildhistory-diff: drop use of distutils

  Tom Pollard (2):
        bzip2: Update soname for libbz2 1.0.8
        libsamplerate0: Set correct soname for 0.1.9

  Visa Hankala (1):
        iputils: Fix regression of arp table update

  Wang Mingyu (6):
        gnupg: upgrade 2.2.26 -> 2.2.27
        dbus: upgrade 1.12.16 -> 1.12.18
        dbus-test: upgrade 1.12.16 -> 1.12.18
        dbus: upgrade 1.12.18 -> 1.12.20
        e2fsprogs: upgrade 1.45.6 -> 1.45.7
        openssh: Improve LICENSE to show BSD license variants.

  William A. Kennington III (1):
        rm_work.bbclass: Fix for files starting with -

  Yi Zhao (1):
        oeqa: fix warnings for append operators combined with +=

  jbouchard (1):
        Use the label provided when formating a dos partition

  sana kazi (3):
        openssh: Fix CVE-2021-28041
        openssh: Fix CVE-2021-41617
        openssh: Whitelist CVE-2016-20012

  wangmy (1):
        linux-firmware: upgrade 20211027 -> 20211216

meta-raspberrypi: 59c2d6f7a8..934064a019:
  Changqing Li (1):
        99-com.rules: fix error invalid substitution type

  Marcel Hamer (1):
        recipes: Update SRC_URI protocols for github

  Pavel Zhukov (1):
        linux-firmware-rpidistro: Use buster branch instead of master

meta-security: 6466c6fb02..b76698c788:
  Armin Kuster (1):
        linux-%_5.%.bbappend: drop recipe

meta-openembedded: 4a0d93d250..ab9fca485e:
  Alexander Thoma (1):
        keyutils: fix install path

  Anastasios Kavoukis (1):
        pm-qa: fix paths for shell scripts

  Andreas Weger (3):
        spirv-tools: Define SRCREV_FORMAT
        grpc: Define SRCREV_FORMAT
        drdb-utils: Define SRCREV_FORMAT

  Armin Kuster (7):
        xterm: Security fix for CVE-2021-27135
        tcpdump: Exclude CVE-2020-8036 from check
        nss: Two Security fixes CVE-2020-6829 and 12400
        dnsmasq: Security fix CVE-2021-3448
        Apache: Several CVE fixes
        redis: update to 5.0.14
        recipes: Update SRC_URI branch and protocols

  Armin kuster (1):
        dovecot: refresh patches

  Changqing Li (1):
        apache2: upgrade 2.4.46 -> 2.4.48

  Ernst Sjöstrand (1):
        libmicrohttpd: Add patch to fix CVE-2021-3466

  Gianfranco (3):
        dlt-daemon: update to 2.18.5
        dlt-daemon: fix build failure when dlt-dbus is enabled, due to missing service file.
        dlt-daemon: update from 2.18.6 to 2.18.7

  Gianfranco Costamagna (3):
        dlt-daemon: fix build with upstream-proposed patch for MUSL libc
        dlt-daemon: superseed upstream pr #238 patch with pr #245 due to unexpected behaviour
        dlt-daemon: update to new release 2.18.6

  Jeremy Puhlman (1):
        c-ares: switch from master to main

  Khem Raj (2):
        gst-shark: Define SRCREV_FORMAT
        android-tools: Define SRCREV_FORMAT

  Konrad Weihmann (1):
        gattlib: remove includedir from base package

  Marek Vasut (1):
        dstat: Add missing python-six runtime dependency

  Marta Rybczynska (1):
        jansson: whitelist CVE-2020-36325

  Martin Jansa (1):
        sdbus-c++: don't fetch googletest during do_configure

  Maíra Canal via (1):
        python3-fasteners: update 0.15 -> 0.16.3

  Neetika Singh (1):
        c-ares: Add fix for CVE-2021-3672

  Pierre-Jean Texier (1):
        stunnel: upgrade 5.56 -> 5.57

  Purushottam Choudhary (1):
        tcpdump: Update CVE-2020-8037 tag

  Ranjitsinh Rathod (1):
        nss: Fix CVE-2020-12403

  Richard Purdie (1):
        gattlib: Place pkgconfig file in correct package

  Robert Joslyn (1):
        postgresql: Update to 12.9

  Spectrejan (1):
        brotli: add patch to fix CVE-2020-8927

  Yi Zhao (3):
        krb5: fix CVE-2021-36222
        postfix: fix build with glibc 2.34
        postfix: upgrade 3.4.12 -> 3.4.23

  Zang Ruochen (1):
        c-ares: upgrade 1.16.0 -> 1.16.1

  lumag (1):
        lmsensors: do not depend on lmsensors-isatools on non-x86

  sana kazi (4):
        dovecot: Fix CVE-2020-12100
        dovecot: Fix CVE-2020-12673
        dovecot: Fix CVE-2020-12674
        nss: Fix CVE-2021-43527

  wangmy (1):
        apache2: upgrade 2.4.48 -> 2.4.49

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

11 files changed, 64 insertions, 29 deletions

diff --git a/poky/meta/lib/oeqa/selftest/cases/bbtests.py b/poky/meta/lib/oeqa/selftest/cases/bbtests.py
index dc423ec439..e659be5341 100644
--- a/poky/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/poky/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -148,9 +148,6 @@ INHERIT_remove = \"report-error\"
         self.delete_recipeinc('man-db')
         self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output)
         self.assertIn('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:', result.output)
-        line = self.getline(result, 'Fetcher failure for URL: \'file://invalid\'. Unable to fetch URL from any source.')
-        self.assertTrue(line and line.startswith("ERROR:"), msg = "\"invalid\" file \
-doesn't exist, yet fetcher didn't report any error. bitbake output: %s" % result.output)
 
     def test_rename_downloaded_file(self):
         # TODO unique dldir instead of using cleanall
@@ -160,7 +157,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
 """)
         self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
 
-        data = 'SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz;downloadfilename=test-aspell.tar.gz"'
+        data = 'SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/aspell-${PV}.tar.gz;downloadfilename=test-aspell.tar.gz"'
         self.write_recipeinc('aspell', data)
         result = bitbake('-f -c fetch aspell', ignore_status=True)
         self.delete_recipeinc('aspell')
diff --git a/poky/meta/lib/oeqa/selftest/cases/devtool.py b/poky/meta/lib/oeqa/selftest/cases/devtool.py
index 0985434238..87e71632ab 100644
--- a/poky/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/poky/meta/lib/oeqa/selftest/cases/devtool.py
@@ -340,7 +340,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars['LIC_FILES_CHKSUM'] = 'file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263'
         checkvars['S'] = '${WORKDIR}/git'
         checkvars['PV'] = '0.1+git${SRCPV}'
-        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https'
+        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/dbus-wait;protocol=https;branch=master'
         checkvars['SRCREV'] = srcrev
         checkvars['DEPENDS'] = set(['dbus'])
         self._test_recipe_contents(recipefile, checkvars, [])
@@ -442,6 +442,7 @@ class DevtoolAddTests(DevtoolBase):
         tempdir = tempfile.mkdtemp(prefix='devtoolqa')
         self.track_for_cleanup(tempdir)
         url = 'gitsm://git.yoctoproject.org/mraa'
+        url_branch = '%s;branch=master' % url
         checkrev = 'ae127b19a50aa54255e4330ccfdd9a5d058e581d'
         testrecipe = 'mraa'
         srcdir = os.path.join(tempdir, testrecipe)
@@ -462,7 +463,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars = {}
         checkvars['S'] = '${WORKDIR}/git'
         checkvars['PV'] = '1.0+git${SRCPV}'
-        checkvars['SRC_URI'] = url
+        checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = '${AUTOREV}'
         self._test_recipe_contents(recipefile, checkvars, [])
         # Try with revision and version specified
@@ -481,7 +482,7 @@ class DevtoolAddTests(DevtoolBase):
         checkvars = {}
         checkvars['S'] = '${WORKDIR}/git'
         checkvars['PV'] = '1.5+git${SRCPV}'
-        checkvars['SRC_URI'] = url
+        checkvars['SRC_URI'] = url_branch
         checkvars['SRCREV'] = checkrev
         self._test_recipe_contents(recipefile, checkvars, [])
 
@@ -880,7 +881,7 @@ class DevtoolUpdateTests(DevtoolBase):
         self._check_repo_status(os.path.dirname(recipefile), expected_status)
 
         result = runCmd('git diff %s' % os.path.basename(recipefile), cwd=os.path.dirname(recipefile))
-        addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git"']
+        addlines = ['SRCREV = ".*"', 'SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"']
         srcurilines = src_uri.split()
         srcurilines[0] = 'SRC_URI = "' + srcurilines[0]
         srcurilines.append('"')
diff --git a/poky/meta/lib/oeqa/selftest/cases/diffoscope/A/file.txt b/poky/meta/lib/oeqa/selftest/cases/diffoscope/A/file.txt
new file mode 100644
index 0000000000..f70f10e4db
--- /dev/null
+++ b/poky/meta/lib/oeqa/selftest/cases/diffoscope/A/file.txt
@@ -0,0 +1 @@
+A
diff --git a/poky/meta/lib/oeqa/selftest/cases/diffoscope/B/file.txt b/poky/meta/lib/oeqa/selftest/cases/diffoscope/B/file.txt
new file mode 100644
index 0000000000..223b7836fb
--- /dev/null
+++ b/poky/meta/lib/oeqa/selftest/cases/diffoscope/B/file.txt
@@ -0,0 +1 @@
+B
diff --git a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
index 3119520f0d..59f80aad28 100644
--- a/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
+++ b/poky/meta/lib/oeqa/selftest/cases/gotoolchain.py
@@ -43,6 +43,12 @@ 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()
 
diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
index 2b9c4998f7..535d80cb86 100644
--- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
+++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py
@@ -240,7 +240,7 @@ USERADD_GID_TABLES += "files/static-group"
     def test_no_busybox_base_utils(self):
         config = """
 # Enable x11
-DISTRO_FEATURES_append += "x11"
+DISTRO_FEATURES_append = " x11"
 
 # Switch to systemd
 DISTRO_FEATURES += "systemd"
diff --git a/poky/meta/lib/oeqa/selftest/cases/recipetool.py b/poky/meta/lib/oeqa/selftest/cases/recipetool.py
index c2ade2543a..e8aeea3023 100644
--- a/poky/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/poky/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -370,7 +370,7 @@ class RecipetoolTests(RecipetoolBase):
         tempsrc = os.path.join(self.tempdir, 'srctree')
         os.makedirs(tempsrc)
         recipefile = os.path.join(self.tempdir, 'libmatchbox.bb')
-        srcuri = 'git://git.yoctoproject.org/libmatchbox'
+        srcuri = 'git://git.yoctoproject.org/libmatchbox;branch=master'
         result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri + ";rev=9f7cf8895ae2d39c465c04cc78e918c157420269", '-x', tempsrc])
         self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
         checkvars = {}
@@ -456,7 +456,7 @@ class RecipetoolTests(RecipetoolBase):
         self.assertTrue(os.path.isfile(recipefile))
         checkvars = {}
         checkvars['LICENSE'] = set(['Apache-2.0'])
-        checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https'
+        checkvars['SRC_URI'] = 'git://github.com/mesonbuild/meson;protocol=https;branch=master'
         inherits = ['setuptools3']
         self._test_recipe_contents(recipefile, checkvars, inherits)
 
@@ -523,7 +523,7 @@ class RecipetoolTests(RecipetoolBase):
         self.assertTrue(os.path.isfile(recipefile))
         checkvars = {}
         checkvars['LICENSE'] = set(['GPLv2'])
-        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http'
+        checkvars['SRC_URI'] = 'git://git.yoctoproject.org/git/matchbox-terminal;protocol=http;branch=master'
         inherits = ['pkgconfig', 'autotools']
         self._test_recipe_contents(recipefile, checkvars, inherits)
 
diff --git a/poky/meta/lib/oeqa/selftest/cases/reproducible.py b/poky/meta/lib/oeqa/selftest/cases/reproducible.py
index 0e44ce4dbf..4b606e7e64 100644
--- a/poky/meta/lib/oeqa/selftest/cases/reproducible.py
+++ b/poky/meta/lib/oeqa/selftest/cases/reproducible.py
@@ -31,7 +31,6 @@ exclude_packages = [
 	'bootchart2-doc',
 	'epiphany',
 	'gcr',
-	'git',
 	'glide',
 	'go-dep',
 	'go-helloworld',
@@ -44,7 +43,6 @@ exclude_packages = [
 	'libcap-ng',
 	'libjson',
 	'libproxy',
-	'lsb-release',
 	'lttng-tools-dbg',
 	'lttng-tools-ptest',
 	'ltp',
@@ -55,14 +53,12 @@ exclude_packages = [
 	'pybootchartgui',
 	'qemu',
 	'quilt-ptest',
-	"rpm",
 	'rsync',
 	'ruby',
 	'stress-ng',
 	'systemd-bootchart',
 	'systemtap',
 	'valgrind-ptest',
-	'vim',
 	'webkitgtk',
 	]
 
@@ -144,6 +140,32 @@ def compare_file(reference, test, diffutils_sysroot):
     result.status = SAME
     return result
 
+def run_diffoscope(a_dir, b_dir, html_dir, **kwargs):
+    return runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', 'yes', '--html-dir', html_dir, a_dir, b_dir],
+                **kwargs)
+
+class DiffoscopeTests(OESelftestTestCase):
+    diffoscope_test_files = os.path.join(os.path.dirname(os.path.abspath(__file__)), "diffoscope")
+
+    def test_diffoscope(self):
+        bitbake("diffoscope-native -c addto_recipe_sysroot")
+        diffoscope_sysroot = get_bb_var("RECIPE_SYSROOT_NATIVE", "diffoscope-native")
+
+        # Check that diffoscope doesn't return an error when the files compare
+        # the same (a general check that diffoscope is working)
+        with tempfile.TemporaryDirectory() as tmpdir:
+            run_diffoscope('A', 'A', tmpdir,
+                native_sysroot=diffoscope_sysroot, cwd=self.diffoscope_test_files)
+
+        # Check that diffoscope generates an index.html file when the files are
+        # different
+        with tempfile.TemporaryDirectory() as tmpdir:
+            r = run_diffoscope('A', 'B', tmpdir,
+                native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=self.diffoscope_test_files)
+
+            self.assertNotEqual(r.status, 0, msg="diffoscope was successful when an error was expected")
+            self.assertTrue(os.path.exists(os.path.join(tmpdir, 'index.html')), "HTML index not found!")
+
 class ReproducibleTests(OESelftestTestCase):
     # Test the reproducibility of whatever is built between sstate_targets and targets
 
@@ -321,7 +343,7 @@ class ReproducibleTests(OESelftestTestCase):
                 # Copy jquery to improve the diffoscope output usability
                 self.copy_file(os.path.join(jquery_sysroot, 'usr/share/javascript/jquery/jquery.min.js'), os.path.join(package_html_dir, 'jquery.js'))
 
-                runCmd(['diffoscope', '--no-default-limits', '--exclude-directory-metadata', '--html-dir', package_html_dir, 'reproducibleA', 'reproducibleB'],
+                run_diffoscope('reproducibleA', 'reproducibleB', package_html_dir,
                         native_sysroot=diffoscope_sysroot, ignore_status=True, cwd=package_dir)
 
         if fails:
diff --git a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
index 353d411681..20dc1c9482 100644
--- a/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
+++ b/poky/meta/lib/oeqa/selftest/cases/runtime_test.py
@@ -179,6 +179,12 @@ class TestImage(OESelftestTestCase):
             self.skipTest('virgl isn\'t working with Debian 8')
         if distro and distro == 'centos-7':
             self.skipTest('virgl isn\'t working with Centos 7')
+        if distro and distro == 'centos-8':
+            self.skipTest('virgl isn\'t working with Centos 8')
+        if distro and distro == 'fedora-34':
+            self.skipTest('virgl isn\'t working with Fedora 34')
+        if distro and distro == 'fedora-35':
+            self.skipTest('virgl isn\'t working with Fedora 35')
         if distro and distro == 'opensuseleap-15.0':
             self.skipTest('virgl isn\'t working with Opensuse 15.0')
 
@@ -216,6 +222,7 @@ class TestImage(OESelftestTestCase):
         Author: Alexander Kanavin <alex.kanavin@gmail.com>
         """
         import subprocess, os
+        self.skipTest("Crashes in mesa observed with this test on dunfell: https://bugzilla.yoctoproject.org/show_bug.cgi?id=14527")
         try:
             content = os.listdir("/dev/dri")
             if len([i for i in content if i.startswith('render')]) == 0:
diff --git a/poky/meta/lib/oeqa/selftest/cases/sstatetests.py b/poky/meta/lib/oeqa/selftest/cases/sstatetests.py
index c46e8ba489..1bfe88c87d 100644
--- a/poky/meta/lib/oeqa/selftest/cases/sstatetests.py
+++ b/poky/meta/lib/oeqa/selftest/cases/sstatetests.py
@@ -39,7 +39,7 @@ class SStateTests(SStateBase):
 
         recipefile = os.path.join(tempdir, "recipes-test", "dbus-wait-test", 'dbus-wait-test_git.bb')
         os.makedirs(os.path.dirname(recipefile))
-        srcuri = 'git://' + srcdir + ';protocol=file'
+        srcuri = 'git://' + srcdir + ';protocol=file;branch=master'
         result = runCmd(['recipetool', 'create', '-o', recipefile, srcuri])
         self.assertTrue(os.path.isfile(recipefile), 'recipetool did not create recipe file; output:\n%s' % result.output)
 
@@ -137,7 +137,7 @@ class SStateTests(SStateBase):
             filtered_results.append(r)
         self.assertTrue(filtered_results == [], msg="Found distro non-specific sstate for: %s (%s)" % (', '.join(map(str, targets)), str(filtered_results)))
         file_tracker_1 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
-        self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+        self.assertTrue(len(file_tracker_1) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
 
         self.track_for_cleanup(self.distro_specific_sstate + "_old")
         shutil.copytree(self.distro_specific_sstate, self.distro_specific_sstate + "_old")
@@ -146,13 +146,13 @@ class SStateTests(SStateBase):
         bitbake(['-cclean'] + targets)
         bitbake(targets)
         file_tracker_2 = self.search_sstate('|'.join(map(str, [s + r'.*?\.tgz$' for s in targets])), distro_specific=True, distro_nonspecific=False)
-        self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files ware created for: %s" % ', '.join(map(str, targets)))
+        self.assertTrue(len(file_tracker_2) >= len(targets), msg = "Not all sstate files were created for: %s" % ', '.join(map(str, targets)))
 
         not_recreated = [x for x in file_tracker_1 if x not in file_tracker_2]
-        self.assertTrue(not_recreated == [], msg="The following sstate files ware not recreated: %s" % ', '.join(map(str, not_recreated)))
+        self.assertTrue(not_recreated == [], msg="The following sstate files were not recreated: %s" % ', '.join(map(str, not_recreated)))
 
         created_once = [x for x in file_tracker_2 if x not in file_tracker_1]
-        self.assertTrue(created_once == [], msg="The following sstate files ware created only in the second run: %s" % ', '.join(map(str, created_once)))
+        self.assertTrue(created_once == [], msg="The following sstate files were created only in the second run: %s" % ', '.join(map(str, created_once)))
 
     def test_rebuild_distro_specific_sstate_cross_native_targets(self):
         self.run_test_rebuild_distro_specific_sstate(['binutils-cross-' + self.tune_arch, 'binutils-native'], temp_sstate_location=True)
@@ -202,9 +202,9 @@ class SStateTests(SStateBase):
         actual_remaining_sstate = [x for x in self.search_sstate(target + r'.*?\.tgz$') if not any(pattern in x for pattern in ignore_patterns)]
 
         actual_not_expected = [x for x in actual_remaining_sstate if x not in expected_remaining_sstate]
-        self.assertFalse(actual_not_expected, msg="Files should have been removed but ware not: %s" % ', '.join(map(str, actual_not_expected)))
+        self.assertFalse(actual_not_expected, msg="Files should have been removed but were not: %s" % ', '.join(map(str, actual_not_expected)))
         expected_not_actual = [x for x in expected_remaining_sstate if x not in actual_remaining_sstate]
-        self.assertFalse(expected_not_actual, msg="Extra files ware removed: %s" ', '.join(map(str, expected_not_actual)))
+        self.assertFalse(expected_not_actual, msg="Extra files were removed: %s" ', '.join(map(str, expected_not_actual)))
 
     def test_sstate_cache_management_script_using_pr_1(self):
         global_config = []
diff --git a/poky/meta/lib/oeqa/selftest/cases/tinfoil.py b/poky/meta/lib/oeqa/selftest/cases/tinfoil.py
index a51c6048d3..4fcbe594c9 100644
--- a/poky/meta/lib/oeqa/selftest/cases/tinfoil.py
+++ b/poky/meta/lib/oeqa/selftest/cases/tinfoil.py
@@ -94,16 +94,15 @@ class TinfoilTests(OESelftestTestCase):
                 pass
 
             pattern = 'conf'
-            res = tinfoil.run_command('findFilesMatchingInDir', pattern, 'conf/machine')
+            res = tinfoil.run_command('testCookerCommandEvent', pattern)
             self.assertTrue(res)
 
             eventreceived = False
             commandcomplete = False
             start = time.time()
-            # Wait for maximum 60s in total so we'd detect spurious heartbeat events for example
-            # The test is IO load sensitive too
+            # Wait for maximum 120s in total so we'd detect spurious heartbeat events for example
             while (not (eventreceived == True and commandcomplete == True) 
-                    and (time.time() - start < 60)):
+                    and (time.time() - start < 120)):
                 # if we received both events (on let's say a good day), we are done  
                 event = tinfoil.wait_event(1)
                 if event:
@@ -111,7 +110,8 @@ class TinfoilTests(OESelftestTestCase):
                         commandcomplete = True
                     elif isinstance(event, bb.event.FilesMatchingFound):
                         self.assertEqual(pattern, event._pattern)
-                        self.assertIn('qemuarm.conf', event._matches)
+                        self.assertIn('A', event._matches)
+                        self.assertIn('B', event._matches)
                         eventreceived = True
                     elif isinstance(event, logging.LogRecord):
                         continue