subtree updates

poky: 29afbb5e14..aa6cd06a9f:
  Alejandro Hernandez Samaniego (1):
        testimage: Fix error message to reflect new syntax

  Alex Kiernan (2):
        rust: Upgrade 1.66.1 -> 1.67.0
        rust: Add `update_snapshot` task to generate `rust-snapshot.inc`

  Alexander Kanavin (49):
        oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal
        ifupdown: update 0.8.39 -> 0.8.41
        python3-pip: update 22.3.1 -> 23.0
        diffutils: update 3.8 -> 3.9
        mc: update 4.8.28 -> 4.8.29
        xf86-video-vmware: update 13.3.0 -> 13.4.0
        lttng-tools: update 2.13.8 -> 2.13.9
        rt-tests: update 2.4 -> 2.5
        apr: update 1.7.0 -> 1.7.2
        apr-util: update 1.6.1 -> 1.6.3
        glib-2.0: upgrade 2.74.4 -> 2.74.5
        systemd: update 252.4 -> 252.5
        cmake: upgrade 3.25.1 -> 3.25.2
        python3-setuptools: update 65.7.0 -> 67.2.0
        lighttpd: upgrade 1.4.67 -> 1.4.68
        lsof: upgrade 4.96.5 -> 4.98.0
        igt-gpu-tools: upgrade 1.26 -> 1.27.1
        vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0
        vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0
        glslang: upgrade 1.3.236.0 -> 1.3.239.0
        spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0
        libxpm: upgrade 3.5.14 -> 3.5.15
        rng-tools: upgrade 6.15 -> 6.16
        fontconfig: upgrade 2.14.1 -> 2.14.2
        ncurses: upgrade 6.3+20220423 -> 6.4
        mpg123: upgrade 1.31.1 -> 1.31.2
        python3-pycryptodomex: upgrade 3.16.0 -> 3.17
        bind: upgrade 9.18.10 -> 9.18.11
        libjpeg-turbo: upgrade 2.1.4 -> 2.1.5
        pkgconf: upgrade 1.9.3 -> 1.9.4
        python3-pycryptodome: upgrade 3.16.0 -> 3.17
        python3-dtschema: upgrade 2022.12 -> 2023.1
        llvm: upgrade 15.0.6 -> 15.0.7
        puzzles: upgrade to latest revision
        dpkg: upgrade 1.21.18 -> 1.21.19
        shaderc: upgrade 2022.4 -> 2023.2
        sysstat: upgrade 12.6.1 -> 12.6.2
        piglit: upgrade to latest revision
        ltp: upgrade 20220930 -> 20230127
        linux-firmware: upgrade 20221214 -> 20230117
        libinput: upgrade 1.22.0 -> 1.22.1
        sudo: upgrade 1.9.12p1 -> 1.9.12p2
        diffoscope: upgrade 230 -> 234
        texinfo: upgrade 7.0.1 -> 7.0.2
        stress-ng: upgrade 0.15.02 -> 0.15.03
        libgit2: upgrade 1.5.0 -> 1.5.1
        python3-pathspec: upgrade 0.10.3 -> 0.11.0

  Andrej Valek (1):
        busybox: 1.35.0 -> 1.36.0

  Arnout Vandecappelle (1):
        python3-pytest: Remove dependency on python3-toml

  Bruce Ashfield (5):
        linux-yocto/6.1: update to v6.1.7
        linux-yocto/5.15: update to v5.15.89
        linux-yocto/6.1: cfg: remove depreciated configs
        linux-yocto/6.1: update to v6.1.9
        linux-yocto/5.15: update to v5.15.91

  Changqing Li (1):
        apt: fix do_package_qa failure

  Chen Qi (1):
        ffmpeg: fix configure failure on noexec /tmp host

  Etienne Cordonnier (1):
        bitbake: siggen: Fix inefficient string concatenation

  George Kelly (1):
        bitbake: fetch2: Add NODE_EXTRA_CA_CERTS to export list

  Harald Seiler (1):
        bootchart2: Fix usrmerge support

  Jan Luebbe (1):
        systemd: add PACKAGECONFIG for pstore

  Khem Raj (6):
        busybox: Make provisions to disable sha256/sha1 accelaration on x86
        nghttp2: Disable python bindings
        scons: Pass MAXLINELENGTH to scons invocation
        scons.bbclass: Make MAXLINELENGTH overridable
        glibc: Upgrade to 2.37 release
        lttng-tools: Update LFS64 patch with upstream feedback

  Louis Rannou (1):
        oeqa/selftest/locales: Add selftest for locale generation/presence

  Markus Volk (3):
        libtiff: add PACKAGECONFIG for libdeflate and zstd
        mesa: add PACKAGECONFIG for video-codecs
        ell: update 0.55 -> 0.56

  Martin Jansa (2):
        meta: remove True option to getVar and getVarFlag calls (again)
        xinetd: move xconv.pl script to separate package

  Mauro Queiros (1):
        image.bbclass: print all QA functions exceptions

  Michael Halstead (1):
        uninative: Upgrade to 3.9 to include glibc 2.37

  Michael Opdenacker (1):
        bitbake: bitbake-user-manual: show how use BB_LOGCONFIG to log warnings

  Mikko Rapeli (1):
        oeqa context.py: fix --target-ip comment to include ssh port number

  Mingli Yu (1):
        glslang: branch rename master -> main

  Pavel Zhukov (1):
        bitbake.conf: Add mercurial to HOSTTOOLS_NONFATAL

  Pedro Baptista (2):
        bitbake: bblayers/query: Replace layer directory name with layer name for show-layers
        bitbake: bblayers/query: Adjust show-layers output layout

  Peter Kjellerstedt (1):
        poky.conf: Switch to post release name/version

  Ravineet Singh (1):
        gnutls: add ptest support

  Richard Purdie (6):
        python3-markupsafe: upgrade 2.1.1 -> 2.1.2
        perf: Fix 6.1 kernel reproducibility issue
        perf: Enable debug/source packaging
        libc-locale: Fix on target locale generation
        oeqa/selftest/locales: Add test for disabled binary locale generation
        valgrind: Workaround glibc upgrade

  Ross Burton (5):
        git: upgrade to 2.39.1
        git: ignore CVE-2022-41953
        sdkext/cases/devtool: pass a logger to HTTPService
        oeqa/utils/httpserver: connect up the request logging
        httpserver: add error handler that write to the logger

  Tim Orling (14):
        libtest-needs-perl: upgrade 0.002009 -> 0.002010
        python3-pytest: upgrade 7.2.0 -> 7.2.1
        python3-hypothesis: upgrade 6.62.0 -> 6.66.0
        python3-poetry-core: upgrade 1.4.0 -> 1.5.0
        python3-iniconfig: upgrade 1.1.1 -> 2.0.0
        python3-pytz: upgrade 2022.7 -> 2022.7.1
        python3-zipp: upgrade 3.11.0 -> 3.12.0
        python3-requests: upgrade 2.28.1 -> 2.28.2
        python3-sphinxcontrib-applehelp: 1.0.3 -> 1.0.4
        python3-sphinxcontrib-htmlhelp: 2.0.0 -> 2.0.1
        python3-pyopenssl: upgrade 22.1.0 -> 23.0.0
        python3-wcwidth: upgrade 0.2.5 -> 0.2.6
        python3-urllib3: upgrade 1.26.13 -> 1.26.14
        python3-sphinx: upgrade 6.0.0 -> 6.1.3

  Tobias Hagelborn (1):
        sstate.bbclass: Fetch non-existing local .sig files if needed

  Ulrich Ölmann (3):
        recipe_sanity: fix old override syntax
        lsof: fix old override syntax
        update-alternatives: fix typos

  Vivek Kumbhar (1):
        openssl: fix CVE-2022-3996 double locking leads to denial of service

  Wang Mingyu (2):
        btrfs-tools: upgrade 6.1.2 -> 6.1.3
        msmtp: upgrade 1.8.22 -> 1.8.23

  Xiaotian Wu (5):
        base: add support for loongarch64
        linux: add loongarch64 support
        binutils: disable gold on loongarch64
        loongarch: disable seccomp from default feature
        uboot: add a loongarch64 entry

meta-security: 7eed4a60f5..3529cfb43e:
  Mikko Rapeli (1):
        linux-yocto: drop version from bbappends

meta-raspberrypi: 6c57b92708..e43af1e3a6:
  Allan Xavier (2):
        linux-raspberrypi: Build eeprom access into kernel
        rpi-eeprom: Add recipe for eeprom update/configuration

  Khem Raj (3):
        linux-raspberrypi: Update to 5.15.90
        linux-raspberrypi: Fix build with gcc13
        linux-raspberrypi: Remove unused patches

  Martin Jansa (1):
        raspidmx, userland, omxplayer: Fix Upstream-Status formatting

meta-arm: aecbb77f72..dc10b73cc5:
  Jon Mason (1):
        arm/linux-yocto: avoid kernel defconfig warning

  Khem Raj (2):
        gator-daemon: Fix build with gcc13
        sbsa: Fix build with gcc13

  Ross Burton (2):
        arm-bsp/corstone*00: disable openssl in kmod
        CI: pin to kas 3.2 as 3.2.1 fails

  Rui Miguel Silva (6):
        meta-arm: add build to gitignore
        kas/corstone1000: move from langdale to master
        arm-bsp/corstone500: bump u-boot version to 2023.01
        arm-bsp/corstone1000: bump u-boot version to 2023.01
        arm-bsp: corstone500: bump kernel version to 6.1
        arm-bsp/corstone1000: bump kernel version to v6.1

meta-openembedded: ea63f13846..cba6df61c7:
  Alex Kiernan (2):
        mdns: Upgrade 1790.60.25 -> 1790.80.10
        dnsmasq: Upgrade 2.88 -> 2.89

  Chen Qi (1):
        syslog-ng: workaround segfault for ppc64le

  Christian Hohnstaedt (1):
        libb64: reactivate BUFFERSIZE patch

  David Bagonyi (1):
        concurrencykit: Make patch compatible with Bourne shell

  Geoff Parker (1):
        python3-pillow: add tk to RDEPENDS ptest pkg only if x11 in DISTRO_FEATURES

  Jan Luebbe (4):
        softhsm: avoid unnecessary check for native sqlite binary
        softhsm: enable objectstore backend
        extract-cert: add recipe
        opensc: fix private key import

  Kai Kang (1):
        crda: remove recipe

  Khem Raj (39):
        rwmem: Update to latest
        pipewire: Split dymanic modules to target recipe alone
        upm: Fix build with gcc13
        openthread: Use __attribute__ ((unused)) instead of removing 't'
        wireshark: Add nghttp2 packageconfig
        rdma-core: Inherit python3targetconfig
        wireshark: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        hplip: Inherit python3targetconfig
        dante: Add -P to preprocessor flags
        breakpad: Fix build with gcc13
        mongodb: Fix build with gcc13
        mongodb: Upgrade to 4.4.18
        mongodb: Pass MAXLINELENGTH to scons invocation
        perfetto: Disable ccache
        nodejs: Fix build with gcc13
        zeromq: Fix build with gcc13
        python3-greenlet: Fix build with gcc13
        perfetto: Upgrade to 31.0 release
        perfetto: Fix build with gcc13
        ntopng: Add hiredis to depends
        python3-grpcio: Fix build with gcc13
        tesseract: Fix build with gcc13
        lcdproc: Update to latest tip of trunk
        mongodb: Use bfd linker for x86/musl with gcc
        gegl: Depend on openmp when using clang
        pipewire: Do not split modules using PACKAGES_DYNAMIC for native case
        sysdig: Fix build with gcc13
        zfs: Update to 2.1.9
        python3-isort: Upgrade to isort 5.12.0
        minicoredumper: Upgrade to 2.0.2 release
        perfetto: Add missing dependencies.
        vulkan-cts: Rename patch to avoid problems on case insensitive filesytems
        python3-greenlet: Upgrade to 2.0.2
        cups-filters: Fix build with clang16/c++17
        cups-filters: Upgrade to 1.28.17 release
        ltrace: Fix build with clang16
        oprofile: Do not use std::bind2nd
        perfetto: Fix build on musl again

  Markus Volk (7):
        python3-pycups: add recipe
        blueman: add missing runtime dependency, add polkit rule
        system-config-printer: add recipe
        rtkit: add recipe
        xdg-desktop-portal: add runtime dependency on rtkit
        pipewire: update 0.3.64 -> 0.3.65
        xfdesktop: update 4.18.0 -> 4.18.1

  Martin Jansa (3):
        hunspell: move ispellaff2myspell script to separate package
        meta: remove True option to getVar calls (again)
        mctp: fix overrides syntax in SYSTEMD_AUTO_ENABLE:${PN}

  Randy MacLeod (1):
        python3-pillow: add ptest support

  Simone Weiss (1):
        minicoredumper: Add ptest

  Ulrich Ölmann (2):
        initramfs-{debug,kexecboot}-image: fix override syntax in comment
        kexecboot: update homepage

  Wang Mingyu (5):
        byacc: upgrade 20221229 -> 20230201
        ccid: upgrade 1.5.1 -> 1.5.2
        cglm: upgrade 0.8.7 -> 0.8.9
        cmark: upgrade 0.30.2 -> 0.30.3
        apache2: upgrade 2.4.54 -> 2.4.55

  Yi Zhao (2):
        samba: upgrade 4.17.4 -> 4.17.5
        frr: upgrade 8.4.1 -> 8.4.2

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Idbe7ba3bb68f0858849f8abf80cc488f94920dda
diff --git a/poky/meta/recipes-devtools/rust/rust_1.67.0.bb b/poky/meta/recipes-devtools/rust/rust_1.67.0.bb
new file mode 100644
index 0000000..2118fae
--- /dev/null
+++ b/poky/meta/recipes-devtools/rust/rust_1.67.0.bb
@@ -0,0 +1,357 @@
+SUMMARY = "Rust compiler and runtime libaries"
+HOMEPAGE = "http://www.rust-lang.org"
+SECTION = "devel"
+LICENSE = "(MIT | Apache-2.0) & Unicode-TOU"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=c2cccf560306876da3913d79062a54b9"
+
+inherit rust
+inherit cargo_common
+
+DEPENDS += "file-native python3-native"
+DEPENDS:append:class-native = " rust-llvm-native"
+DEPENDS:append:class-nativesdk = " nativesdk-rust-llvm"
+
+DEPENDS += "rust-llvm (=${PV})"
+
+# Otherwise we'll depend on what we provide
+INHIBIT_DEFAULT_RUST_DEPS:class-native = "1"
+# We don't need to depend on gcc-native because yocto assumes it exists
+PROVIDES:class-native = "virtual/${TARGET_PREFIX}rust"
+
+S = "${RUSTSRC}"
+
+# Use at your own risk, accepted values are stable, beta and nightly
+RUST_CHANNEL ?= "stable"
+PV .= "${@bb.utils.contains('RUST_CHANNEL', 'stable', '', '-${RUST_CHANNEL}', d)}"
+
+export FORCE_CRATE_HASH="${BB_TASKHASH}"
+
+RUST_ALTERNATE_EXE_PATH ?= "${STAGING_LIBDIR}/llvm-rust/bin/llvm-config"
+RUST_ALTERNATE_EXE_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/llvm-rust/bin/llvm-config"
+
+# We don't want to use bitbakes vendoring because the rust sources do their
+# own vendoring.
+CARGO_DISABLE_BITBAKE_VENDORING = "1"
+
+# We can't use RUST_BUILD_SYS here because that may be "musl" if
+# TCLIBC="musl". Snapshots are always -unknown-linux-gnu
+setup_cargo_environment () {
+    # The first step is to build bootstrap and some early stage tools,
+    # these are build for the same target as the snapshot, e.g.
+    # x86_64-unknown-linux-gnu.
+    # Later stages are build for the native target (i.e. target.x86_64-linux)
+    cargo_common_do_configure
+}
+
+inherit rust-target-config
+
+do_rust_setup_snapshot () {
+    for installer in "${WORKDIR}/rust-snapshot-components/"*"/install.sh"; do
+        "${installer}" --prefix="${WORKDIR}/rust-snapshot" --disable-ldconfig
+    done
+
+    # Some versions of rust (e.g. 1.18.0) tries to find cargo in stage0/bin/cargo
+    # and fail without it there.
+    mkdir -p ${RUSTSRC}/build/${BUILD_SYS}
+    ln -sf ${WORKDIR}/rust-snapshot/ ${RUSTSRC}/build/${BUILD_SYS}/stage0
+
+    # Need to use uninative's loader if enabled/present since the library paths
+    # are used internally by rust and result in symbol mismatches if we don't
+    if [ ! -z "${UNINATIVE_LOADER}" -a -e "${UNINATIVE_LOADER}" ]; then
+        for bin in cargo rustc rustdoc; do
+            patchelf-uninative ${WORKDIR}/rust-snapshot/bin/$bin --set-interpreter ${UNINATIVE_LOADER}
+        done
+    fi
+}
+addtask rust_setup_snapshot after do_unpack before do_configure
+do_rust_setup_snapshot[dirs] += "${WORKDIR}/rust-snapshot"
+do_rust_setup_snapshot[vardepsexclude] += "UNINATIVE_LOADER"
+
+python do_configure() {
+    import json
+    try:
+        import configparser
+    except ImportError:
+        import ConfigParser as configparser
+
+    # toml is rather similar to standard ini like format except it likes values
+    # that look more JSON like. So for our purposes simply escaping all values
+    # as JSON seem to work fine.
+
+    e = lambda s: json.dumps(s)
+
+    config = configparser.RawConfigParser()
+
+    # [target.ARCH-poky-linux]
+    host_section = "target.{}".format(d.getVar('RUST_HOST_SYS'))
+    config.add_section(host_section)
+
+    llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}")
+    llvm_config_build = d.expand("${RUST_ALTERNATE_EXE_PATH_NATIVE}")
+    config.set(host_section, "llvm-config", e(llvm_config_target))
+
+    config.set(host_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))
+    config.set(host_section, "cc", e(d.expand("${RUST_TARGET_CC}")))
+    config.set(host_section, "linker", e(d.expand("${RUST_TARGET_CCLD}")))
+    if "musl" in host_section:
+        config.set(host_section, "musl-root", e(d.expand("${STAGING_DIR_HOST}${exec_prefix}")))
+
+    # If we don't do this rust-native will compile it's own llvm for BUILD.
+    # [target.${BUILD_ARCH}-unknown-linux-gnu]
+    build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS'))
+    if build_section != host_section:
+        config.add_section(build_section)
+
+        config.set(build_section, "llvm-config", e(llvm_config_build))
+
+        config.set(build_section, "cxx", e(d.expand("${RUST_BUILD_CXX}")))
+        config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}")))
+        config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}")))
+
+    target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS'))
+    if target_section != host_section and target_section != build_section:
+        config.add_section(target_section)
+
+        config.set(target_section, "llvm-config", e(llvm_config_target))
+
+        config.set(target_section, "cxx", e(d.expand("${RUST_TARGET_CXX}")))
+        config.set(target_section, "cc", e(d.expand("${RUST_TARGET_CC}")))
+        config.set(target_section, "linker", e(d.expand("${RUST_TARGET_CCLD}")))
+
+    # [llvm]
+    config.add_section("llvm")
+    config.set("llvm", "static-libstdcpp", e(False))
+    if "llvm" in (d.getVar('TC_CXX_RUNTIME') or ""):
+        config.set("llvm", "use-libcxx", e(True))
+
+    # [rust]
+    config.add_section("rust")
+    config.set("rust", "rpath", e(True))
+    config.set("rust", "channel", e(d.expand("${RUST_CHANNEL}")))
+
+    # Whether or not to optimize the compiler and standard library
+    config.set("rust", "optimize", e(True))
+
+    # Emits extraneous output from tests to ensure that failures of the test
+    # harness are debuggable just from logfiles
+    config.set("rust", "verbose-tests", e(True))
+
+    # [build]
+    config.add_section("build")
+    config.set("build", "submodules", e(False))
+    config.set("build", "docs", e(False))
+
+    rustc = d.expand("${WORKDIR}/rust-snapshot/bin/rustc")
+    config.set("build", "rustc", e(rustc))
+
+    # Support for the profiler runtime to generate e.g. coverage report,
+    # PGO etc.
+    config.set("build", "profiler", e(True))
+
+    cargo = d.expand("${WORKDIR}/rust-snapshot/bin/cargo")
+    config.set("build", "cargo", e(cargo))
+
+    config.set("build", "vendor", e(True))
+
+    if not "targets" in locals():
+        targets = [d.getVar("RUST_TARGET_SYS")]
+    config.set("build", "target", e(targets))
+
+    if not "hosts" in locals():
+        hosts = [d.getVar("RUST_HOST_SYS")]
+    config.set("build", "host", e(hosts))
+
+    # We can't use BUILD_SYS since that is something the rust snapshot knows
+    # nothing about when trying to build some stage0 tools (like fabricate)
+    config.set("build", "build", e(d.getVar("RUST_BUILD_SYS")))
+
+    # [install]
+    config.add_section("install")
+    # ./x.py install doesn't have any notion of "destdir"
+    # but we can prepend ${D} to all the directories instead
+    config.set("install", "prefix",  e(d.getVar("D") + d.getVar("prefix")))
+    config.set("install", "bindir",  e(d.getVar("D") + d.getVar("bindir")))
+    config.set("install", "libdir",  e(d.getVar("D") + d.getVar("libdir")))
+    config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir")))
+    config.set("install", "mandir",  e(d.getVar("D") + d.getVar("mandir")))
+
+    with open("config.toml", "w") as f:
+        f.write('changelog-seen = 2\n\n')
+        config.write(f)
+
+    # set up ${WORKDIR}/cargo_home
+    bb.build.exec_func("setup_cargo_environment", d)
+}
+
+rust_runx () {
+    echo "COMPILE ${PN}" "$@"
+
+    # CFLAGS, LDFLAGS, CXXFLAGS, CPPFLAGS are used by rust's build for a
+    # wide range of targets (not just TARGET). Yocto's settings for them will
+    # be inappropriate, avoid using.
+    unset CFLAGS
+    unset LDFLAGS
+    unset CXXFLAGS
+    unset CPPFLAGS
+
+    export RUSTFLAGS="${RUST_DEBUG_REMAP}"
+
+    # Copy the natively built llvm-config into the target so we can run it. Horrible,
+    # but works!
+    if [ ${RUST_ALTERNATE_EXE_PATH_NATIVE} != ${RUST_ALTERNATE_EXE_PATH} ]; then
+        mkdir -p `dirname ${RUST_ALTERNATE_EXE_PATH}`
+        cp ${RUST_ALTERNATE_EXE_PATH_NATIVE} ${RUST_ALTERNATE_EXE_PATH}
+        chrpath -d ${RUST_ALTERNATE_EXE_PATH}
+    fi
+
+    oe_cargo_fix_env
+
+    python3 src/bootstrap/bootstrap.py ${@oe.utils.parallel_make_argument(d, '-j %d')} "$@" --verbose
+}
+rust_runx[vardepsexclude] += "PARALLEL_MAKE"
+
+require rust-source.inc
+require rust-snapshot.inc
+
+INSANE_SKIP:${PN}:class-native = "already-stripped"
+FILES:${PN} += "${libdir}/rustlib"
+FILES:${PN} += "${libdir}/*.so"
+FILES:${PN}-dev = ""
+
+do_compile () {
+    rust_runx build --stage 2
+}
+
+do_compile:append:class-target () {
+    rust_runx build --stage 2 src/tools/clippy
+    rust_runx build --stage 2 src/tools/rustfmt
+}
+
+do_compile:append:class-nativesdk () {
+    rust_runx build --stage 2 src/tools/clippy
+    rust_runx build --stage 2 src/tools/rustfmt
+}
+
+ALLOW_EMPTY:${PN} = "1"
+
+PACKAGES =+ "${PN}-tools-clippy ${PN}-tools-rustfmt"
+FILES:${PN}-tools-clippy = "${bindir}/cargo-clippy ${bindir}/clippy-driver"
+FILES:${PN}-tools-rustfmt = "${bindir}/rustfmt"
+RDEPENDS:${PN}-tools-clippy = "${PN}"
+RDEPENDS:${PN}-tools-rustfmt = "${PN}"
+
+SUMMARY:${PN}-tools-clippy = "A collection of lints to catch common mistakes and improve your Rust code"
+SUMMARY:${PN}-tools-rustfmt = "A tool for formatting Rust code according to style guidelines"
+
+do_install () {
+    rust_do_install
+}
+
+rust_do_install() {
+    rust_runx install
+}
+
+rust_do_install:class-nativesdk() {
+    export PSEUDO_UNLOAD=1
+    rust_runx install
+    unset PSEUDO_UNLOAD
+
+    install -d ${D}${bindir}
+    for i in cargo-clippy clippy-driver rustfmt; do
+        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+    done
+
+    chown root:root ${D}/ -R
+    rm ${D}${libdir}/rustlib/uninstall.sh
+    rm ${D}${libdir}/rustlib/install.log
+    rm ${D}${libdir}/rustlib/manifest*
+}
+
+EXTRA_TOOLS ?= "cargo-clippy clippy-driver rustfmt"
+rust_do_install:class-target() {
+    export PSEUDO_UNLOAD=1
+    rust_runx install
+    unset PSEUDO_UNLOAD
+
+    install -d ${D}${bindir}
+    for i in ${EXTRA_TOOLS}; do
+        cp build/${RUST_BUILD_SYS}/stage2-tools/${RUST_HOST_SYS}/release/$i ${D}${bindir}
+        chrpath -r "\$ORIGIN/../lib" ${D}${bindir}/$i
+    done
+
+    install -d ${D}${libdir}/rustlib/${RUST_HOST_SYS}
+    install -m 0644 ${WORKDIR}/rust-targets/${RUST_HOST_SYS}.json ${D}${libdir}/rustlib/${RUST_HOST_SYS}/target.json
+
+    chown root:root ${D}/ -R
+    rm ${D}${libdir}/rustlib/uninstall.sh
+    rm ${D}${libdir}/rustlib/install.log
+    rm ${D}${libdir}/rustlib/manifest*
+}
+
+addtask do_update_snapshot after do_patch
+do_update_snapshot[nostamp] = "1"
+
+# Run with `bitbake -c update_snapshot rust` to update `rust-snapshot.inc`
+# with the checksums for the rust snapshot associated with this rustc-src
+# tarball.
+python do_update_snapshot() {
+    import json
+    import re
+    import sys
+
+    from collections import defaultdict
+
+    with open(os.path.join(d.getVar("S"), "src", "stage0.json")) as f:
+        j = json.load(f)
+
+    config_dist_server = j['config']['dist_server']
+    compiler_date = j['compiler']['date']
+    compiler_version = j['compiler']['version']
+
+    src_uri = defaultdict(list)
+    for k, v in j['checksums_sha256'].items():
+        m = re.search(f"dist/{compiler_date}/(?P<component>.*)-{compiler_version}-(?P<arch>.*)-unknown-linux-gnu\\.tar\\.xz", k)
+        if m:
+            component = m.group('component')
+            arch = m.group('arch')
+            src_uri[arch].append(f"SRC_URI[{component}-snapshot-{arch}.sha256sum] = \"{v}\"")
+
+    snapshot = """\
+## This is information on the rust-snapshot (binary) used to build our current release.
+## snapshot info is taken from rust/src/stage0.json
+## Rust is self-hosting and bootstraps itself with a pre-built previous version of itself.
+## The exact (previous) version that has been used is specified in the source tarball.
+## The version is replicated here.
+
+SNAPSHOT_VERSION = "%s"
+
+""" % compiler_version
+
+    for arch, components in src_uri.items():
+        snapshot += "\n".join(components) + "\n\n"
+
+    snapshot += """\
+SRC_URI += " \\
+    ${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\
+    ${RUST_DIST_SERVER}/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\
+    ${RUST_DIST_SERVER}/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \\
+"
+
+RUST_DIST_SERVER = "%s"
+
+RUST_STD_SNAPSHOT = "rust-std-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+RUSTC_SNAPSHOT = "rustc-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+CARGO_SNAPSHOT = "cargo-${SNAPSHOT_VERSION}-${RUST_BUILD_ARCH}-unknown-linux-gnu"
+""" % config_dist_server
+
+    with open(os.path.join(d.getVar("THISDIR"), "rust-snapshot.inc"), "w") as f:
+        f.write(snapshot)
+}
+
+RUSTLIB_DEP:class-nativesdk = ""
+
+# musl builds include libunwind.a
+INSANE_SKIP:${PN} = "staticdev"
+
+BBCLASSEXTEND = "native nativesdk"