subtree updates

meta-raspberrypi: 62a84833d9..b6a1645a97:
  Andrei Gherzan (22):
        ci: Migrate worflow to using latest git-mirror-me-action revision
        ci: Run the cancel workflow on generic workers and update action
        ci: Run the compliance workflow on generic workers
        ci: Run the mirror workflow on generic workers
        ci: Don't run yocto builds on PRs that don't affect them
        raspberrypi-tools.inc: Bump to latest revision
        rpi-gpio: Bump to 0.7.1
        python3-adafruit-platformdetect: Bump to 3.27.0
        python3-adafruit-circuitpython-register: Bump to 1.9.10
        userland: Bump revision to the current HEAD
        bluez-firmware-rpidistro: Backport patch to fix CYW43455 and various CVEs
        linux-raspberrypi: Update 5.15 recipe to 5.15.56
        linux-raspberrypi: Update 5.10 recipe to latest revision
        linux-firmware-rpidistro: Update to 1:20210315-3+rpt7 release
        omxplayer: Bump to latest revision
        linux-firmware-rpidistro: Revamp, cleanup and restructure recipe
        linux-firmware-rpidistro: Guard the recipe under a license flag
        ci: Set LICENSE_FLAGS_ACCEPTED in builder docker container
        README.md: Mention Yocto Compatible Layer
        README.md: Refactor top table
        Add initial version of CODE_OF_CONDUCT.md
        Use a png with transparency for balena logo

  Vincent Davis Jr (1):
        docs: remove backticks

poky: 4161dbbbd6..fc59c28724:
  Aatir Manzur (1):
        ref-manual: Sphinx note directive for DISTRO_FEATURES definition

  Alejandro Hernandez Samaniego (1):
        package.bbclass: Fix kernel source handling when not using externalsrc

  Alex Kiernan (1):
        bind: Remove legacy python3 PACKAGECONFIG code

  Alexander Kanavin (61):
        conf/local.conf.sample: mention site.conf.sample as well
        sato-icon-theme: check for new commits rather than tags
        gcr: exclude x.9y versions from upstream version check
        efibootmgr: update 17 -> 18
        systemd-boot: update 251.2 -> 251.3
        libva: upgrade 2.14.0 -> 2.15.0
        libva-utils: update 2.14.0 -> 2.15.0
        xev: update 1.2.4 -> 1.2.5
        xmodmap: update 1.0.10 -> 1.0.11
        xf86-input-synaptics: update 1.9.1 -> 1.9.2
        xf86-video-cirrus: update 1.5.3 -> 1.6.0
        encodings: update 1.0.5 -> 1.0.6
        font-util: update 1.3.2 -> 1.3.3
        linux-firmware: update 20220610 -> 20220708
        rt-tests: update 2.3 -> 2.4
        libgit2: update 1.4.3 -> 1.5.0
        u-boot: update 2022.04 -> 2022.07
        go: update 1.18.3 -> 1.18.4
        llvm: update 14.0.4 -> 14.0.6
        vulkan-samples: update to latest revision
        xserver-xorg: update 21.1.3 -> 21.1.4
        alsa-lib: upgrade 1.2.7.1 -> 1.2.7.2
        alsa-ucm-conf: upgrade 1.2.7.1 -> 1.2.7.2
        diffoscope: upgrade 217 -> 218
        git: upgrade 2.37.0 -> 2.37.1
        hdparm: upgrade 9.63 -> 9.64
        libdrm: upgrade 2.4.111 -> 2.4.112
        libhandy: upgrade 1.6.2 -> 1.6.3
        libidn2: upgrade 2.3.2 -> 2.3.3
        libnl: upgrade 3.6.0 -> 3.7.0
        libnotify: upgrade 0.7.12 -> 0.8.0
        libuv: upgrade 1.44.1 -> 1.44.2
        log4cplus: upgrade 2.0.7 -> 2.0.8
        meson: upgrade 0.62.2 -> 0.63.0
        mmc-utils: upgrade to latest revision
        mpg123: upgrade 1.30.0 -> 1.30.1
        pango: upgrade 1.50.7 -> 1.50.8
        piglit: upgrade to latest revision
        python3-dtschema: upgrade 2022.5 -> 2022.7
        python3-hypothesis: upgrade 6.48.2 -> 6.50.1
        python3-setuptools-rust: upgrade 1.3.0 -> 1.4.1
        python3-setuptools-scm: upgrade 7.0.3 -> 7.0.5
        python3-setuptools: upgrade 62.6.0 -> 63.2.0
        python3-zipp: upgrade 3.8.0 -> 3.8.1
        sqlite3: upgrade 3.39.0 -> 3.39.1
        vala: upgrade 0.56.1 -> 0.56.2
        wayland-protocols: upgrade 1.25 -> 1.26
        webkitgtk: upgrade 2.36.3 -> 2.36.4
        xwayland: upgrade 22.1.2 -> 22.1.3
        epiphany: upgrade 42.2 -> 42.3
        xf86-input-keyboard: remove the recipe
        toolchain-scripts.bbclass: adjust toolchain_create_tree_env_script to better replicate (e)SDK
        meta-ide-support: adjust to provide (e)SDK experience directly in a yocto build
        oeqa/sdk: add a test class for running SDK tests directly in a Yocto build
        oeqa/sdk: allow epoxy/galculator tests to run in esdk and direct yocto builds
        meson: provide relocation script and native/cross wrappers also for meson-native
        selftest/meta_ide: add a test for running SDK tests directly in a yocto build
        scripts/oe-setup-builddir: make it known where configurations come from
        devtool/upgrade: correctly clean up when recipe filename isn't yet known
        devtool/upgrade: catch bb.fetch2.decodeurl errors
        poky-floating-revisions.inc: remove xf86-input-keyboard entry

  Aníbal Limón (1):
        rng-tools: Change systemd service name to work with sysvinit

  Armin Kuster (1):
        poky.conf: remove EOL and Centos7 hosts

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

  Changhyeok Bae (1):
        repo: upgrade 2.27 -> 2.28

  Chen Qi (2):
        glibc: make glibc-dev depend on kernel headers
        image_types_wic.bbclass: fix cross binutils dependency

  Daniel Gomez (1):
        dropbear: Add configuration file to CONFFILES

  Dmitry Baryshkov (1):
        linux-firwmare: restore WHENCE_CHKSUM variable

  He Zhe (1):
        lttng-modules: Fix build failure for kernel v5.15.58

  Hitendra Prajapati (1):
        qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash

  Jan Kiszka (2):
        wic/bootimg-efi: Factor out some common bits
        wic/bootimg-efi: Add support for loading devicetree files

  Jan Vermaete (1):
        python3-jsonschema: 4.7.1 -> 4.7.2 + fixed the rdepends

  Jose Quaresma (5):
        bitbake: bitbake: bitbake-user-manual: hashserv can be accessed on a dedicated domain
        archiver.bbclass: remove unsed do_deploy_archives[dirs]
        bitbake: bb/utils: remove: check the path again the expand python glob
        bitbake: bb/utils: movefile: use the logger for printing
        create-spdx: ignore packing control files from ipk and deb

  Joshua Watt (3):
        sstatesig: Include all dependencies in SPDX task signatures
        bitbake: asyncrpc: Add TCP Keep Alives
        classes/sanity: Add comment about github & gitlab archives

  Kai Kang (1):
        mesa: fix compile error when debug build enabled

  Khem Raj (11):
        lua: Backport fix for CVE-2022-33099
        gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so
        gcc-runtime: Use --with-target-subdir for baremetal targets
        systemd: Drop backported patch applied in 251.3
        gcc-runtime: Use static dummy libstdc++
        libgcc: Fix standalone target builds with usrmerge distro feature
        systemd: Fix conflict between glibc mount.h and kernel mount.h
        libarchive: Avoid mount.h conflict between kernel and glibc
        btrfs-tools: Use linux/mount.h instead of sys/mount.h
        gcc-sanitizers: Fix mount.h glibc 2.36 conflict
        hdparm: Fix build with glibc 2.36

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

  Lee Chee Yang (1):
        migration guides: release notes for 4.0.2

  Mark Hatle (4):
        runqemu: Add missing space on default display option
        default-distrovars: seccomp doesn't support microblaze
        openssl: Move microblaze to linux-latomic config
        elfutils: Microblaze does not support symvers

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

  Martin Jansa (6):
        python3-setuptools: move patch from 'files' to 'python3-setuptools'
        kernel.bbclass: pass LD also in savedefconfig
        ltp: fix build with ld-is-gold in DISTRO_FEATURES
        pybootchartgui: render memory pressure as well
        pybootchartgui: fix 2 SyntaxWarnings
        pybootchartgui: write the max values in the graph legend

  Michael Opdenacker (2):
        docs: BB_HASHSERVE_UPSTREAM: update to new host
        bitbake: bitbake-user-manual: npm fetcher: improve description of SRC_URI format

  Mihai Lindner (2):
        wic/plugins/rootfs: Fix NameError for 'orig_path'
        create-spdx: Fix supplier field

  Ming Liu (2):
        rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
        udev-extraconf:mount.sh: fix a umount issue

  Mingli Yu (1):
        strace: set COMPATIBLE_HOST for riscv32

  Otavio Salvador (2):
        cargo-cross-canadian: Use SDK's flags during target linking
        oeqa/sdk: Add basic rust cargo test

  Petr Vorel (1):
        ltp: Add post release runtime fixes

  Quentin Schulz (2):
        docs: ref-manual: variables: remove sphinx directive from literal block
        docs: auto-generate releases.rst

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

  Richard Purdie (16):
        curl: Fix determinism issues in ptest package
        build-appliance-image: Update to master head revision
        base/reproducible: Change Source Date Epoch generation methods
        vim: Upgrade 9.0.0021 -> 9.0.0063
        rust-common: Set llvm-target correctly for cross SDK targets
        rust-cross-canadian: Fix ordering of target json config generation
        rust-cross/rust-common: Merge arm target handling code to fix cross-canadian
        rust-cross: Simplfy the rust_gen_target calls
        rust-common/rust-cross: Clean up target json generation code
        rust-target-config: Create new class to contain target json config generation
        rust-target-config: Allow the targets generated to be configurable
        native: Clear TUNE_FEATURES/ABIEXTENSION
        populate_sdk: Add SDK toolchain language selection support
        populate_sdk_base: Fix mingw override name
        poky: Enable debug-kernel for SPDX license manifests
        oeqa/sdk/rust: Fix file deletion for multilib SDKs

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

  Ross Burton (13):
        pulseaudio: add m4-native to DEPENDS
        python3-picobuild: upgrade to 0.2
        oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled
        perf: fix reproduciblity in older releases of Linux
        zstd: do verbose builds
        zlib: remove historical movement of libz.so to /lib
        oeqa/selftest: rename git.py to intercept.py
        oeqa/gotoolchain: put writable files in the Go module cache
        oeqa/gotoolchain: set CGO_ENABLED=1
        qemu: add io_uring PACKAGECONFIG
        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

  Shruthi Ravichandran (2):
        initscripts: run umountnfs as a KILL script
        package_manager/ipk: do not pipe stderr to stdout

  Tom Hochstein (2):
        gobject-introspection-data: Disable cache for g-ir-scanner
        uboot-config.bbclass: Raise error for bad key

  gr embeter (1):
        efivar: fix import functionality

  leimaohui (1):
        systemd: Added base_bindir into pkg_postinst:udev-hwdb.

  wangmy (10):
        python3-docutils: upgrade 0.18.1 -> 0.19
        python3-attrs: upgrade 21.4.0 -> 22.1.0
        python3-cython: upgrade 0.29.30 -> 0.29.32
        python3-dbusmock: upgrade 0.28.1 -> 0.28.4
        python3-hatchling: upgrade 1.5.0 -> 1.6.0
        python3-jsonschema: upgrade 4.7.2 -> 4.9.0
        python3-scons: upgrade 4.3.0 -> 4.4.0
        python3-setuptools: upgrade 63.2.0 -> 63.3.0
        python3-pygobject: upgrade 3.42.1 -> 3.42.2
        python3-pip: upgrade 22.1.2 -> 22.2.1

meta-security: 7ad5f6a9da..2a2d650ee0:
  Alex Kiernan (1):
        bubblewrap: Add recipe

  Armin Kuster (28):
        packagegroup-core-security.bb: add bubblewrap to pkg grp
        packagegroup-security-tpm: add libhoth to pkg grp
        python3-privacyidea: update to 3.7.2
        suricata: update to 6.0.5
        chipsec: update to 1.8.7
        fail2ban: add UPSTREAM_CHECK vars
        ibmtpm2tss: fix SRC_URI
        tpm2-tss-engine: add UPSTREAM_CHECK_URI
        tpm2-tss: add UPSTREAM_CHECK_URI
        tpm2-tools: Add UPSTREAM_CHECK_URI
        tpm2-openssl: Add UPSTREAM_CHECK_URI
        tpm2-pkcs11: Add UPSTREAM_CHECK_URI
        tpm2-abrmd: add UPSTREAM_CHECK_URI
        tpm2-tcti-uefi: Add UPSTREAM_CHECK_URI
        aide: add UPSTREAM_CHECK_URI
        ecryptfs-utils: add UPSTREAM_CHECK_URI
        krill: update to 0.9.6
        packagegroup-core-security: add krill to pkg grps
        packagegroup-core-security: add chipsec pkg to grp
        apparmor: update to 3.0.5
        clamav: update to  0.104.4
        ibmtpm2tss: update version format
        ibmswtpm2: fix UPSTREAM_CHECK
        ibmswtpm2: update to 1682
        swtpm: update to 0.7.3
        lkrg: update to 0.9.4
        krill: only builds on x86/x86-64 and arm64
        packagegroup-core-security: remove krill for some archs

  Armpit's Upgrade Helper (1):
        libtpm: upgrade 0.9.3 -> 0.9.5

  John Edward Broadbent (1):
        meta-security: Add recipe for libhoth

  Upgrade Helper (1):
        sssd: upgrade 2.7.1 -> 2.7.3

meta-arm: 80d60e7b1c..20a629180c:
  Peter Hoyes (1):
        runfvp: Stop the FVP when telnet shuts down cleanly

meta-openembedded: 31c10bd3e6..2eb39477a7:
  Alexander Thoma (1):
        Fix tigervnc crash due to missing xkbcomp rdepends

  Armin Kuster (1):
        bigbuckbunny-1080p: update SRC_URI

  Aryaman Gupta (1):
        rsyslog: update 8.2202->8.2206

  Chen Qi (1):
        catfish: fix buildpaths issue

  Davide Gardenal (7):
        freeradius: ignore patched CVEs
        openflow: ignore unrelated CVEs
        libplist: ignore patched CVEs
        meta-oe: ignore patched CVEs
        mongodb: ignore unrelated CVEs
        php: ignore patched CVEs
        postgresql: ignore unrelated CVE

  Gianfranco (1):
        vboxguestdrivers: fix build failure on 32 bit architectures

  Gianfranco Costamagna (1):
        vboxguestdrivers: upgrade 6.1.34 -> 6.1.36

  Jan Vermaete (8):
        python3-pyzmq: version bump 22.3.0 -> 23.2.0
        python3-aspectlib: updated the summary and added a description.
        python3-jsonrpcclient: Added the jsonrpcclient Python package
        python3-oslash: added the oslash Python package
        python3-jsonrpcserver: added the python3-oslash rdepends
        python-ptyprocess: fixed test_pass_fds
        python3-pyzmq: added ptest
        python3-pyzmq: fixed oelint-adv warnings

  Johannes Schneider (1):
        python3-pystemd: Upgrade 0.8.0 -> 0.10.0

  Khem Raj (11):
        poco: Link with libatomic on riscv32
        python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta
        catfish: Inherit setuptools3 instead of python_setuptools_build_meta
        python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta
        python3-qface: Inherit setuptools3 instead of python_setuptools_build_meta
        xscreensaver: Upgrade to 6.04
        poco: Link with libatomic on mips
        Revert "catfish: Inherit setuptools3 instead of python_setuptools_build_meta"
        Revert "python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta"
        Revert "python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta"
        libmtp: Upgrade to 1.1.20

  Martin Großhauser (1):
        Add runtime dependencies for python3-supervisor

  Mingli Yu (1):
        s-nail: fix buildpaths issue

  Radovan Scasny (1):
        libwebsockets: update to version 4.3.2

  Ross Burton (9):
        python3-cbor2: add missing build dependency
        python3-simpleeval: remove 'build' build dependency
        python3-pyrad: fix build system specification
        python3-pytest-html: fix DEPENDS, don't depend on pip
        python3-ansi2html: fix DEPENDS
        python3-pytest-helpers-namespace: add missing build dependencies
        python3-pyzmq: add missing build dependency
        python3-path: add missing build dependencies
        python3-pytest-forked: loosen dependency checking

  Sergey Kizunov (2):
        Add python3-pycares 4.2.1
        Add python3-aiodns 3.0.0

  Trevor Gamblin (1):
        README: Remove maintainer info for tvgamblin

  Wang Mingyu (10):
        php: upgrade 8.1.7 -> 8.1.8
        ndisc6: upgrade 1.0.5 -> 1.0.6
        python3-elementpath: upgrade 2.5.3 -> 3.0.1
        python3-pymongo: upgrade 4.1.1 -> 4.2.0
        python3-pyscaffold: upgrade 4.2.3 -> 4.3
        python3-regex: upgrade 2022.7.9 -> 2022.7.24
        python3-rsa: upgrade 4.8 -> 4.9
        python3-sh: upgrade 1.14.2 -> 1.14.3
        python3-werkzeug: upgrade 2.1.2 -> 2.2.0
        python3-xmlschema: upgrade 1.11.3 -> 2.0.1

  Xu Huan (14):
        python3-eth-hash: upgrade 0.3.3 -> 0.4.0
        python3-socketio: upgrade 5.6.0 -> 5.7.0
        python3-ujson: upgrade 5.3.0 -> 5.4.0
        python3-web3: upgrade 5.29.2 -> 5.30.0
        python3-fastjsonschema: upgrade 2.15.3 -> 2.16.1
        python3-flask: upgrade 2.1.2 -> 2.1.3
        python3-googleapis-common-protos: upgrade 1.56.3 -> 1.56.4
        python3-iso3166: upgrade 2.0.2 -> 2.1.1
        python3-kiwisolver: upgrade 1.4.3 -> 1.4.4
        python3-portalocker: upgrade 2.4.0 -> 2.5.1
        python3-imageio: upgrade 2.19.3 -> 2.19.5
        python3-lz4: upgrade 4.0.1 -> 4.0.2
        python3-mypy: upgrade 0.961 -> 0.971
        python3-protobuf: upgrade 4.21.2 -> 4.21.3

  kazuki0824 (1):
        ttf-fonts: fix URIs, upgrade 1.004 -> 2.004

  wangmy (30):
        gegl: upgrade 0.4.36 -> 0.4.38
        libadwaita: upgrade 1.1.2 -> 1.1.3
        libgsf: upgrade 1.14.49 -> 1.14.50
        nbdkit: upgrade 1.31.10 -> 1.31.12
        irssi: upgrade 1.4.1 -> 1.4.2
        libp11: upgrade 0.4.11 -> 0.4.12
        modemmanager: upgrade 1.18.8 -> 1.18.10
        pegtl: upgrade 3.2.6 -> 3.2.7
        PATCH] logcheck: upgrade 1.3.23 -> 1.3.24
        python3-lru-dict: upgrade 1.1.7 -> 1.1.8
        python3-pyfanotify: upgrade 0.1.3 -> 0.2.0
        python3-pylint: upgrade 2.14.4 -> 2.14.5
        python3-pytest-metadata: upgrade 2.0.1 -> 2.0.2
        python3-regex: upgrade 2022.6.2 -> 2022.7.9
        python3-socketio: upgrade 5.7.0 -> 5.7.1
        python3-stevedore: upgrade 3.5.0 -> 4.0.0
        tracker: upgrade 3.3.1 -> 3.3.2
        zenity: upgrade 3.42.1 -> 3.43.0
        nbdkit: upgrade 1.31.12 -> 1.31.14
        stunnel: upgrade 5.64 -> 5.65
        unbound: upgrade 1.16.0 -> 1.16.1
        wolfssl: upgrade 5.3.0 -> 5.4.0
        atkmm-2.36: upgrade 2.36.1 -> 2.36.2
        nanopb: upgrade 0.4.5 -> 0.4.6.4
        redis-plus-plus: upgrade 1.3.3 -> 1.3.5
        redis: upgrade 7.0.2 -> 7.0.4
        ser2net: upgrade 4.3.6 -> 4.3.7
        unattended-upgrades: upgrade 2.6 -> 2.9.1
        valijson: upgrade 0.6 -> 0.7
        googlebenchmark: upgrade 1.6.1 -> 1.7.0

  zhengruoqin (17):
        python3-redis: upgrade 4.3.3 -> 4.3.4
        python3-ldap: upgrade 3.4.0 -> 3.4.2
        python3-pillow: upgrade 9.1.1 -> 9.2.0
        python3-pylint: upgrade 2.14.3 -> 2.14.4
        python3-alembic: upgrade 1.8.0 -> 1.8.1
        python3-astroid: upgrade 2.11.6 -> 2.12.2
        python3-attr: upgrade 0.3.1 -> 0.3.2
        python3-blinker: upgrade 1.4 -> 1.5
        python3-cmd2: upgrade 2.4.1 -> 2.4.2
        python3-ecdsa: upgrade 0.17.0 -> 0.18.0
        python3-evdev: upgrade 1.5.0 -> 1.6.0
        python3-absl: upgrade 1.1.0 -> 1.2.0
        python3-bitarray: upgrade 2.5.1 -> 2.6.0
        python3-eth-hash: upgrade 0.4.0 -> 0.5.0
        python3-google-api-python-client: upgrade 2.51.0 -> 2.54.0
        python3-google-auth: upgrade 2.9.0 -> 2.9.1
        python3-graphviz: upgrade 0.20 -> 0.20.1

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I50c531a69ce8abb23e33c380f9228015f2764682
diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch b/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
deleted file mode 100644
index 42f3a81..0000000
--- a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-remove-extra-decl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 99b578501643377e0b1994b2a068b790d189d5ad Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 13 Jun 2018 09:41:01 -0400
-Subject: [PATCH] remove extra decl
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-
-Upstream-Status: Backport [git://github.com/rhinstaller/efibootmgr.git]
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
----
- src/efibootmgr.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/efibootmgr.c b/src/efibootmgr.c
-index de38f01..4e1a680 100644
---- a/src/efibootmgr.c
-+++ b/src/efibootmgr.c
-@@ -1536,9 +1536,6 @@ parse_opts(int argc, char **argv)
- 					       "invalid numeric value %s\n",
- 					       optarg);
- 			}
--                        /* XXX efivar-36 accidentally doesn't have a public
--                         * header for this */
--			extern int efi_set_verbose(int verbosity, FILE *errlog);
- 			efi_set_verbose(opts.verbose - 2, stderr);
- 			break;
- 		case 'V':
--- 
-2.7.4
-
diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-src-make-compatible-with-efivar-38.patch b/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-src-make-compatible-with-efivar-38.patch
deleted file mode 100644
index f8d9123..0000000
--- a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/0001-src-make-compatible-with-efivar-38.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 07f080184d067c1ebc3fec1b53dd4a06d1a2566a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 17 Jan 2022 23:24:34 +0100
-Subject: [PATCH] src: make compatible with efivar 38
-
-Upstream-Status: Backport
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/efibootdump.c | 2 +-
- src/efibootmgr.c  | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/efibootdump.c b/src/efibootdump.c
-index eceffd6..09bd76e 100644
---- a/src/efibootdump.c
-+++ b/src/efibootdump.c
-@@ -69,7 +69,7 @@ print_boot_entry(efi_load_option *loadopt, size_t data_size)
- 	text_path = alloca(text_path_len);
- 	if (!text_path)
- 		error(100, "Couldn't allocate memory");
--	rc = efidp_format_device_path(text_path, text_path_len,
-+	rc = efidp_format_device_path((unsigned char *)text_path, text_path_len,
- 				      dp, pathlen);
- 	if (rc < 0) {
- 		printf("<bad device path>");
-diff --git a/src/efibootmgr.c b/src/efibootmgr.c
-index 4e1a680..b77b1fb 100644
---- a/src/efibootmgr.c
-+++ b/src/efibootmgr.c
-@@ -949,7 +949,7 @@ show_vars(const char *prefix)
- 			pathlen = efi_loadopt_pathlen(load_option,
- 						      boot->data_size);
- 			dp = efi_loadopt_path(load_option, boot->data_size);
--			rc = efidp_format_device_path(text_path, text_path_len,
-+			rc = efidp_format_device_path((unsigned char *)text_path, text_path_len,
- 						      dp, pathlen);
- 			if (rc < 0)
- 				error(18, "Could not parse device path");
-@@ -960,7 +960,7 @@ show_vars(const char *prefix)
- 			if (!text_path)
- 				error(19, "Could not parse device path");
- 
--			rc = efidp_format_device_path(text_path, text_path_len,
-+			rc = efidp_format_device_path((unsigned char *)text_path, text_path_len,
- 						      dp, pathlen);
- 			if (rc < 0)
- 				error(20, "Could not parse device path");
diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch b/poky/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch
deleted file mode 100644
index 9525ed8..0000000
--- a/poky/meta/recipes-bsp/efibootmgr/efibootmgr/97668ae0bce776a36ea2001dea63d376be8274ac.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 97668ae0bce776a36ea2001dea63d376be8274ac Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Wed, 6 Mar 2019 13:08:33 -0500
-Subject: [PATCH] Make sure PKGS= is propogated into the submake for "make
- deps"
-
-When we're doing make deps with "$(CC) -MF", gcc and clang have different
-behavior, both broken in different ways, which we're hitting because of a
-missing -I argument for libefivar's includes.  On clang, when a header can't
-be found, it emits a rule with the header as a prerequisite without a path,
-such as efivar.h here:
-
-efibootmgr.o: efibootmgr.c fix_coverity.h efivar.h efiboot.h \
-  /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
-  /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
-  /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
-  /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
-  error.h
-
-Then the build that utilizes that rule will fail to find the
-prerequisite and tell you something like:
-
-make[1]: *** No rule to make target 'efivar.h', needed by 'efibootmgr.o'.  Stop.
-make[1]: Leaving directory '/home/pjones/devel/github.com/efibootmgr/master/src'
-
-With gcc, when a header can't be found, it emits a rule without that header
-as a prerequisite, as such (again with efivar.h):
-
-efibootmgr.o: efibootmgr.c fix_coverity.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
- error.h
-
-And then your build will fail if you haven't adjusted CFLAGS to tell it
-where to find the header.
-
-Both of these would be better just erroring, but at least gcc's doesn't
-insert a *wrong* dependency.
-
-This patch adds "PKGS=efivar efibootmgr popt" for all deps under src/.
-Technically that's overkill, as efibootmgr itself doesn't need popt, but it
-doesn't hurt anything to have the extra part there.  The resulting
-.efibootmgr.d file has the prerequisites expressed correctly:
-
-efibootmgr.o: efibootmgr.c fix_coverity.h /usr/include/efivar/efivar.h \
- /usr/include/efivar/efiboot.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/list.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/unparse_path.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efi.h \
- /home/pjones/devel/github.com/efibootmgr/master/src/include/efibootmgr.h \
- error.h
-
-This fixes the issue described in github PR #96
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Upstream-Status: Backport [https://github.com/rhboot/efibootmgr/commit/97668ae0bce776a36ea2001dea63d376be8274ac]
----
- src/Makefile | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 258bac1..32fa188 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -31,8 +31,13 @@ efibootdump : PKGS=efivar efiboot popt
- efibootnext : $(call objects-of,$(EFIBOOTNEXT_SOURCES))
- efibootnext : PKGS=efivar efiboot popt
- 
-+deps : PKGS=efivar efiboot popt
- deps : $(ALL_SOURCES)
--	$(MAKE) -f $(TOPDIR)/Make.deps deps SOURCES="$(ALL_SOURCES)" SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)"
-+	$(MAKE) -f $(TOPDIR)/Make.deps \
-+		SOURCES="$(ALL_SOURCES)" \
-+		SUBDIR_CFLAGS="$(SUBDIR_CFLAGS)" \
-+		PKGS="$(PKGS)" \
-+		deps
- 
- clean :
- 	@rm -rfv *.o *.a *.so $(TARGETS)
diff --git a/poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb b/poky/meta/recipes-bsp/efibootmgr/efibootmgr_18.bb
similarity index 75%
rename from poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
rename to poky/meta/recipes-bsp/efibootmgr/efibootmgr_18.bb
index 11d8b90..cbcaac1 100644
--- a/poky/meta/recipes-bsp/efibootmgr/efibootmgr_17.bb
+++ b/poky/meta/recipes-bsp/efibootmgr/efibootmgr_18.bb
@@ -10,12 +10,8 @@
 
 COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
 
-SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=master \
-           file://0001-remove-extra-decl.patch \
-           file://97668ae0bce776a36ea2001dea63d376be8274ac.patch \
-           file://0001-src-make-compatible-with-efivar-38.patch \
-           "
-SRCREV = "e067160ecef8208e1944002e5d50b275733211fb"
+SRC_URI = "git://github.com/rhinstaller/efibootmgr.git;protocol=https;branch=main"
+SRCREV = "c3f9f0534e32158f62c43564036878b93b9e0fd6"
 
 S = "${WORKDIR}/git"
 
diff --git a/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch b/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch
new file mode 100644
index 0000000..7e63df5
--- /dev/null
+++ b/poky/meta/recipes-bsp/efivar/efivar/0001-Fix-invalid-free-in-main.patch
@@ -0,0 +1,30 @@
+From 085f027e9e9f1478f68ddda705f83b244ee3bd88 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Mon, 18 Apr 2022 13:08:18 -0400
+Subject: [PATCH] Fix invalid free in main()
+
+data is allocated by mmap() in prepare_data().
+
+Resolves: #173
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+Upstream-Status: Backport
+Link: https://github.com/rhboot/efivar/commit/6be2cb1c0139ac177e754b0767abf1ca1533847f
+Signed-off-by: Grygorii Tertychnyi <grygorii.tertychnyi@leica-geosystems.com>
+
+---
+ src/efivar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/efivar.c b/src/efivar.c
+index 5cd1eb2bc73c..09f85edd0a38 100644
+--- a/src/efivar.c
++++ b/src/efivar.c
+@@ -633,7 +633,7 @@ int main(int argc, char *argv[])
+ 				if (sz < 0)
+ 					err(1, "Could not import data from \"%s\"", infile);
+ 
+-				free(data);
++				munmap(data, data_size);
+ 				data = NULL;
+ 				data_size = 0;
+ 
diff --git a/poky/meta/recipes-bsp/efivar/efivar_38.bb b/poky/meta/recipes-bsp/efivar/efivar_38.bb
index 53fe20a..42625fa 100644
--- a/poky/meta/recipes-bsp/efivar/efivar_38.bb
+++ b/poky/meta/recipes-bsp/efivar/efivar_38.bb
@@ -11,6 +11,7 @@
            file://0001-docs-do-not-build-efisecdb-manpage.patch \
            file://0001-src-Makefile-build-util.c-separately-for-makeguids.patch \
            file://efisecdb-fix-build-with-musl-libc.patch \
+           file://0001-Fix-invalid-free-in-main.patch \
            "
 SRCREV = "1753149d4176ebfb2b135ac0aaf79340bf0e7a93"
 
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc
index 8fc3360..d7fd3c7 100644
--- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -7,12 +7,12 @@
 DEPENDS += "flex-native bison-native"
 
 LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
 PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
+SRCREV = "e092e3250270a1016c877da7bdd9384f14b1321e"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc
index a8d7fab..0bdbce7 100644
--- a/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc
+++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools.inc
@@ -1,5 +1,8 @@
 SUMMARY = "U-Boot bootloader tools"
-DEPENDS += "gnutls openssl util-linux"
+DEPENDS += "gnutls openssl util-linux swig-native"
+
+inherit python3native
+export STAGING_INCDIR="${STAGING_INCDIR_NATIVE}"
 
 PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage"
 PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native"
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
similarity index 97%
rename from poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb
rename to poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
index 7eaf721..ef386f7 100644
--- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb
+++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2022.07.bb
@@ -1,2 +1,3 @@
 require u-boot-common.inc
 require u-boot-tools.inc
+
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2022.04.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2022.07.bb
similarity index 100%
rename from poky/meta/recipes-bsp/u-boot/u-boot_2022.04.bb
rename to poky/meta/recipes-bsp/u-boot/u-boot_2022.07.bb