subtree updates:openembedded:poky: Jan 27 2023

poky: 0ce159991d..5e249ec855:
  Alex Kiernan (2):
        rust: Upgrade 1.66.0 -> 1.66.1
        rust: Remove CARGO_VERSION

  Alexander Kanavin (7):
        selftest/virgl: use pkg-config from the host
        ethtool: upgrade 6.0 -> 6.1
        man-pages: upgrade 6.01 -> 6.02
        mesa: update 22.2.3 -> 22.3.3
        webkitgtk: submit a patch upstream
        python3-sphinxcontrib-applehelp: update 1.0.2 -> 1.0.3
        vulkan-samples: branch rename master -> main

  Benoît Mauduit (1):
        lib/oe/reproducible: Use git log without gpg signature

  Bruce Ashfield (6):
        linux-yocto/6.1: edgerouter: Replace OCTEON_USB with USB_OCTEON_HCD
        linux-yocto/6.1: qemuriscv32: Enable CONFIG_NONPORTABLE
        linux-yocto/6.1: update to v6.1.5
        linux-yocto/5.15: update to v5.15.87
        conf/qemu: bump preferred kernel version to 6.1
        poky/poky-tiny: bump preferred version to 6.1

  Changqing Li (1):
        cmake-native: use internal cmcurl library

  Chen Qi (2):
        file: export MAGIC in SDK
        rpm: do not export MAGIC in SDK

  Chuck Wolber (1):
        scripts/oe-setup-layers: Make efficiently idempotent

  Fabio Estevam (2):
        u-boot: Upgrade to 2023.01
        u-boot: Update Upstream-Status

  He Zhe (1):
        lttng-modules: update 2.13.7 -> 2.13.8

  Jan Luebbe (1):
        p11-kit: add native to BBCLASSEXTEND

  Jermain Horsman (1):
        cve-check: write the cve manifest to IMGDEPLOYDIR

  Kevin Hao (1):
        meta-yocto-bsp: Update the default kernel to 6.1

  Khem Raj (31):
        createrepo-c: Include missing rpm/rpmstring.h
        libglu: Remove deprecated register in C++17
        cpio: Do not use _Noreturn in gnulib
        groff: Drop use of `register` storage class
        vulkan-samples: Update to the tip of trunk
        unfs3: Fix implicit function declarations of fix_dir_times()
        gperf: Make the code C++17 compliant
        libxcb: Fixed c2x standard undefined behaviour
        dbus: Use Alignof when using C11 or newer standard
        m4: Define alignof_slot using _Alignof when using C11 or newer
        opkg: Define alignof using _Alignof when using C11 or newer
        cpio: Fix gnulib alignof implementation on clang
        python3-numpy: Define _ALIGN using _Alignof when using C11 or newer
        vulkan-samples: Drop using u8string_view
        musl-obstack: Update to 1.2.3
        mdadm: Define alignof using _Alignof when using C11 or newer
        lttng-tools: Switch to alternative upstream submitted patch
        libtirpc: Check if file exists before operating on it
        ruby: Use C11 _Alignof to define ALIGN_OF when possible
        libusb1: Link with latomic only if compiler has no atomic builtins
        libusb1: Strip trailing whitespaces
        elfutils: Fix build with libcurl >= 7.87
        stress-ng: Robustify test-float test
        harfbuzz: Add missing <cstdio> and <cstdlib> includes
        apt: add missing <cstdint> for uint16_t
        vulkan-samples: Include missing header cstdint for uint32_t
        ruby: Update the patch status
        systemd: Add another fix for using XSI strerror_r
        elfutils: Remove funcretval test from run-native-test.sh for now
        binutils: Upgrade to 2.40 release
        binutils: Package libsframe

  Lee Chee Yang (1):
        migration-guides: add release-notes for 4.1.2

  Luca Boccassi (1):
        systemd: add PACKAGECONFIG to select default compression format

  Luca Ceresoli (1):
        manuals: fix typo in the MLPREFIX description

  Markus Volk (3):
        gptfdisk: add follow-up patch to fix with current popt
        gtk+3: add PACKAGECONFIG for libcloudservice and tracker; fix cups backend
        gtk4: add PACKAGECONFIG for cloudproviders

  Martin Jansa (1):
        mesa: update submitted patch with backported version

  Michael Opdenacker (3):
        rust-bin.bbclass: remove unused class
        meta/classes-global: remove package_tar.bbclass
        ref-manual: initial documentation for go and go-mod classes

  Mikko Rapeli (1):
        kmod: enable openssl support by default

  Niko Mauno (1):
        Fix missing leading whitespace with ':append'

  Ovidiu Panait (1):
        webkitgtk: fix perl-native dependency

  Paulo Neves (1):
        bitbake: bitbake-getvar: Add a quiet command line argument

  Pavel Zhukov (3):
        bitbake: fetch2: kill parameters in uri_find_decoded
        bitbake: fetch2/tests: Add test for Mercurial
        bitbake: fetch2/tests: Add parameter to recipe_uri

  Pawel Zalewski (1):
        classes/fs-uuid: Fix command output decoding issue

  Peter Kjellerstedt (2):
        librsvg: Only enable the Vala bindings if GObject Introspection is enabled
        cargo-update-recipe-crates.bbclass: Mark the update_crates task as nostamp

  Peter Marko (1):
        iproute2: separate routel and add python dependency

  Quentin Schulz (1):
        packagegroup-core-boot: make init-ifupdown package a recommendation

  Randy MacLeod (1):
        vim: upgrade 9.0.0947 -> 9.0.1211

  Richard Purdie (23):
        bitbake: server/process: Improve lockfile handling at exit
        pseudo: Update to pull in linux-libc-headers race fix
        pseudo: Switch back to the master branch
        insane: Improve patch warning/error handling
        poky: Set INIT_MANAGER by a separate variable
        bitbake: server/process: Fix lockfile contents check bug
        bitbake: cooker: Fix siggen recipe cache race issue
        bitbake: cache: Only write files if we have data
        bitbake: cooker: Fix parsing race around cache handling
        bitbake: data: Add support for new BB_HASH_CODEPARSER_VALS for cache optimisation
        bitbake: data_smart: Small optimisation to _findVar()
        native: Drop special variable handling
        bitbake.conf: Add BB_HASH_CODEPARSER_VALS
        pseudo: Update to include logic fix
        bitbake.conf: Add METADATA_REVISION to BB_HASH_CODEPARSER_VALS
        native: Implement BBCLASSEXTEND PACKAGES_DYNAMIC handling
        conf/sdk/x86-64: Set march specifically
        bitbake: cache/codeparser: Switch to a new BB_CACHEDIR variable for cache location
        oeqa/selftest/devtool: Fix for linux 6.1 versions onwards
        wic/efi-bootdisk.wks: Fix for 6.1 kernel versions
        kernel/linux-kernel-base: Fix kernel build artefact determinism issues
        build-appliance-image: Update to master head revision
        build-appliance: Fix merge error

  Ross Burton (12):
        python3-pyproject-hooks: add new recipe
        python3-build: add 0.10.0
        python_pep517: use python3-build, not picobuild
        python3-picobuild: remove
        cve-update-db-native: show IP on failure
        quilt: rewrite ptest glue
        quilt: fix intermittent failure in faildiff.test
        spirv-headers/spirv-tools: set correct branch name
        quilt: use upstreamed faildiff.test fix
        ppp: backport fix for CVE-2022-4603
        bitbake: bb/utils: include SSL certificate paths in export_proxies
        buildtools-tarball: set pkg-config search path

  Thomas Roos (1):
        devtool: fix devtool finish when gitmodules file is empty

  Tim Orling (3):
        bitbake: bitbake: fix deprecated threading.Thread.setDaemon
        python3-cryptography{-vectors}: 38.0.4 -> 39.0.0
        bitbake: toaster: update fixtures

  Tom Hochstein (1):
        gstreamer1.0-plugins-good: Fix libsoup runtime dependency

  Vincent Davis Jr (1):
        mesa: allow mesa (gbm) to compile without backend

  Wang Mingyu (20):
        btrfs-tools: upgrade 6.1 -> 6.1.2
        libpcap: upgrade 1.10.2 -> 1.10.3
        libwebp: upgrade 1.2.4 -> 1.3.0
        man-db: upgrade 2.11.1 -> 2.11.2
        dpkg: upgrade 1.21.17 -> 1.21.18
        ed: upgrade 1.18 -> 1.19
        gi-docgen: upgrade 2022.2 -> 2023.1
        python3-alabaster: upgrade 0.7.12 -> 0.7.13
        python3-setuptools: upgrade 65.6.3 -> 65.7.0
        patchelf: upgrade 0.17.0 -> 0.17.2
        python3-cython: upgrade 0.29.32 -> 0.29.33
        python3-dbusmock: upgrade 0.28.6 -> 0.28.7
        python3-hatchling: upgrade 1.12.1 -> 1.12.2
        python3-hypothesis: upgrade 6.61.0 -> 6.62.0
        python3-importlib-metadata: upgrade 5.2.0 -> 6.0.0
        python3-packaging: upgrade 22.0 -> 23.0
        python3-pbr: upgrade 5.11.0 -> 5.11.1
        python3-pygments: upgrade 2.13.0 -> 2.14.0
        stress-ng: upgrade 0.15.01 -> 0.15.02
        xz: upgrade 5.4.0 -> 5.4.1

  Xiangyu Chen (4):
        numactl: skip test case when target platform doesn't have 2 CPU node
        qemuboot.bbclass: add QB_NFSROOTFS_EXTRA_OPT for nfs rootfs extra option
        runqemu: add process of option QB_NFSROOTFS_EXTRA_OPT
        qemuppc64: set the qemuppc64 nfs r/wsize mount options to 524288

  Yoann Congal (2):
        bitbake: persist_data: Handle sqlite error when cachefile path is too long
        sanity: Fix small typos

meta-openembedded: cd13881611..2ab113e8be:
  Alejandro Enedino Hernandez Samaniego (1):
        weechat: Update 3.4.1 -> 3.8

  Alex Kiernan (4):
        dnsmasq: Merge .inc into .bb
        dnsmasq: Expand configuration options
        ntpsec: Upgrade 1.2.1 -> 1.2.2
        keyutils: Upgrade 1.6.1 -> 1.6.3

  Archana Polampalli (1):
        Nodejs: Upgrade to 18.12.1

  Bartosz Golaszewski (1):
        libgpiod: fix python bindings build

  Chee Yang Lee (5):
        opencv: fix reproducible builds
        xerces-c: upgrade to 3.2.4
        zsh: Fix CVE-2021-45444
        redis: Upgrade to 7.0.8
        redis: Upgrade to 6.2.9

  Dmitry Baryshkov (1):
        edid-decode: an utility to parse EDID information

  Etienne Cordonnier (1):
        uutils-coreutils: upgrade 0.0.16 -> 0.0.17

  Fabio Estevam (1):
        lvgl-demo-fb: Add recipe

  Gianfranco Costamagna (1):
        boinc-client: Update boinc from 7.20.4 to 7.20.5

  Hermes Zhang (1):
        kernel_add_regdb: Change the task order

  Jan Luebbe (3):
        pcsc-lite: fix native build
        pcsc-lite: fix homepage URL
        opensc: fix homepage URL

  Kai Kang (2):
        mozjs: fix compile error for arm
        crda: 3.18 -> 4.15

  Khem Raj (65):
        packagegroup-meta-oe: Remove boost-url from comments
        trace-cmd: Update to upstream submitted patches
        packagegroup-meta-oe: Update to reflect latest recipes
        freeglut: Add packageconfigs for x11/wayland/gles
        xdg-desktop-portal-wlr: Add wayland to REQUIRED_DISTRO_FEATURES
        ipmitool: Remove unneeded patch
        dibbler: Fix build with c++17 and newer std
        libtevent: Package cmocka tests into ptest package
        netkit-telnet: Drop using register storage class keyword
        libxml-libxml-perl: Fix function pointer types
        fatcat: Fix build with std=c++17
        ncmpc: Upgrade to 0.47
        python3-matplotlib: Upgrade to 3.6.3
        python3-matplotlib: Fix build with c++17
        python3-greenlet: Drop using register keyword
        libmodplug: Fix build with c++17
        xmlrpc-c: Upgrade to 1.54.06
        satyr: Fix build with musl
        p8platform: Fix build with c++17 clang
        freerdp: Fix incompatible function pointer type
        libtorrent: Update to tip of trunk
        gnuchess: Fix build with c++17
        ippool: Use unsigned int type for 1-bit integer bitfield
        audiofile: Stick to c++14 std
        ssiapi: Use c++14 standard
        log4cpp: Keep using std=c++14
        gengetopt: Use std=c++14
        libmimetic: Pin to using -std=c++14
        ace: Upgrade to 6.5.19
        pipewire-media-session: Use PW_ENABLE_DEPRECATED
        rtorrent: Update to latest tip of trunk
        nspr: Fix build with clang16
        net-snmp: Fix build with clang16
        xmlstarlet: Fix build with clang16
        libol: Drop recipe
        hplip: Update to 3.22.10
        espeak: Drop using 'register' keyword for storage classifier
        uw-imap: Fix build with clang 16
        xmlsec1: Include xmlsec/parser.h for xmlSecParserSetDefaultOptions()
        exiv2: Upgrade to 0.27.6
        packagegroup-meta-oe: Remove mongodb for upsupported arches
        rtorrent: Add missing dependency on autoconf-archive
        thrift: Fix c++ and system header include order problem
        libcereal: Use -idirafter instead of -isystem
        poppler: cmake: Do not use -isystem
        uftreace: Fix a build race
        sdbus-c++: Disable ccache
        libcamera: Fix build with gcc-13
        mariadb: Fix build with gcc-13
        vulkan-cts,opengl-es-cts: Fix build with gcc-13
        rocksdb: Fix build with gcc13
        rocksdb: Upgrade to 7.9.2
        redis-plus-plus: Upgrade to 1.3.7
        redis-plus-plus: Fix build with gcc13
        rdfind: Upgrade to 1.5.0 release
        rdfind: Fix build with gcc13
        libiodbc: Fix SRC_URI to not use gitlab archives
        opensaf: Fix build with gcc13
        crossguid: Fix build with gcc13
        dbus-cxx: Fix build with gcc13
        dbus-cxx: Upgrade to 2.3.1
        msktutil: Upgrade to 1.2.1
        hiredis: Enable SSL/TLS support by default
        redis-plus-plus: Enable SSL/TLS by default
        rocksdb: Fix build with clang compiler

  Lei Maohui (2):
        biodbc: Added a new recipe.
        trace-cmd: Fix QA Issue of do_package when enable multilib:

  Leon Anavi (14):
        python3-traitlets: Upgrade 5.8.0 -> 5.8.1
        python3-prettytable: Upgrade 3.4.1 -> 3.6.0
        python3-cantools: Upgrade 38.0.0 -> 38.0.1
        python3-imageio: Upgrade 2.23.0 -> 2.24.0
        python3-astroid: Upgrade 2.12.13 -> 2.13.2
        python3-alembic: Upgrade 1.9.1 -> 1.9.2
        python3-autobahn: Upgrade 22.12.1 -> 23.1.1
        python3-eventlet: Upgrade 0.33.2 -> 0.33.3
        python3-configobj: Upgrade 5.0.6 -> 5.0.8
        python3-nocaselist: Upgrade 1.0.6 -> 1.1.0
        python3-nocasedict: Upgrade 1.0.4 -> 1.1.0
        python3-email-validator: Upgrade 1.3.0 -> 1.3.1
        python3-imageio: Upgrade 2.24.0 -> 2.25.0
        python3-cachetools: Upgrade 5.2.1 -> 5.3.0

  Markus Volk (8):
        webp-pixbuf-loader: add recipe
        freerdp: build the rdp server
        nv-codec-headers: add recipe
        gnome-chess: import recipe
        gnome-shell: update 43.1 -> 43.2
        pipewire: update 0.3.63 -> 0.3.64
        cups-filters: build with dbus support
        cups-pk-helper: add recipe

  Martin Jansa (3):
        s-nail: fix Upstream-Status format
        smartmontools: fix Upstream-Status format
        htop: fix Upstream-Status format

  Niko Mauno (2):
        Fix missing leading whitespace with ':append'
        nftables: Fix missing leading whitespace with ':append'

  Peter Bašista (1):
        Make tvheadend recipe compatible with the latest tvheadend version

  Quentin Schulz (1):
        python3-reedsolo: Add recipe

  Randy MacLeod (2):
        librelp: update to 1.11.0
        rsyslog: update to 8.2212.0

  Richard Hughes (1):
        fwupd: Upgrade to 1.8.9

  Robert Yang (1):
        tftpy: Add it for python tftp server and client

  Ross Burton (3):
        khronos-cts: fix build when python3-build-native is present
        python3-pytest-forked: update for move from picobuild to build
        mbedtls: add option to use PSA for X.509/TLS operations

  Stefan Ghinea (1):
        mbedtls: upgrade to 2.28.2 to fix CVE-2022-46392, CVE-2022-46393

  Trevor Woerner (1):
        psqlodbc: fix HOMEPAGE

  Wang Mingyu (62):
        ctags: upgrade 6.0.20230101.0 -> 6.0.20230108.0
        flatbuffers: upgrade 22.12.06 -> 23.1.4
        libadwaita: upgrade 1.2.0 -> 1.2.1
        hwdata: upgrade 0.365 -> 0.366
        libmoo-perl: upgrade 2.005004 -> 2.005005
        evolution-data-server-native: upgrade 3.46.2 -> 3.46.3
        cli11: upgrade 2.3.1 -> 2.3.2
        imapfilter: upgrade 2.7.6 -> 2.8.1
        libcgi-perl: upgrade 4.54 -> 4.55
        hidapi: upgrade 0.12.0 -> 0.13.0
        python3-lazy-object-proxy: upgrade 1.8.0 -> 1.9.0
        xfsprogs: upgrade 6.0.0 -> 6.1.0
        tbb: upgrade 2021.7.0 -> 2021.8.0
        python3-networkx: upgrade 2.8.8 -> 3.0
        python3-sqlalchemy: upgrade 1.4.45 -> 1.4.46
        python3-aiohue: upgrade 4.5.0 -> 4.6.1
        python3-cachetools: upgrade 5.2.0 -> 5.2.1
        python3-google-api-python-client: upgrade 2.70.0 -> 2.71.0
        python3-flask-migrate: upgrade 4.0.0 -> 4.0.1
        python3-coverage: upgrade 7.0.3 -> 7.0.4
        python3-googleapis-common-protos: upgrade 1.57.0 -> 1.58.0
        python3-ipython: upgrade 8.7.0 -> 8.8.0
        python3-redis: upgrade 4.4.0 -> 4.4.1
        python3-robotframework: upgrade 6.0.1 -> 6.0.2
        python3-uefi-firmware: upgrade 1.9 -> 1.10
        python3-ujson: upgrade 5.6.0 -> 5.7.0
        python3-xlsxwriter: upgrade 3.0.5 -> 3.0.6
        xfsprogs: upgrade 6.1.0 -> 6.1.1
        xfstests: upgrade 2022.12.18 -> 2023.01.01
        eog: upgrade 43.1 -> 43.2
        gvfs: upgrade 1.50.2 -> 1.50.3
        libnma: upgrade 1.10.4 -> 1.10.6
        nautilus: upgrade 43.1 -> 43.2
        nbdkit: upgrade 1.33.4 -> 1.33.7
        networkmanager: upgrade 1.40.0 -> 1.40.10
        tcpdump: upgrade 4.99.2 -> 4.99.3
        unbound: upgrade 1.17.0 -> 1.17.1
        ctags: upgrade 6.0.20230108.0 -> 6.0.20230115.0
        dnfdragora: upgrade 2.1.3 -> 2.1.4
        gensio: upgrade 2.6.1 -> 2.6.2
        hidapi: upgrade 0.13.0 -> 0.13.1
        librelp: upgrade 1.10.0 -> 1.11.0
        libtraceevent: upgrade 1.7.0 -> 1.7.1
        libtracefs: upgrade 1.6.3 -> 1.6.4
        uftrace: upgrade 0.12 -> 0.13
        xterm: upgrade 377 -> 378
        python3-absl: upgrade 1.3.0 -> 1.4.0
        python3-coverage: upgrade 7.0.4 -> 7.0.5
        python3-dateparser: upgrade 1.1.5 -> 1.1.6
        python3-decouple: upgrade 3.6 -> 3.7
        python3-dnspython: upgrade 2.2.1 -> 2.3.0
        python3-flask-wtf: upgrade 1.0.1 -> 1.1.0
        python3-future: upgrade 0.18.2 -> 0.18.3
        python3-google-api-python-client: upgrade 2.71.0 -> 2.72.0
        python3-google-auth: upgrade 2.15.0 -> 2.16.0
        python3-mock: upgrade 5.0.0 -> 5.0.1
        python3-pymodbus: upgrade 3.0.2 -> 3.1.0
        python3-pyzmq: upgrade 24.0.1 -> 25.0.0
        python3-redis: upgrade 4.4.1 -> 4.4.2
        python3-sentry-sdk: upgrade 1.12.1 -> 1.13.0
        python3-txaio: upgrade 22.2.1 -> 23.1.1
        python3-xlsxwriter: upgrade 3.0.6 -> 3.0.7

  Yi Zhao (2):
        freeradius: upgrade 3.0.21 -> 3.0.26
        strongswan: upgrade 5.9.8 -> 5.9.9

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I625cfaa0bd5052cd72a121f010db3ecd2f274caf

2 files changed, 12 insertions, 34 deletions

diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch
deleted file mode 100644
index 947c764030..0000000000
--- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd/c54ae9c524998e449b822feb465a0c90317cd735.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c54ae9c524998e449b822feb465a0c90317cd735 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 20 Sep 2022 15:10:26 +0100
-Subject: [PATCH] trivial: Fix compile when using python 3.7 or older
-
-Upstream-Status: Backport [https://github.com/fwupd/fwupd/pull/5051]
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
- contrib/generate-gresource-xml.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/contrib/generate-gresource-xml.py b/contrib/generate-gresource-xml.py
-index 235a770020..569c804937 100755
---- a/contrib/generate-gresource-xml.py
-+++ b/contrib/generate-gresource-xml.py
-@@ -23,6 +23,9 @@
-         n_file.set("preprocess", "xml-stripblanks")
-     n_file.set("alias", os.path.basename(fn))
- with open(sys.argv[1], "wb") as f:
--    f.write(ET.tostring(root, "utf-8", xml_declaration=True))
-+    try:
-+        f.write(ET.tostring(root, "utf-8", xml_declaration=True))
-+    except TypeError:
-+        f.write(ET.tostring(root, "utf-8"))
- 
- sys.exit(0)
diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb
index 99077923dc..0f889ca8fc 100644
--- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.4.bb
+++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb
@@ -5,9 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native"
 
 SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
-           file://c54ae9c524998e449b822feb465a0c90317cd735.patch \
            file://run-ptest"
-SRC_URI[sha256sum] = "adfa07434cdc29ec41c40fef460e8d970963fe0c7e849dec7f3932adb161f886"
+SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a"
 
 UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
 
@@ -18,7 +17,7 @@ inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-do
 
 GIDOCGEN_MESON_OPTION = 'docs'
 GIDOCGEN_MESON_ENABLE_FLAG = 'docgen'
-GIDOCGEN_MESON_DISABLE_FLAG = 'none'
+GIDOCGEN_MESON_DISABLE_FLAG = 'disabled'
 
 PACKAGECONFIG ??= "curl gnutls gudev gusb \
                    ${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \
@@ -26,23 +25,25 @@ PACKAGECONFIG ??= "curl gnutls gudev gusb \
                    ${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \
                    ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \
                    hsi \
+                   plugin_android_boot \
                    plugin_acpi_phat \
-                   plugin_amt \
                    plugin_bcm57xx \
                    plugin_emmc \
                    plugin_ep963x \
                    plugin_fastboot \
                    plugin_flashrom \
                    plugin_gpio \
+                   plugin_igsc \
+                   plugin_intel_me \
                    plugin_intel_spi \
                    plugin_logitech_bulkcontroller \
+                   plugin_logitech_scribe \
                    plugin_modem_manager \
                    plugin_msr \
                    plugin_nitrokey \
                    plugin_nvme \
                    plugin_parade_lspcon \
                    plugin_pixart_rf \
-                   plugin_platform_integrity \
                    plugin_realtek_mst \
                    plugin_redfish \
                    plugin_synaptics_mst \
@@ -74,7 +75,7 @@ PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,gcab-native"
 
 # TODO plugins-all meta-option that expands to all plugin_*?
 PACKAGECONFIG[plugin_acpi_phat] = "-Dplugin_acpi_phat=true,-Dplugin_acpi_phat=false"
-PACKAGECONFIG[plugin_amt] = "-Dplugin_amt=true,-Dplugin_amt=false"
+PACKAGECONFIG[plugin_android_boot] = "-Dplugin_android_boot=enabled,-Dplugin_android_boot=disabled"
 PACKAGECONFIG[plugin_bcm57xx] = "-Dplugin_bcm57xx=true,-Dplugin_bcm57xx=false"
 PACKAGECONFIG[plugin_cfu] = "-Dplugin_cfu=true,-Dplugin_cfu=false"
 PACKAGECONFIG[plugin_dell] = "-Dplugin_dell=true,-Dplugin_dell=false,libsmbios"
@@ -84,15 +85,17 @@ PACKAGECONFIG[plugin_ep963x] = "-Dplugin_ep963x=true,-Dplugin_ep963x=false"
 PACKAGECONFIG[plugin_fastboot] = "-Dplugin_fastboot=true,-Dplugin_fastboot=false"
 PACKAGECONFIG[plugin_flashrom] = "-Dplugin_flashrom=true,-Dplugin_flashrom=false,flashrom"
 PACKAGECONFIG[plugin_gpio] = "-Dplugin_gpio=true,-Dplugin_gpio=false"
+PACKAGECONFIG[plugin_igsc] = "-Dplugin_igsc=enabled,-Dplugin_igsc=disabled"
+PACKAGECONFIG[plugin_intel_me] = "-Dplugin_intel_me=enabled,-Dplugin_intel_me=disabled"
 PACKAGECONFIG[plugin_intel_spi] = "-Dplugin_intel_spi=true -Dlzma=true,-Dplugin_intel_spi=false -Dlzma=false,xz"
 PACKAGECONFIG[plugin_logitech_bulkcontroller] = "-Dplugin_logitech_bulkcontroller=true,-Dplugin_logitech_bulkcontroller=false,protobuf-c-native protobuf-c"
+PACKAGECONFIG[plugin_logitech_scribe] = "-Dplugin_logitech_scribe=enabled,-Dplugin_logitech_scribe=disabled"
 PACKAGECONFIG[plugin_modem_manager] = "-Dplugin_modem_manager=true,-Dplugin_modem_manager=false,libqmi modemmanager"
 PACKAGECONFIG[plugin_msr] = "-Dplugin_msr=true,-Dplugin_msr=false,cpuid"
 PACKAGECONFIG[plugin_nitrokey] = "-Dplugin_nitrokey=true,-Dplugin_nitrokey=false"
 PACKAGECONFIG[plugin_nvme] = "-Dplugin_nvme=true,-Dplugin_nvme=false"
 PACKAGECONFIG[plugin_parade_lspcon] = "-Dplugin_parade_lspcon=true,-Dplugin_parade_lspcon=false"
 PACKAGECONFIG[plugin_pixart_rf] = "-Dplugin_pixart_rf=true,-Dplugin_pixart_rf=false"
-PACKAGECONFIG[plugin_platform_integrity] = "-Dplugin_platform_integrity=true,-Dplugin_platform_integrity=false"
 PACKAGECONFIG[plugin_powerd] = "-Dplugin_powerd=true,-Dplugin_powerd=false"
 PACKAGECONFIG[plugin_realtek_mst] = "-Dplugin_realtek_mst=true,-Dplugin_realtek_mst=false"
 PACKAGECONFIG[plugin_redfish] = "-Dplugin_redfish=true,-Dplugin_redfish=false"
@@ -107,12 +110,13 @@ PACKAGECONFIG[plugin_uf2] = "-Dplugin_uf2=true,-Dplugin_uf2=false"
 PACKAGECONFIG[plugin_upower] = "-Dplugin_upower=true,-Dplugin_upower=false"
 
 # Always disable these plugins on non-x86 platforms as they don't compile or are useless
-DISABLE_NON_X86 = "plugin_amt plugin_intel_spi plugin_msr"
+DISABLE_NON_X86 = "plugin_intel_me plugin_intel_spi plugin_msr"
 DISABLE_NON_X86:x86 = ""
 DISABLE_NON_X86:x86-64 = ""
 PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
 
 FILES:${PN} += "${libdir}/fwupd-plugins-* \
+                ${libdir}/fwupd-${PV} \
                 ${systemd_unitdir} \
                 ${datadir}/fish \
                 ${datadir}/metainfo \