subtree updates

meta-raspberrypi: 8cffbf5e85..b601818301:
  Changqing Li (1):
        99-com.rules: fix error invalid substitution type

  Khem Raj (2):
        linux-firmware-rpidistro: Update to 20190114-1+rpt11
        bluez-firmware-rpidistro: Update to 1.2-4+rpt8

  Pierre-Jean Texier (1):
        rpi-base: make SPLASH overridable from outside

  SCVready (1):
        rpi-config: comment updated

  matt-hammond-bbc (1):
        libva: Fix for when using `userland`

poky: 1203d1f24d..05a8aad57c:
  Alejandro Enedino Hernandez Samaniego (2):
        python3: Upgrade 3.9.2 -> 3.9.4
        python3: Improve logging, syntax and update deprecated modules to create_manifest

  Alexander Kanavin (6):
        scripts/oe-debuginfod: correct several issues
        oeqa: tear down oeqa decorators if one of them raises an exception in setup
        meta/lib/oeqa/core/tests/cases/timeout.py: add a testcase for the previous fix
        Revert "oeqa: Set LD_LIBRARY_PATH when executing native commands"
        diffoscope: add native libraries to LD_LIBRARY_PATH
        linux-firmware: upgrade 20210208 -> 20210315

  Anders Wallin (2):
        lttng-tools: Fix missing legacy test files
        lttng-tools: Fix path for test_python_looging

  Anthony Bagwell (1):
        systemd: upgrade 247.4 -> 247.6

  Anuj Mittal (2):
        qemu: fix CVE-2021-3392
        lsb-release: fix reproducibility failure

  Bruce Ashfield (19):
        linux-yocto/5.4: update to v5.4.109
        linux-yocto/5.10: update to v5.10.27
        linux-yocto/5.10: BSP configuration fixes
        linux-yocto/5.10: update to v5.10.29
        linux-yocto/5.4: update to v5.4.111
        linux-yocto/5.10: update to v5.10.30
        linux-yocto-rt/5.10: update to -rt34
        linux-yocto/5.4: update to v5.4.112
        linux-yocto/5.4: fix arm defconfig warnings
        linux-yocto/5.10: fix arm defconfig warnings
        linux-yocto/5.10: aufs fixes
        linux-yocto/5.10: qemuriscv32.cfg: RV32 only supports 1G physical memory
        linux-yocto/5.10: update to v5.10.32
        perf: fix python-audit RDEPENDS
        linux-yocto/5.4: update to v5.4.114
        linux-yocto/5.10: update to v5.10.34
        linux-yocto/5.4: update to v5.4.116
        linux-yocto/5.10: qemuppc32: reduce serial shutdown issues
        linux-yocto/5.4: qemuppc32: reduce serial shutdown issues

  Changqing Li (2):
        cairo: fix CVE-2020-35492
        gdk-pixbuf: fix CVE-2021-20240

  Chen Qi (5):
        busybox: fix CVE-2021-28831
        glib-2.0: fix CVE-2021-28153
        weston: fix build failure due to race condition
        rsync: fix CVE-2020-14387
        db: update CVE_PRODUCT

  Christophe Chapuis (1):
        rootfs.py: find .ko.gz and .ko.xz kernel modules as well

  Daniel Ammann (1):
        archiver: Fix typos

  Douglas Royds (2):
        Revert "externalsrc: Detect code changes in submodules"
        externalsrc: Detect code changes in submodules

  Gavin Li (1):
        kmod: do not symlink config.guess/config.sub during autoreconf

  He Zhe (1):
        linux-yocto-dev: add features/scsi/scsi-debug.scc features/gpio/mockup.scc to KERNEL_FEATURES

  Jon Mason (1):
        oeqa/runtime: space needed

  Jonas Höppner (1):
        ltp: fix empty ltp-dev package

  Jose Quaresma (1):
        ptest-runner: libgcc must be installed for pthread_cancel to work

  Joshua Watt (1):
        classes/image: Use xargs to set file timestamps

  Kai Kang (3):
        kernel-yocto.bbclass: chdir to ${WORKDIR} for do_kernel_checkout
        cmake.bbclass: remove ${B} before cmake_do_configure
        grub2.inc: remove '-O2' from CFLAGS

  Kevin Hao (3):
        modutils-initscripts: Bail out when no module is installed
        sysvinit-inittab/start_getty: Check /sys for the tty device existence
        Revert "inittab: Add getty launch on hvc0 for qemuppc64"

  Khairul Rohaizzat Jamaluddin (1):
        qemu: Fix CVE-2020-35517

  Khem Raj (6):
        ca-certificates: Fix openssl runtime cert dependencies
        systemd: Fix build on mips/musl
        go: Use dl.google.com for SRC_URI
        libjpeg-turbo: Use --reproducible option for nasm
        busybox: Fix reproducibility
        webkitgtk: Fix reproducibility in minibrowser

  Konrad Weihmann (1):
        cve-update-db-native: skip on empty cpe23Uri

  Michael Opdenacker (1):
        sanity.bbclass: mention CONNECTIVITY_CHECK_URIS in network failure message

  Mikko Rapeli (2):
        bitbake: bitbake: tests/fetch: fix test execution without .gitconfig
        bitbake: bitbake: tests/fetch: remove write protected files too

  Mingli Yu (6):
        groff: not ship /usr/bin/grap2graph
        libtool: make sure autoheader run before automake
        packagegroup-core-tools-profile: Remove valgrind for riscv32
        packagegroup-core-tools-testapps.bb: Remove kexec for riscv32
        libxshmfence: Build fixes for riscv32
        rpm: Upgrade to 4.16.1.3

  Niels Avonds (1):
        bitbake: fetch/gitsm: Fix crash when using git LFS and submodules

  Peter Budny (1):
        lib/oe/terminal: Fix tmux new-session on older tmux versions (<1.9)

  Peter Kjellerstedt (1):
        libcap: Configure Make variables correctly without a horrible hack

  Randy MacLeod (1):
        oe-time-dd-test.sh: increase timeout to 15 sec

  Reto Schneider (2):
        license_image.bbclass: Detect broken symlinks
        license_image.bbclass: Fix symlink to generic license files

  Richard Purdie (22):
        oeqa/selftest: Hardcode test assumptions about heartbeat event timings
        bitbake: runqueue: Fix deferred task issues
        pseudo: Upgrade to add trailing slashes ignore path fix
        oeqa/selftest: Ensure packages classes are set correctly for maintainers test
        sanity: Add error check for '%' in build path
        runqemu: Ensure we cleanup snapshot files after image run
        yocto-check-layer: Avoid bug when iterating and autoadding dependencies
        patchelf: Backport fix from upstream for note section overlap error
        bitbake: runqueue: Fix multiconfig deferred task sstate validity caching issue
        bitbake: runqueue: Handle deferred task rehashing in multiconfig builds
        patchelf: Fix note section alignment issues
        patchelf: Fix alignment patch
        pybootchart/draw: Avoid divide by zero error
        yocto-uninative: Update to 3.1 which includes a patchelf fix
        lib/package_manager: Use shutil.copy instead of bb.utils.copyfile for intercepts
        oeqa/qemurunner: Improve logging thread exit handling for qemu shutdown test
        oeqa/qemurunner: Fix binary vs str issue
        oeqa/qemurunner: Improve handling of run_serial for shutdown commands
        puzzles: Upstream changed to main branch for development
        poky.conf: Bump version for 3.3.1 hardknott release
        build-appliance-image: Update to hardknott head revision
        documentation: prepare for 3.3.1 release

  Romain Naour (1):
        dejagnu: needs expect at runtime

  Ross Burton (4):
        bitbake: bitbake-server: ensure server timeout is a float
        insane: clean up some more warning messages
        glslang: strip whitespace in pkgconfig file
        oe-buildenv-internal: add BitBake's library to PYTHONPATH

  Sakib Sajal (10):
        oe-time-dd-test.sh: make executable
        oe-time-dd-test.sh: provide more information from "top"
        qemu: fix CVE-2021-20181
        qemu: fix CVE-2020-29443
        qemu: fix CVE-2021-20221
        qemu: fix CVE-2021-3409
        qemu: fix CVE-2021-3416
        qemu: fix CVE-2021-20257
        qemu: fix CVE-2020-27821
        qemu: fix CVE-2021-20263

  Saul Wold (1):
        pango: re-enable ptest

  Stefan Ghinea (3):
        wpa-supplicant: fix CVE-2021-30004
        libssh2: fix build failure with option no-ecdsa
        xserver-xorg: fix CVE-2021-3472

  Trevor Gamblin (1):
        nettle: upgrade 3.7.1 -> 3.7.2

  Ulrich Ölmann (1):
        arch-armv6m.inc: fix access rights

  Vinícius Ossanes Aquino (1):
        lttng-modules: backport patches to fix build against 5.12+ kernel

  Wes Lindauer (1):
        oeqa/runtime/cases: Only disable/enable for current boot

  Yanfei Xu (1):
        parselogs: ignore floppy error on qemu-system-x86 at boot stage

  Yann Dirson (1):
        linux-firmware: include all relevant files in -bcm4356

  Yi Fan Yu (1):
        libevent: Increase ptest timing tolerance 50 ms -> 100 ms

  hongxu (1):
        deb: apply postinstall on sdk

  wangmy (4):
        mesa: upgrade 21.0.1 -> 21.0.2
        go: update SRC_URI to use https protocol
        go: upgrade 1.16.2 -> 1.16.3
        mesa: upgrade 21.0.2 -> 21.0.3

  zhengruoqin (2):
        wireless-regdb: upgrade 2020.11.20 -> 2021.04.21
        ruby: upgrade 3.0.0 -> 3.0.1

meta-openembedded: 98175fd0cc..bbe3855ec7:
  Aditya.Tayade (1):
        neon: Add ptest

  Andreas Müller (17):
        udisks2: upgrade 2.9.1 -> 2.9.2 / replace '_git' by version in recipe-name
        poppler: upgrade 21.02.0 -> 21.03.0
        xfce4-panel: upgrade 4.16.1 -> 4.16.2
        xfce4-cpugraph-plugin: upgrade 1.2.1 -> 1.2.3
        xfce4-time-out-plugin: upgrade 1.1.1 -> 1.1.2
        mousepad: upgrade 0.5.2 -> 0.5.3
        xfce4-panel-profiles: 1.0.12 -> 1.0.13
        thunar: upgrade 4.16.2 -> 4.16.4
        xfce4-taskmanager: upgrade 1.4.0 -> 1.4.2
        networkmanager-openvpn: Fix packageing
        mousepad: upgrade 0.5.3 -> 0.5.4
        xfce4-battery-plugin: upgrade 1.1.3 -> 1.1.4
        gigolo: upgrade 0.5.1 -> 0.5.2
        thunar: upgrade 4.16.4 -> 4.16.6
        poppler: upgrade 21.03.0 -> 21.04.0
        catfish: add python3-dbus to RDEPENDS
        fluidsynth: upgrade 2.1.7 -> 2.2.0

  Andrei Gherzan (6):
        python3-pep8: Fix HOMEPAGE
        python3-mccabe: Fix HOMEPAGE
        python3-ifaddr: Integrate a dependency of pysonos
        python3-pysonos: Integrate the SONOS control HomeAssistant module
        python3-aiohue: Integrate the hue control python module
        packagegroup-meta-python: Add new modules (aiohue, ifaddr, pysonos)

  Andrej Valek (1):
        jsoncpp: Upgrade to 1.9.4

  Andrew Geissler (1):
        nodejs: ppc64le machine support

  Armin Kuster (3):
        wireguard: update to v1.0.20210219 +1
        nostromo: Blacklist and exclude from world builds
        packagegroup-meta-webserver: remove nostromo from pkg grp

  Awais Belal (1):
        libnet-ssleay-perl: add rdep on perl-module-autoloader

  Bartosz Golaszewski (11):
        pystemd: satisfy runtime dependencies
        python3-pythonping: new package
        python3-wpa-supplicant: new package
        python3-txdbus: new package
        python3-wpa-supplicant: add runtime dependencies
        python3-wpa-supplicant: fix importing the cli submodule
        python3-wpa-supplicant: replace DESCRIPTION with SUMMARY
        libgpiod: update v1.6.2 -> v1.6.3
        python3-txdbus: add missing runtime dependencies
        python3-jmespath: new package
        python3-docutils: new package

  Ben Gampe (1):
        python3-h11: new package

  Carlos Rafael Giani (1):
        pipewire: Upgrade to 0.3.24

  Changqing Li (2):
        php: allow php as empty
        openldap: upgrade 2.4.57 -> 2.4.58

  Chen Qi (2):
        tigervnc: upgrade to 1.11.0
        python3-django: upgrade to 2.2.20

  Clément Péron (2):
        grpc: move grpc plugins to a new grpc-compiler package
        nodejs: 12.20.2 -> 12.21.0

  Colin McAllister (1):
        python3-gpsd-py3: Added recipe

  Daniel Wagenknecht (1):
        gnome-keyring: set file capabilities in pkg_postinst

  Denys Dmytriyenko (1):
        glmark2: also depend on wayland-protocols when wayland distro feature is on

  Devon Pringle (1):
        python3-pastedeploy: Add recipe

  Fabio Berton (1):
        python3-requests: Support idna version 3.1

  Hermes Zhang (1):
        gpsd: backport d-bus message time patch from upstream

  Hongxu Jia (1):
        debootstrap: 1.0.67 -> 1.0.123

  INC@Cisco) (2):
        bpftool: remove recipe from blacklist
        bpftool: improve reproducibility

  Jan Kaisrlik (1):
        abseil-cpp: reorder content of packages

  Joe Hershberger (1):
        strongswan: Make PACKAGECONFIG a default value

  Joshua Watt (1):
        classes: Add Android sparse image class

  Kai Kang (9):
        python3-pillow: 8.1.0 -> 8.1.2
        xfce4-cpufreq-plugin: 1.2.2 -> 1.2.5
        exo: 4.16.0 -> 4.16.1
        xfce4-netload-plugin: 1.3.2 -> 1.4.0
        xfce4-genmon-plugin: 4.1.0 -> 4.1.1
        xfce4-weather-plugin: 0.10.2 -> 0.11.0
        xfce4-systemload-plugin: 1.2.4 -> 1.3.0
        xfce4-taskmanager: 1.4.2 -> 1.5.2
        freeradius: check existence of openssl's commands in bootstrap

  Kamil Dziezyk (1):
        bats: upgrade 1.1.0 -> 1.3.0

  Kartikey Rameshbhai Parmar (1):
        fluidsynth: update SRC_URI to remove non-existing 2.1.x branch

  Khem Raj (77):
        nss: Disable Werror
        open-vm-tools: Do not use volatile qualifier
        dconf-editor: Fix build with vala 0.50.4
        libbacktrace: Add recipe
        libleak: Add recipe
        packagegroup-meta-oe: Add libleak to packagegroup-meta-oe-extended
        mongodb: Upgrade to 4.4.4
        packagegroup-meta-python: Add python3-semantic-version
        python3-grpcio: Upgrade to 1.36.1
        python3-grpcio: Fix build on mips and musl
        mpv: Link libatomic on riscv64
        glog: Link with libexecinfo on musl
        musl-nscd: Make lex syntax posix'y
        libbpf: Depend on virtual/kernel:do_shared_workdir
        waf-cross-answers: Add powerpc64le version
        python3-grpcio,python3-grpcio-tools: Disable for ppc64le
        openh264: Disable building for ppc64le
        ufs-utils: Upgrade to 1.9
        libhugetlbfs: Fix ARCH setting for ppc64 LE
        nodejs: Set correct nodejs arch for ppc64le
        libnma: Disbale vapi
        xrdp: Upgrade to 0.9.15
        ply: upgrade to latest
        ply: Disable on ppc64
        ltrace: Fix build on ppc64le/musl
        oprofile: Fix build on musl
        gperftools: Update SRCREV to point to 2.9.1 release
        mongodb: Fix cross build on ppc64le
        abseil-cpp: Fix build on musl and ppc64
        mariadb: Fix build on musl/ppc
        mongodb: Fix build on ppc64le
        breakpad: Upgrade to latest
        ssiapi: Disable for ppc64
        kexec-tools-klibc: Use SITEINFO_BITS to construct includepath
        breakpad: Exclude for ppc64
        python3-grpcio,python3-grpcio-tools: Enable build on ppc64/glibc
        breakpad: Do not fallback to android implementation for getcontext/setcontext on musl
        oprofile: Upgrade to 1.4.0 release
        vboxguestdrivers: Add __divmoddi4 builtin support
        links-x11,links: Upgrade to 2.22
        layers: Drop gatesgarth from LAYERSERIES_COMPAT
        xxhash: Remove recipe
        gsound: Use () instead of {} for makefile variable in gsound_play_VALAFLAGS
        pipewire: Package systemd unit file for pipewire-media-session
        packagegroup-meta-python: Add new package python3-pythonping
        python3-spidev: Remove recipe for 3.2
        python3-werkzeug: Clarify BSD license type
        python3-werkzeug: Delete recipe for 1.0.0
        python3-hexdump: Move cleanup_hexfile into install_append
        cryptsetup: DEPEND on renamed util-linux-libuuid
        tracker-miners: Check for commercial license to enable ffmpeg
        gnome-settings-daemon: Do not generate meson.native
        libb64: Add recipe
        sysdig: Upgrade to 0.27.1
        sysdig: Depend on system libb64
        gimp: Disable vector iconn on rv32/musl
        libcamera: Update the patch to upstreamed one
        flashrom: Add remaining RISCV support
        mpd: Check for commercial in LICENSE_FLAGS_WHITELIST
        mpv: Exclude from world if commercial is not in inclusion list
        sox: Exclude from world if commercial is not in inclusion list
        vlc: Exclude from world if commercial is not in inclusion list
        sox: Remove LICENSE_FLAGS = "commercial"
        mariadb: Fix build on newer 32bit architectures
        libmanette: Add recipe
        pidgin-sipe: Fix build with glib-2.0 >= 2.68
        gjs: Fix build with gcc11
        poppler: Backport patches to fix build with glib-2.0 2.68+ and GCC11
        opencv: Upgrade to 5.4.2
        tbb: Fix build with musl
        core-image-minimal-xfce: Use graphical.target as default
        vnstat: Disable install parallism to fix a potential install race
        open-vm-tools: Fix build with gcc 11
        nss: Re-enable -Werror
        gimp: Disable vector icon generation on mips/glibc too
        tbb: Re-introduce PE
        gimp: Disable vector icons on musl/x86

  Leon Anavi (134):
        python3-elementpath: Upgrade 2.1.4 -> 2.2.0
        python3-twisted: Upgrade 20.3.0 -> 21.2.0
        python3-ipython: Upgrade 7.20.0 -> 7.21.0
        python3-yamlloader: Upgrade 0.5.5 -> 1.0.0
        python3-astroid: Upgrade 2.5 -> 2.5.1
        python3-portion: Upgrade 2.1.4 -> 2.1.5
        python3-pandas: Upgrade 1.2.2 -> 1.2.3
        python3-ruamel-yaml: Upgrade 0.16.12 -> 0.16.13
        python3-prettytable: Upgrade 2.0.0 -> 2.1.0
        python3-huey: Upgrade 2.3.0 -> 2.3.1
        python3-pychromecast: Upgrade 8.1.0 -> 9.1.1
        python3-incremental: Upgrade 17.5.0 -> 21.3.0
        python3-waitress: Upgrade 1.4.4 -> 2.0.0
        python3-pako: Upgrade 0.3.0 -> 0.3.1
        python3-pyscaffold: Upgrade 3.3.1 -> 4.0
        python3-croniter: Upgrade 1.0.6 -> 1.0.8
        python3-prompt-toolkit: Upgrade 3.0.16 -> 3.0.17
        python3-pymisp: Upgrade 2.4.138 -> 2.4.140
        python3-jsonpatch: Upgrade 1.31 -> 1.32
        python3-jsonpointer: Upgrade 2.0 -> 2.1
        python3-configargparse: Upgrade 1.3 -> 1.4
        python3-luma-core: Upgrade 2.2.0 -> 2.3.1
        python3-pycodestyle: Upgrade 2.6.0 -> 2.7.0
        python3-bitarray: Upgrade 1.7.0 -> 1.7.1
        python3-alembic: Upgrade 1.5.5 -> 1.5.7
        python3-pyflakes: Upgrade 2.2.0 -> 2.3.0
        python3-autobahn: Upgrade 21.2.2 -> 21.3.1
        python3-pulsectl: Upgrade 21.2.0 -> 21.3.4
        python3-configparser: Upgrade 5.0.1 -> 5.0.2
        python3-defusedxml: Upgrade 0.6.0 -> 0.7.1
        python3-twine: Upgrade 3.3.0 -> 3.4.0
        python3-socketio: Upgrade 5.0.4 -> 5.1.0
        python3-soupsieve: Upgrade 2.2 -> 2.2.1
        python3-cassandra-driver: Upgrade 3.24.0 -> 3.25.0
        python3-urllib3: Upgrade 1.26.3 -> 1.26.4
        python3-bitarray: Upgrade 1.7.1 -> 1.8.0
        python3-pyscaffold: Upgrade 4.0 -> 4.0.1
        python3-flask-migrate: Upgrade 2.6.0 -> 2.7.0
        python3-grpcio-tools: Upgrade 1.35.0 -> 1.36.1
        python3-humanize: Upgrade 3.2.0 -> 3.3.0
        python3-regex: Upgrade 2020.11.13 -> 2021.3.17
        python3-twine: Upgrade 3.4.0 -> 3.4.1
        python3-isort: Upgrade 5.7.0 -> 5.8.0
        python3-sqlalchemy: Upgrade 1.3.23 -> 1.4.2
        python3-scrypt: Upgrade 0.8.6 -> 0.8.17
        python3-colorlog: Upgrade 4.7.2 -> 4.8.0
        python3-croniter: Upgrade 1.0.8 -> 1.0.9
        python3-pyperf: Upgrade 2.1.0 -> 2.2.0
        python3-lazy-object-proxy: Upgrade 1.5.2 -> 1.6.0
        python3-prompt-toolkit: Upgrade 3.0.17 -> 3.0.18
        python3-configshell-fb: Upgrade 1.1.28 -> 1.1.29
        python3-backports-functools-lru-cache: Upgrade 1.6.1 -> 1.6.3
        python3-pytest-helpers-namespace: Upgrade 2019.1.8 -> 2021.3.24
        python3-elementpath: Upgrade 2.2.0 -> 2.2.1
        python3-alembic: Upgrade 1.5.7 -> 1.5.8
        python3-rfc3339-validator: Upgrade 0.1.2 -> 0.1.3
        python3-pyflakes: Upgrade 2.3.0 -> 2.3.1
        python3-pint: Upgrade 0.16.1 -> 0.17
        python3-flask-sqlalchemy: Upgrade 2.4.4 -> 2.5.1
        python3-django: Upgrade 3.1.1 -> 3.1.7
        python3-djangorestframework: Upgrade 3.12.2 -> 3.12.3
        python3-ruamel-yaml: Upgrade 0.16.13 -> 0.17.0
        python3-bitarray: Upgrade 1.8.0 -> 1.8.1
        python3-sqlalchemy: Upgrade 1.4.2 -> 1.4.3
        python3-xmlschema: Upgrade 1.5.1 -> 1.5.3
        python3-croniter: Upgrade 1.0.9 -> 1.0.10
        python3-astroid: Upgrade 2.5.1 -> 2.5.2
        python3-pyroute2: Upgrade 0.5.14 -> 0.5.15
        python3-coverage: Upgrade 5.4 -> 5.5
        python3-gunicorn: Upgrade 20.0.4 -> 20.1.0
        python3-djangorestframework: Upgrade 3.12.3 -> 3.12.4
        python3-ipython: Upgrade 7.21.0 -> 7.22.0
        python3-openpyxl: Upgrade 3.0.6 -> 3.0.7
        python3-ruamel-yaml: Upgrade 0.17.0 -> 0.17.2
        python3-sqlalchemy: Upgrade 1.4.3 -> 1.4.4
        python3-bitarray: Upgrade 1.8.1 -> 1.8.2
        python3-httplib2: Upgrade 0.19.0 -> 0.19.1
        python3-parso: Upgrade 0.8.1 -> 0.8.2
        python3-matplotlib: Upgrade 3.3.4 -> 3.4.1
        python3-pyroute2: Upgrade 0.5.15 -> 0.5.16
        python3-h5py: Upgrade 3.1.0 -> 3.2.1
        python3-cheetah: Upgrade 3.2.6 -> 3.2.6.post1
        python3-google-api-python-client: Upgrade 2.0.2 -> 2.1.0
        python3-xlsxwriter: Upgrade 1.3.7 -> 1.3.8
        python3-pymisp: Upgrade 2.4.140 -> 2.4.141
        python3-tqdm: Upgrade 4.58.0 -> 4.59.0
        python3-contextlib2: Upgrade 0.6.0 -> 0.6.0.post1
        python3-typeguard: Upgrade 2.11.1 -> 2.12.0
        python3-decorator: Upgrade 4.4.2 -> 5.0.1
        python3-pillow: Upgrade 8.1.2 -> 8.2.0
        python3-aiohttp: Upgrade 3.7.4 -> 3.7.4.post0
        python3-networkx: Upgrade 2.5 -> 2.5.1
        python3-pysonos: Upgrade 0.0.40 -> 0.0.41
        python3-docutils: Upgrade 0.16 -> 0.17
        python3-bitarray: Upgrade 1.8.2 -> 1.9.0
        python3-regex: Upgrade 2021.3.17 -> 2021.4.4
        python3-sqlalchemy: Upgrade 1.4.4 -> 1.4.5
        python3-pychromecast: Upgrade 9.1.1 -> 9.1.2
        python3-decorator: Upgrade 5.0.1 -> 5.0.5
        python3-pymisp: Upgrade 2.4.141 -> 2.4.141.1
        python3-pyroute2: Upgrade 0.5.16 -> 0.5.17
        python3-transitions: Upgrade 0.8.7 -> 0.8.8
        python3-sqlalchemy: Upgrade 1.4.5 -> 1.4.6
        python3-bitarray: Upgrade 1.9.0 -> 1.9.1
        python3-pysonos: Upgrade 0.0.41 -> 0.0.42
        python3-django: Upgrade 3.1.7 -> 3.2
        python3-tqdm: Upgrade 4.59.0 -> 4.60.0
        python3-xmlschema: Upgrade 1.5.3 -> 1.6.0
        python3-ruamel-yaml: Upgrade 0.17.2 -> 0.17.4
        python3-croniter: Upgrade 1.0.10 -> 1.0.11
        python3-decorator: Upgrade 5.0.5 -> 5.0.6
        python3-grpcio-tools: Upgrade 1.36.1 -> 1.37.0
        python3-speedtest-cli: Upgrade 2.1.2 -> 2.1.3
        python3-python-vlc: Upgrade 3.0.11115 -> 3.0.12117
        python3-robotframework: Upgrade 4.0 -> 4.0.1
        python3-grpcio: Upgrade 1.36.1 -> 1.37.0
        python3-cerberus: Upgrade 1.3.2 -> 1.3.3
        python3-humanize: Upgrade 3.3.0 -> 3.4.0
        python3-monotonic: Upgrade 1.5 -> 1.6
        python3-sqlalchemy: Upgrade 1.4.6 -> 1.4.7
        python3-typed-ast: Upgrade 1.4.2 -> 1.4.3
        python3-backports-functools-lru-cache: Upgrade 1.6.3 -> 1.6.4
        python3-xmlschema: Upgrade 1.6.0 -> 1.6.1
        python3-pyroute2: Upgrade 0.5.17 -> 0.5.18
        python3-sympy: Upgrade 1.7.1 -> 1.8
        python3-pandas: Upgrade 1.2.3 -> 1.2.4
        python3-humanize: Upgrade 3.4.0 -> 3.4.1
        python3-decorator: Upgrade 5.0.6 -> 5.0.7
        python3-colorlog: Upgrade 4.8.0 -> 5.0.1
        python3-google-api-python-client: Upgrade 2.1.0 -> 2.2.0
        python3-croniter: Upgrade 1.0.11 -> 1.0.12
        python3-pysonos: Upgrade 0.0.42 -> 0.0.43
        python3-asttokens: Upgrade 2.0.4 -> 2.0.5
        python3-hyperframe: Upgrade 6.0.0 -> 6.0.1

  Luca Boccassi (3):
        cryptsetup: depend on new util-linux-uuid to break cycle
        dbus-broker: upgrade 26 -> 27
        dbus-broker: upgrade 27 -> 28

  Marius Kriegerowski (1):
        tmate: add recipe version 2.4.0

  Martin Jansa (25):
        glog: fix searching for Libunwind
        ceres-solver: prevent fetching git hook during do_configure
        packagegroup-meta-oe: include abseil-cpp for all architectures
        packagegroup-meta-oe: include nodejs without meta-python2 conditional
        packagegroup-meta-oe: move the packages depending on meta-python2 to separate packages
        mysql-python, lio-utils, openlmi-tools: add conditional PNBLACKLIST like meta-python2 does
        conf/layer.conf: include .bbappend files in BBFILES_DYNAMIC
        open-vm-tools: move to meta-networking
        packagegroup-meta-{oe,multimedia}: move pipewire to the right packagegroup
        packagegroup-meta-multimedia: include projucer only with x11 in DISTRO_FEATURES
        packagegroup-meta-multimedia: include vlc only with x11 in DISTRO_FEATURES
        packagegroup-meta-oe: include glfw, icewm, geis only with x11 in DISTRO_FEATURES
        phonet-utils: remove
        packagegroup-meta-oe: use 4 spaces for identation
        telepathy-glib: respect GI_DATA_ENABLED when enabling vala-bindings
        uml-utilities: fix installed-vs-shipped with usrmerge
        libsmi: use /bin/sh instead of ${base_bindir}/sh to silence QA error with usrmerge
        libyui: switch to libyui-old repo which still has this SRCREV
        libyui(-ncurses): upgrade to 4.1.1, libyui repo was rewritten completely
        android-tools: use PN instead of BPN in RDEPENDS
        pidgin-sipe: fix g_memdup2 changes to be backwards compatible with glib-1.67
        pidgin: upgrade to 2.14.2
        opencv: fetch wechat_qrcode files used by dnn PACKAGECONFIG
        opencv: link sfm module with Glog
        ostree: switch from default master branch to main to fix do_fetch failure

  Matteo Croce (1):
        libbpf: use pkg-config

  Michael Vetter (1):
        jasper: upgrade 2.0.25 -> 2.0.26

  Ming Liu (1):
        atftp: move atftpd.init from files to atftp subdirectory

  Mingli Yu (10):
        geoip: Switch to use the main branch
        geoip-perl: Switch to use the main branch
        bridge-utils: Switch to use the main branch
        netkit-telnet: Update SRC_URI
        quagga: Update SRC_URI
        hostapd: fix CVE-2019-5061
        freeradius: Upgrade to 3.0.21
        hostapd: fix CVE-2021-0326 and CVE-2021-27803
        php: Upgrade to 7.4.16
        python3-cryptography: Upgrade to 3.3.2

  Naveen Saini (2):
        tbb: upgrade 2020.3 -> 2021.2.0
        ocl-icd: upgrade 2.2.14 -> 2.3.0

  Nisha Parrakat (1):
        neon: use pkg-config instead of xml2-config to configure

  Oleksandr Kravchuk (10):
        ipset: update to 7.11
        libnice: update to 0.1.18
        nbdkit: update to 1.25.3
        python3-bitarray: update to 1.7.0
        python3-google-api-python-client: update to 2.0.2
        python3-jsonpatch: update to 1.31
        python3-websocket-client: update to 0.58.0
        python3-robotframework: update to 4.0
        python3-sentry-sdk: update to 1.0.0
        aom: update to 3.0.0

  Peace Lee (2):
        guider: Upgrade 3.9.7 -> 3.9.8
        guider: Upgrade 3.9.7 -> 3.9.8

  Persian Prince (1):
        tinymembench: Correct PV

  Philip Balister (1):
        fftw: Add support for ptest.

  Randy MacLeod (8):
        gperftools: upgrade 2.8.1 -> 2.9.1
        zabbix: upgrade 4.4.6 -> 5.2.5
        nss: upgrade 3.60.1 -> 3.62
        xterm: upgrade 362 -> 366
        zstd: remove the recipe since it moved to oe-core
        tclap: upgrade 1.2.2 -> 1.4.0
        doxygen: Upgrade 1.8.20 -> 1.9.1
        open-vm-tools: upgrade 11.0.1 -> 11.2.5

  Ross Burton (4):
        libxmlb: upgrade to 0.3.0
        flashrom: recipe cleanup
        openjpeg: add native/nativesdk class extension
        fwts: upgrade to 21.03.00

  Sakib Sajal (1):
        grpc: upgrade 1.36.1 -> 1.36.2

  Sam Van Den Berge (1):
        libiio: fix build when python bindings are enabled

  Sana Kazi (1):
        mdns: Whitelisted CVE-2007-0613 for mdns

  Sinan Kaya (1):
        zram: add support for mem_limit

  Stefan Ghinea (2):
        hostapd: fix CVE-2021-30004
        python3-django: fix CVE-2021-28658

  Stefan Schmidt (2):
        musl-rpmatch_git.bb: add new recipe to provide rpmatch() for musl libc builds
        plymouth_0.9.5.bb: allow building with musl libc

  Ulrich Ölmann (1):
        v4l-utils: fix reproducibility

  Valentin Longchamp (1):
        libssh: add gcrypt to PACKAGECONFIG

  Vinicius Aquino (1):
        networkmanager: upgrade 1.28.0 -> 1.30.2

  Vinícius Ossanes Aquino (2):
        modemmanager: upgrade 1.14.10 -> 1.16.2
        libqmi: upgrade 1.26.6 -> 1.28.2

  Wang Mingyu (3):
        czmq: Conflict resolution for sha1.h
        python3-lxml: upgrade 4.6.2 -> 4.6.3
        python3-zopeinterface: upgrade 5.2.0 -> 5.3.0

  Yann Dirson (1):
        mpv: remove explicit LICENSE_FLAGS

  Yi Fan Yu (7):
        librelp: update 1.6.0 -> 1.10.0
        rsyslog: Fix rsyslog systemd service not starting
        rsyslog: fix some of the ptests
        redis: upgrade 6.0.9 -> 6.2.1
        syslog-ng: upgrade 3.24.1 -> 3.31.2
        syslog-ng: remove CONFIG_TLS override for arm DEBUG_BUILD
        syslog-ng: Drop an obsolete patch to add --enable-libnet

  Yi Zhao (3):
        quagga: do not set PIDFile in service files
        tclap: add pkg-config file
        gvfs: rdepend on gsettings-desktop-schemas

  Zang Ruochen (1):
        gtkwave: upgrade 3.3.104 -> 3.3.108

  akuster (1):
        README: updated Maintainers list for Hardknott

  hasan.men (2):
        librdkafka: Add initial recipe v1.6.1
        libcppkafka: Add initial recipe for cppkafka wrapper

  persianpros (5):
        PEP8 double aggressive E701, E70 and E502
        PEP8 double aggressive E20 and E211
        PEP8 double aggressive E22, E224, E241, E242 and E27
        PEP8 double aggressive E301 ~ E306
        PEP8 double aggressive W291 ~ W293 and W391

  wangmy (2):
        mariadb: upgrade 10.5.8 -> 10.5.9
        uftrace: Fix error on aarch64 when binutils update to 2.35.1

  zangrc (38):
        dovecot: upgrade 2.3.13 -> 2.3.14
        fetchmail: upgrade 6.4.16 -> 6.4.17
        dialog: upgrade 1.3-20210117 -> 1.3-20210306
        fio: upgrade 3.25 -> 3.26
        xorriso: upgrade 1.5.3 -> 1.5.5
        iscsi-initiator-utils: upgrade 2.1.3 -> 2.1.4
        mosquitto: upgrade 2.0.8 -> 2.0.9
        nbdkit: upgrade 1.25.3 -> 1.25.4
        wireguard-tools: upgrade 1.0.20210223 -> 1.0.20210315
        wireshark: upgrade 3.4.3 -> 3.4.4
        live555: upgrade 20210129 -> 20210322
        mg: upgrade 20200723 -> 20210314
        nanopb: upgrade 0.4.4 -> 0.4.5
        nss: upgrade 3.62 -> 3.63
        uriparser: upgrade 0.9.4 -> 0.9.5
        gnome-autoar: upgrade 0.2.4 -> 0.3.1
        emacs: upgrade 27.1 -> 27.2
        fbgrab: upgrade 1.4 -> 1.5
        ostree: upgrade 2020.8 -> 2021.1
        zabbix: upgrade 5.2.5 -> 5.2.6
        libxaw: upgrade 1.0.13 -> 1.0.14
        mosquitto: upgrade 2.0.9 -> 2.0.10
        nbdkit: upgrade 1.25.4 -> 1.25.5
        stunnel: upgrade 5.58 -> 5.59
        usbredir: upgrade 0.8.0 -> 0.9.0
        hwdata: upgrade 0.345 -> 0.346
        live555: upgrade 20210322 -> 20210406
        rabbitmq-c: upgrade 0.10.0 -> 0.11.0
        xterm: upgrade 366 -> 367
        fuse3: upgrade 3.10.2 -> 3.10.3
        cifs-utils: upgrade 6.12 -> 6.13
        dnsmasq: upgrade 2.84 -> 2.85
        nbdkit: upgrade 1.25.5 -> 1.25.6
        wolfssl: upgrade 4.7.0 -> 4.7.1
        networkmanager: upgrade 1.30.2 -> 1.30.4
        libdvdread: upgrade 6.1.1 -> 6.1.2
        redis: upgrade 6.2.1 -> 6.2.2
        nss: upgrade 3.63 -> 3.64

  zhengruoqin (21):
        phpmyadmin: upgrade 5.0.4 -> 5.1.0
        uthash: upgrade 2.2.0 -> 2.3.0
        gd: upgrade 2.3.1 -> 2.3.2
        openocd: upgrade 0.10 -> 0.11
        satyr: upgrade 0.36 -> 0.37
        libcrypt-openssl-guess-perl: upgrade 0.11 -> 0.12
        cryptsetup: upgrade 2.3.4 -> 2.3.5
        glmark2: upgrade 20201114 -> 2021.02
        grpc: upgrade 1.36.2 -> 1.36.3
        dialog: upgrade 1.3-20210306 -> 1.3-20210319
        grpc: upgrade 1.36.3 -> 1.36.4
        libgee: upgrade 0.20.3 -> 0.20.4
        fetchmail: upgrade 6.4.17 -> 6.4.18
        lldpd: upgrade 1.0.4 -> 1.0.8
        networkmanager-openvpn: upgrade 1.8.12 -> 1.8.14
        snort: upgrade 2.9.17 -> 2.9.17.1
        python3-absl: upgrade 0.10.0 -> 0.12.0
        python3-astroid: upgrade 2.5.2 -> 2.5.3
        python3-bitarray: upgrade 1.9.1 -> 1.9.2
        irssi: upgrade 1.2.2 -> 1.2.3
        librsync: upgrade 2.3.1 -> 2.3.2

meta-security: 775870980b..c6b1eec0e5:
  Anton Antonov (5):
        Use libest "main" branch instead of "master".
        Add meta-parsec layer into meta-security.
        Define secure images with parsec-service and parsec-tool included and add the images into gitlab CI
        Clearly define clang toolchain in Parsec recipes
        gitlab-ci: Move all parsec builds into a separate job

  Armin Kuster (25):
        packagegroup-core-security: drop clamav-cvd
        clamav: upgrade 104.0
        python3-privacyidea: upgrade 3.5.1 -> 3.5.2
        clamav: fix systemd service install
        swtpm: now need python-cryptography, pull in layer
        swtpm: file pip3 issue
        swtpm: fix check for tscd deamon on host
        python3-suricata-update: update to 1.2.1
        .gitlab-ci.yml: reorder to speed up builds
        kas-security-base.yml: tweek build vars
        gitlab-ci: fine tune order
        clamav: remove rest of mirror.dat ref
        lkrg-module: Add Linux Kernel Runtime Guard
        kas-security-base: change branch to hardknott
        kas-security-base: add hardknott local dirs
        kas-security-base: Move some DISTRO_FEATURES around
        *-tpm.yml: drop tpms jobs
        gitlab-ci: move tpm build
        .gitlab-ci: work on pipelime
        gitlab-ci: cleanup after_script
        gitlab-ci: add new before script
        kas: cleanup some kas files
        packagegroup-core-security: exclude apparmor in mips64
        .gitlab-ci: use kas shell in some cases.
        kas-security-base: fix feature namespace for tpm*

  Ming Liu (2):
        meta: drop IMA_POLICY from policy recipes
        initramfs-framework-ima: introduce IMA_FORCE

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I635e69c9d74af0c553cad5eadd972f26830c7add
diff --git a/poky/meta/recipes-core/systemd/systemd_247.6.bb b/poky/meta/recipes-core/systemd/systemd_247.6.bb
new file mode 100644
index 0000000..32afa15
--- /dev/null
+++ b/poky/meta/recipes-core/systemd/systemd_247.6.bb
@@ -0,0 +1,768 @@
+require systemd.inc
+
+PROVIDES = "udev"
+
+PE = "1"
+
+DEPENDS = "intltool-native gperf-native libcap util-linux"
+
+SECTION = "base/shell"
+
+inherit useradd pkgconfig meson perlnative update-rc.d update-alternatives qemu systemd gettext bash-completion manpages features_check
+
+# As this recipe builds udev, respect systemd being in DISTRO_FEATURES so
+# that we don't build both udev and systemd in world builds.
+REQUIRED_DISTRO_FEATURES = "systemd"
+
+SRC_URI += "file://touchscreen.rules \
+           file://00-create-volatile.conf \
+           ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://org.freedesktop.hostname1_no_polkit.conf', '', d)} \
+           ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'file://00-hostnamed-network-user.conf', '', d)} \
+           file://init \
+           file://99-default.preset \
+           file://systemd-pager.sh \
+           file://0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch \
+           file://0003-implment-systemd-sysv-install-for-OE.patch \
+           file://0001-systemd.pc.in-use-ROOTPREFIX-without-suffixed-slash.patch \
+           file://0001-logind-Restore-chvt-as-non-root-user-without-polkit.patch \
+           file://0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch \
+           file://0001-analyze-resolve-executable-path-if-it-is-relative.patch \
+           "
+
+# patches needed by musl
+SRC_URI_append_libc-musl = " ${SRC_URI_MUSL}"
+SRC_URI_MUSL = "\
+               file://0002-don-t-use-glibc-specific-qsort_r.patch \
+               file://0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch \
+               file://0004-add-fallback-parse_printf_format-implementation.patch \
+               file://0005-src-basic-missing.h-check-for-missing-strndupa.patch \
+               file://0006-Include-netinet-if_ether.h.patch \
+               file://0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch \
+               file://0008-add-missing-FTW_-macros-for-musl.patch \
+               file://0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch \
+               file://0010-Use-uintmax_t-for-handling-rlim_t.patch \
+               file://0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \
+               file://0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \
+               file://0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch \
+               file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \
+               file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \
+               file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \
+               file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \
+               file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \
+               file://0019-Handle-missing-LOCK_EX.patch \
+               file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \
+               file://0021-test-json.c-define-M_PIl.patch \
+               file://0022-do-not-disable-buffer-in-writing-files.patch \
+               file://0025-Handle-__cpu_mask-usage.patch \
+               file://0026-Handle-missing-gshadow.patch \
+               file://0028-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \
+               "
+
+PAM_PLUGINS = " \
+    pam-plugin-unix \
+    pam-plugin-loginuid \
+    pam-plugin-keyinit \
+"
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'acl audit efi ldconfig pam selinux smack usrmerge polkit', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'rfkill', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xkbcommon', '', d)} \
+    backlight \
+    binfmt \
+    gshadow \
+    hibernate \
+    hostnamed \
+    idn \
+    ima \
+    kmod \
+    localed \
+    logind \
+    machined \
+    myhostname \
+    networkd \
+    nss \
+    nss-mymachines \
+    nss-resolve \
+    quotacheck \
+    randomseed \
+    resolved \
+    set-time-epoch \
+    sysusers \
+    sysvinit \
+    timedated \
+    timesyncd \
+    userdb \
+    utmp \
+    vconsole \
+    xz \
+"
+
+PACKAGECONFIG_remove_libc-musl = " \
+    gshadow \
+    idn \
+    localed \
+    myhostname \
+    nss \
+    nss-mymachines \
+    nss-resolve \
+    sysusers \
+    userdb \
+    utmp \
+"
+
+CFLAGS_append_libc-musl = " -D__UAPI_DEF_ETHHDR=0 "
+
+# Some of the dependencies are weak-style recommends - if not available at runtime,
+# systemd won't fail but the library-related feature will be skipped with a warning.
+
+# Use the upstream systemd serial-getty@.service and rely on
+# systemd-getty-generator instead of using the OE-core specific
+# systemd-serialgetty.bb - not enabled by default.
+PACKAGECONFIG[serial-getty-generator] = ""
+
+PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl"
+PACKAGECONFIG[audit] = "-Daudit=true,-Daudit=false,audit"
+PACKAGECONFIG[backlight] = "-Dbacklight=true,-Dbacklight=false"
+PACKAGECONFIG[binfmt] = "-Dbinfmt=true,-Dbinfmt=false"
+PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2"
+PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid"
+PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false"
+PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup"
+PACKAGECONFIG[dbus] = "-Ddbus=true,-Ddbus=false,dbus"
+PACKAGECONFIG[efi] = "-Defi=true,-Defi=false"
+PACKAGECONFIG[gnu-efi] = "-Dgnu-efi=true -Defi-libdir=${STAGING_LIBDIR} -Defi-includedir=${STAGING_INCDIR}/efi,-Dgnu-efi=false,gnu-efi"
+PACKAGECONFIG[elfutils] = "-Delfutils=true,-Delfutils=false,elfutils"
+PACKAGECONFIG[firstboot] = "-Dfirstboot=true,-Dfirstboot=false"
+# Sign the journal for anti-tampering
+PACKAGECONFIG[gcrypt] = "-Dgcrypt=true,-Dgcrypt=false,libgcrypt"
+PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
+PACKAGECONFIG[gshadow] = "-Dgshadow=true,-Dgshadow=false"
+PACKAGECONFIG[hibernate] = "-Dhibernate=true,-Dhibernate=false"
+PACKAGECONFIG[hostnamed] = "-Dhostnamed=true,-Dhostnamed=false"
+PACKAGECONFIG[idn] = "-Didn=true,-Didn=false"
+PACKAGECONFIG[ima] = "-Dima=true,-Dima=false"
+# importd requires journal-upload/xz/zlib/bzip2/gcrypt
+PACKAGECONFIG[importd] = "-Dimportd=true,-Dimportd=false"
+# Update NAT firewall rules
+PACKAGECONFIG[iptc] = "-Dlibiptc=true,-Dlibiptc=false,iptables"
+PACKAGECONFIG[journal-upload] = "-Dlibcurl=true,-Dlibcurl=false,curl"
+PACKAGECONFIG[kmod] = "-Dkmod=true,-Dkmod=false,kmod"
+PACKAGECONFIG[ldconfig] = "-Dldconfig=true,-Dldconfig=false,,ldconfig"
+PACKAGECONFIG[libidn] = "-Dlibidn=true,-Dlibidn=false,libidn,,libidn"
+PACKAGECONFIG[libidn2] = "-Dlibidn2=true,-Dlibidn2=false,libidn2,,libidn2"
+PACKAGECONFIG[localed] = "-Dlocaled=true,-Dlocaled=false"
+PACKAGECONFIG[logind] = "-Dlogind=true,-Dlogind=false"
+PACKAGECONFIG[lz4] = "-Dlz4=true,-Dlz4=false,lz4"
+PACKAGECONFIG[machined] = "-Dmachined=true,-Dmachined=false"
+PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
+PACKAGECONFIG[microhttpd] = "-Dmicrohttpd=true,-Dmicrohttpd=false,libmicrohttpd"
+PACKAGECONFIG[myhostname] = "-Dnss-myhostname=true,-Dnss-myhostname=false,,libnss-myhostname"
+PACKAGECONFIG[networkd] = "-Dnetworkd=true,-Dnetworkd=false"
+PACKAGECONFIG[nss] = "-Dnss-systemd=true,-Dnss-systemd=false"
+PACKAGECONFIG[nss-mymachines] = "-Dnss-mymachines=true,-Dnss-mymachines=false"
+PACKAGECONFIG[nss-resolve] = "-Dnss-resolve=true,-Dnss-resolve=false"
+PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false"
+PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
+PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
+PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
+PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
+# If polkit is disabled and networkd+hostnamed are in use, enabling this option and
+# using dbus-broker will allow networkd to be authorized to change the
+# hostname without acquiring additional privileges
+PACKAGECONFIG[polkit_hostnamed_fallback] = ",,,,dbus-broker,polkit"
+PACKAGECONFIG[portabled] = "-Dportabled=true,-Dportabled=false"
+PACKAGECONFIG[qrencode] = "-Dqrencode=true,-Dqrencode=false,qrencode,,qrencode"
+PACKAGECONFIG[quotacheck] = "-Dquotacheck=true,-Dquotacheck=false"
+PACKAGECONFIG[randomseed] = "-Drandomseed=true,-Drandomseed=false"
+PACKAGECONFIG[resolved] = "-Dresolve=true,-Dresolve=false"
+PACKAGECONFIG[rfkill] = "-Drfkill=true,-Drfkill=false"
+# libseccomp is found in meta-security
+PACKAGECONFIG[seccomp] = "-Dseccomp=true,-Dseccomp=false,libseccomp"
+PACKAGECONFIG[selinux] = "-Dselinux=true,-Dselinux=false,libselinux,initscripts-sushell"
+PACKAGECONFIG[smack] = "-Dsmack=true,-Dsmack=false"
+PACKAGECONFIG[sysusers] = "-Dsysusers=true,-Dsysusers=false"
+PACKAGECONFIG[sysvinit] = "-Dsysvinit-path=${sysconfdir}/init.d -Dsysvrcnd-path=${sysconfdir},-Dsysvinit-path= -Dsysvrcnd-path=,,systemd-compat-units update-rc.d"
+# When enabled use reproducble build timestamp if set as time epoch,
+# or build time if not. When disabled, time epoch is unset.
+def build_epoch(d):
+    epoch = d.getVar('SOURCE_DATE_EPOCH') or "-1"
+    return '-Dtime-epoch=%d' % int(epoch)
+PACKAGECONFIG[set-time-epoch] = "${@build_epoch(d)},-Dtime-epoch=0"
+PACKAGECONFIG[timedated] = "-Dtimedated=true,-Dtimedated=false"
+PACKAGECONFIG[timesyncd] = "-Dtimesyncd=true,-Dtimesyncd=false"
+PACKAGECONFIG[usrmerge] = "-Dsplit-usr=false,-Dsplit-usr=true"
+PACKAGECONFIG[sbinmerge] = "-Dsplit-bin=false,-Dsplit-bin=true"
+PACKAGECONFIG[userdb] = "-Duserdb=true,-Duserdb=false"
+PACKAGECONFIG[utmp] = "-Dutmp=true,-Dutmp=false"
+PACKAGECONFIG[valgrind] = "-DVALGRIND=1,,valgrind"
+PACKAGECONFIG[vconsole] = "-Dvconsole=true,-Dvconsole=false,,${PN}-vconsole-setup"
+PACKAGECONFIG[xdg-autostart] = "-Dxdg-autostart=true,-Dxdg-autostart=false"
+# Verify keymaps on locale change
+PACKAGECONFIG[xkbcommon] = "-Dxkbcommon=true,-Dxkbcommon=false,libxkbcommon"
+PACKAGECONFIG[xz] = "-Dxz=true,-Dxz=false,xz"
+PACKAGECONFIG[zlib] = "-Dzlib=true,-Dzlib=false,zlib"
+
+# Helper variables to clarify locations.  This mirrors the logic in systemd's
+# build system.
+rootprefix ?= "${root_prefix}"
+rootlibdir ?= "${base_libdir}"
+rootlibexecdir = "${rootprefix}/lib"
+
+# This links udev statically with systemd helper library.
+# Otherwise udev package would depend on systemd package (which has the needed shared library),
+# and always pull it into images.
+EXTRA_OEMESON += "-Dlink-udev-shared=false"
+
+EXTRA_OEMESON += "-Dnobody-user=nobody \
+                  -Dnobody-group=nobody \
+                  -Drootlibdir=${rootlibdir} \
+                  -Drootprefix=${rootprefix} \
+                  -Ddefault-locale=C \
+                  -Dmode=release \
+                  -Dsystem-alloc-uid-min=101 \
+                  -Dsystem-uid-max=999 \
+                  -Dsystem-alloc-gid-min=101 \
+                  -Dsystem-gid-max=999 \
+                  "
+
+# Hardcode target binary paths to avoid using paths from sysroot
+EXTRA_OEMESON += "-Dkexec-path=${sbindir}/kexec \
+                  -Dkmod-path=${base_bindir}/kmod \
+                  -Dmount-path=${base_bindir}/mount \
+                  -Dquotacheck-path=${sbindir}/quotacheck \
+                  -Dquotaon-path=${sbindir}/quotaon \
+                  -Dsulogin-path=${base_sbindir}/sulogin \
+                  -Dnologin-path=${base_sbindir}/nologin \
+                  -Dumount-path=${base_bindir}/umount"
+
+do_install() {
+	meson_do_install
+	install -d ${D}/${base_sbindir}
+	if ${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', 'false', 'true', d)}; then
+		# Provided by a separate recipe
+		rm ${D}${systemd_unitdir}/system/serial-getty* -f
+	fi
+
+	# Provide support for initramfs
+	[ ! -e ${D}/init ] && ln -s ${rootlibexecdir}/systemd/systemd ${D}/init
+	[ ! -e ${D}/${base_sbindir}/udevd ] && ln -s ${rootlibexecdir}/systemd/systemd-udevd ${D}/${base_sbindir}/udevd
+
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -d ${D}${sysconfdir}/tmpfiles.d
+	for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do
+		install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/
+	done
+
+	install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
+
+	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
+		install -d ${D}${sysconfdir}/init.d
+		install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
+		sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
+		install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
+	fi
+
+	chown root:systemd-journal ${D}/${localstatedir}/log/journal
+
+	# Delete journal README, as log can be symlinked inside volatile.
+	rm -f ${D}/${localstatedir}/log/README
+
+	# journal-remote creates this at start
+	rm -rf ${D}/${localstatedir}/log/journal/remote
+
+	install -d ${D}${systemd_unitdir}/system/graphical.target.wants
+	install -d ${D}${systemd_unitdir}/system/multi-user.target.wants
+	install -d ${D}${systemd_unitdir}/system/poweroff.target.wants
+	install -d ${D}${systemd_unitdir}/system/reboot.target.wants
+	install -d ${D}${systemd_unitdir}/system/rescue.target.wants
+
+	# Create symlinks for systemd-update-utmp-runlevel.service
+	if ${@bb.utils.contains('PACKAGECONFIG', 'utmp', 'true', 'false', d)}; then
+		ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/graphical.target.wants/systemd-update-utmp-runlevel.service
+		ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/multi-user.target.wants/systemd-update-utmp-runlevel.service
+		ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/poweroff.target.wants/systemd-update-utmp-runlevel.service
+		ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/reboot.target.wants/systemd-update-utmp-runlevel.service
+		ln -sf ../systemd-update-utmp-runlevel.service ${D}${systemd_unitdir}/system/rescue.target.wants/systemd-update-utmp-runlevel.service
+	fi
+
+	# this file is needed to exist if networkd is disabled but timesyncd is still in use since timesyncd checks it
+	# for existence else it fails
+	if [ -s ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf ]; then
+		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
+	fi
+	if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then
+		echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
+		echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
+		echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
+		ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd
+	else
+		sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
+		ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd
+	fi
+	if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'false', 'true', d)}; then
+		rm ${D}${exec_prefix}/lib/tmpfiles.d/x11.conf
+		rm -r ${D}${sysconfdir}/X11
+	fi
+
+	# If polkit is setup fixup permissions and ownership
+	if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
+		if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
+			chmod 700 ${D}${datadir}/polkit-1/rules.d
+			chown polkitd:root ${D}${datadir}/polkit-1/rules.d
+		fi
+	fi
+
+	# If polkit is not available and a fallback was requested, install a drop-in that allows networkd to
+	# request hostname changes via DBUS without elevating its privileges
+	if ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', 'true', 'false', d)}; then
+		install -d ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/
+		install -m 0644 ${WORKDIR}/00-hostnamed-network-user.conf ${D}${systemd_unitdir}/system/systemd-hostnamed.service.d/
+		install -d ${D}${datadir}/dbus-1/system.d/
+		install -m 0644 ${WORKDIR}/org.freedesktop.hostname1_no_polkit.conf ${D}${datadir}/dbus-1/system.d/
+	fi
+
+	# create link for existing udev rules
+	ln -s ${base_bindir}/udevadm ${D}${base_sbindir}/udevadm
+
+	# duplicate udevadm for postinst script
+	install -d ${D}${libexecdir}
+	ln ${D}${base_bindir}/udevadm ${D}${libexecdir}/${MLPREFIX}udevadm
+
+	# install default policy for presets
+	# https://www.freedesktop.org/wiki/Software/systemd/Preset/#howto
+	install -Dm 0644 ${WORKDIR}/99-default.preset ${D}${systemd_unitdir}/system-preset/99-default.preset
+
+	# add a profile fragment to disable systemd pager with busybox less
+	install -Dm 0644 ${WORKDIR}/systemd-pager.sh ${D}${sysconfdir}/profile.d/systemd-pager.sh
+}
+
+python populate_packages_prepend (){
+    systemdlibdir = d.getVar("rootlibdir")
+    do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
+}
+PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
+
+PACKAGE_BEFORE_PN = "\
+    ${PN}-gui \
+    ${PN}-vconsole-setup \
+    ${PN}-initramfs \
+    ${PN}-analyze \
+    ${PN}-kernel-install \
+    ${PN}-rpm-macros \
+    ${PN}-binfmt \
+    ${PN}-zsh-completion \
+    ${PN}-container \
+    ${PN}-journal-gatewayd \
+    ${PN}-journal-upload \
+    ${PN}-journal-remote \
+    ${PN}-extra-utils \
+    ${PN}-udev-rules \
+    udev \
+    udev-hwdb \
+"
+
+SUMMARY_${PN}-container = "Tools for containers and VMs"
+DESCRIPTION_${PN}-container = "Systemd tools to spawn and manage containers and virtual machines."
+
+SUMMARY_${PN}-journal-gatewayd = "HTTP server for journal events"
+DESCRIPTION_${PN}-journal-gatewayd = "systemd-journal-gatewayd serves journal events over the network. Clients must connect using HTTP. The server listens on port 19531 by default."
+
+SUMMARY_${PN}-journal-upload = "Send journal messages over the network"
+DESCRIPTION_${PN}-journal-upload = "systemd-journal-upload uploads journal entries to a specified URL."
+
+SUMMARY_${PN}-journal-remote = "Receive journal messages over the network"
+DESCRIPTION_${PN}-journal-remote = "systemd-journal-remote is a command to receive serialized journal events and store them to journal files."
+
+SYSTEMD_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', '${PN}-binfmt', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gatewayd', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \
+"
+SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
+
+USERADD_PACKAGES = "${PN} ${PN}-extra-utils \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-gateway', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'microhttpd', '${PN}-journal-remote', '', d)} \
+                    ${@bb.utils.contains('PACKAGECONFIG', 'journal-upload', '${PN}-journal-upload', '', d)} \
+"
+GROUPADD_PARAM_${PN} = "-r systemd-journal;"
+GROUPADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '-r systemd-hostname;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /sbin/nologin systemd-coredump;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--system -d / -M --shell /sbin/nologin systemd-network;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /sbin/nologin systemd-resolve;', '', d)}"
+USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'timesyncd', '--system -d / -M --shell /sbin/nologin systemd-timesync;', '', d)}"
+USERADD_PARAM_${PN}-extra-utils = "--system -d / -M --shell /sbin/nologin systemd-bus-proxy"
+USERADD_PARAM_${PN}-journal-gateway = "--system -d / -M --shell /sbin/nologin systemd-journal-gateway"
+USERADD_PARAM_${PN}-journal-remote = "--system -d / -M --shell /sbin/nologin systemd-journal-remote"
+USERADD_PARAM_${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin systemd-journal-upload"
+
+FILES_${PN}-analyze = "${bindir}/systemd-analyze"
+
+FILES_${PN}-initramfs = "/init"
+RDEPENDS_${PN}-initramfs = "${PN}"
+
+FILES_${PN}-gui = "${bindir}/systemadm"
+
+FILES_${PN}-vconsole-setup = "${rootlibexecdir}/systemd/systemd-vconsole-setup \
+                              ${systemd_unitdir}/system/systemd-vconsole-setup.service \
+                              ${systemd_unitdir}/system/sysinit.target.wants/systemd-vconsole-setup.service"
+
+RDEPENDS_${PN}-kernel-install += "bash"
+FILES_${PN}-kernel-install = "${bindir}/kernel-install \
+                              ${sysconfdir}/kernel/ \
+                              ${exec_prefix}/lib/kernel \
+                             "
+FILES_${PN}-rpm-macros = "${exec_prefix}/lib/rpm \
+                         "
+
+FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions"
+
+FILES_${PN}-binfmt = "${sysconfdir}/binfmt.d/ \
+                      ${exec_prefix}/lib/binfmt.d \
+                      ${rootlibexecdir}/systemd/systemd-binfmt \
+                      ${systemd_unitdir}/system/proc-sys-fs-binfmt_misc.* \
+                      ${systemd_unitdir}/system/systemd-binfmt.service"
+RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc"
+
+RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
+
+
+FILES_${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \
+                                ${systemd_system_unitdir}/systemd-journal-gatewayd.service \
+                                ${systemd_system_unitdir}/systemd-journal-gatewayd.socket \
+                                ${systemd_system_unitdir}/sockets.target.wants/systemd-journal-gatewayd.socket \
+                                ${datadir}/systemd/gatewayd/browse.html \
+                               "
+SYSTEMD_SERVICE_${PN}-journal-gatewayd = "systemd-journal-gatewayd.socket"
+
+FILES_${PN}-journal-upload = "${rootlibexecdir}/systemd/systemd-journal-upload \
+                              ${systemd_system_unitdir}/systemd-journal-upload.service \
+                              ${sysconfdir}/systemd/journal-upload.conf \
+                             "
+SYSTEMD_SERVICE_${PN}-journal-upload = "systemd-journal-upload.service"
+
+FILES_${PN}-journal-remote = "${rootlibexecdir}/systemd/systemd-journal-remote \
+                              ${sysconfdir}/systemd/journal-remote.conf \
+                              ${systemd_system_unitdir}/systemd-journal-remote.service \
+                              ${systemd_system_unitdir}/systemd-journal-remote.socket \
+                             "
+SYSTEMD_SERVICE_${PN}-journal-remote = "systemd-journal-remote.socket"
+
+
+FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \
+                         ${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \
+                         ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \
+                         ${base_bindir}/machinectl \
+                         ${bindir}/systemd-nspawn \
+                         ${nonarch_libdir}/systemd/import-pubring.gpg \
+                         ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \
+                         ${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \
+                         ${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \
+                         ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \
+                         ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \
+                         ${systemd_system_unitdir}/machine.slice \
+                         ${systemd_system_unitdir}/machines.target \
+                         ${systemd_system_unitdir}/org.freedesktop.import1.busname \
+                         ${systemd_system_unitdir}/org.freedesktop.machine1.busname \
+                         ${systemd_system_unitdir}/systemd-importd.service \
+                         ${systemd_system_unitdir}/systemd-machined.service \
+                         ${systemd_system_unitdir}/dbus-org.freedesktop.machine1.service \
+                         ${systemd_system_unitdir}/var-lib-machines.mount \
+                         ${rootlibexecdir}/systemd/systemd-import \
+                         ${rootlibexecdir}/systemd/systemd-importd \
+                         ${rootlibexecdir}/systemd/systemd-machined \
+                         ${rootlibexecdir}/systemd/systemd-pull \
+                         ${exec_prefix}/lib/tmpfiles.d/systemd-nspawn.conf \
+                         ${systemd_system_unitdir}/systemd-nspawn@.service \
+                         ${libdir}/libnss_mymachines.so.2 \
+                         ${datadir}/dbus-1/system-services/org.freedesktop.import1.service \
+                         ${datadir}/dbus-1/system-services/org.freedesktop.machine1.service \
+                         ${datadir}/dbus-1/system.d/org.freedesktop.import1.conf \
+                         ${datadir}/dbus-1/system.d/org.freedesktop.machine1.conf \
+                         ${datadir}/polkit-1/actions/org.freedesktop.import1.policy \
+                         ${datadir}/polkit-1/actions/org.freedesktop.machine1.policy \
+                        "
+
+# "machinectl import-tar" uses "tar --numeric-owner", not supported by busybox.
+RRECOMMENDS_${PN}-container += "\
+                         ${PN}-journal-gatewayd \
+                         ${PN}-journal-remote \
+                         ${PN}-journal-upload \
+                         kernel-module-dm-mod \
+                         kernel-module-loop \
+                         kernel-module-tun \
+                         tar \
+                        "
+
+FILES_${PN}-extra-utils = "\
+                        ${base_bindir}/systemd-escape \
+                        ${base_bindir}/systemd-inhibit \
+                        ${bindir}/systemd-detect-virt \
+                        ${bindir}/systemd-dissect \
+                        ${bindir}/systemd-path \
+                        ${bindir}/systemd-run \
+                        ${bindir}/systemd-cat \
+                        ${bindir}/systemd-delta \
+                        ${bindir}/systemd-cgls \
+                        ${bindir}/systemd-cgtop \
+                        ${bindir}/systemd-stdio-bridge \
+                        ${base_bindir}/systemd-ask-password \
+                        ${base_bindir}/systemd-tty-ask-password-agent \
+                        ${systemd_unitdir}/system/systemd-ask-password-console.path \
+                        ${systemd_unitdir}/system/systemd-ask-password-console.service \
+                        ${systemd_unitdir}/system/systemd-ask-password-wall.path \
+                        ${systemd_unitdir}/system/systemd-ask-password-wall.service \
+                        ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-console.path \
+                        ${systemd_unitdir}/system/sysinit.target.wants/systemd-ask-password-wall.path \
+                        ${systemd_unitdir}/system/multi-user.target.wants/systemd-ask-password-wall.path \
+                        ${rootlibexecdir}/systemd/systemd-resolve-host \
+                        ${rootlibexecdir}/systemd/systemd-ac-power \
+                        ${rootlibexecdir}/systemd/systemd-activate \
+                        ${rootlibexecdir}/systemd/systemd-bus-proxyd \
+                        ${systemd_unitdir}/system/systemd-bus-proxyd.service \
+                        ${systemd_unitdir}/system/systemd-bus-proxyd.socket \
+                        ${rootlibexecdir}/systemd/systemd-socket-proxyd \
+                        ${rootlibexecdir}/systemd/systemd-reply-password \
+                        ${rootlibexecdir}/systemd/systemd-sleep \
+                        ${rootlibexecdir}/systemd/system-sleep \
+                        ${systemd_unitdir}/system/systemd-hibernate.service \
+                        ${systemd_unitdir}/system/systemd-hybrid-sleep.service \
+                        ${systemd_unitdir}/system/systemd-suspend.service \
+                        ${systemd_unitdir}/system/sleep.target \
+                        ${rootlibexecdir}/systemd/systemd-initctl \
+                        ${systemd_unitdir}/system/systemd-initctl.service \
+                        ${systemd_unitdir}/system/systemd-initctl.socket \
+                        ${systemd_unitdir}/system/sockets.target.wants/systemd-initctl.socket \
+                        ${rootlibexecdir}/systemd/system-generators/systemd-gpt-auto-generator \
+                        ${rootlibexecdir}/systemd/systemd-cgroups-agent \
+"
+
+FILES_${PN}-udev-rules = "\
+                        ${rootlibexecdir}/udev/rules.d/70-uaccess.rules \
+                        ${rootlibexecdir}/udev/rules.d/71-seat.rules \
+                        ${rootlibexecdir}/udev/rules.d/73-seat-late.rules \
+                        ${rootlibexecdir}/udev/rules.d/99-systemd.rules \
+"
+
+CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \
+	${sysconfdir}/systemd/journald.conf \
+	${sysconfdir}/systemd/logind.conf \
+	${sysconfdir}/systemd/networkd.conf \
+	${sysconfdir}/systemd/pstore.conf \
+	${sysconfdir}/systemd/resolved.conf \
+	${sysconfdir}/systemd/sleep.conf \
+	${sysconfdir}/systemd/system.conf \
+	${sysconfdir}/systemd/timesyncd.conf \
+	${sysconfdir}/systemd/user.conf \
+"
+
+FILES_${PN} = " ${base_bindir}/* \
+                ${base_sbindir}/shutdown \
+                ${base_sbindir}/halt \
+                ${base_sbindir}/poweroff \
+                ${base_sbindir}/runlevel \
+                ${base_sbindir}/telinit \
+                ${base_sbindir}/resolvconf \
+                ${base_sbindir}/reboot \
+                ${base_sbindir}/init \
+                ${datadir}/dbus-1/services \
+                ${datadir}/dbus-1/system-services \
+                ${datadir}/polkit-1 \
+                ${datadir}/${BPN} \
+                ${datadir}/factory \
+                ${sysconfdir}/dbus-1/ \
+                ${sysconfdir}/modules-load.d/ \
+                ${sysconfdir}/pam.d/ \
+                ${sysconfdir}/profile.d/ \
+                ${sysconfdir}/sysctl.d/ \
+                ${sysconfdir}/systemd/ \
+                ${sysconfdir}/tmpfiles.d/ \
+                ${sysconfdir}/xdg/ \
+                ${sysconfdir}/init.d/README \
+                ${sysconfdir}/resolv-conf.systemd \
+                ${sysconfdir}/X11/xinit/xinitrc.d/* \
+                ${rootlibexecdir}/systemd/* \
+                ${libdir}/pam.d \
+                ${nonarch_libdir}/pam.d \
+                ${systemd_unitdir}/* \
+                ${base_libdir}/security/*.so \
+                /cgroup \
+                ${bindir}/systemd* \
+                ${bindir}/busctl \
+                ${bindir}/coredumpctl \
+                ${bindir}/localectl \
+                ${bindir}/hostnamectl \
+                ${bindir}/resolvectl \
+                ${bindir}/timedatectl \
+                ${bindir}/bootctl \
+                ${bindir}/oomctl \
+                ${exec_prefix}/lib/tmpfiles.d/*.conf \
+                ${exec_prefix}/lib/systemd \
+                ${exec_prefix}/lib/modules-load.d \
+                ${exec_prefix}/lib/sysctl.d \
+                ${exec_prefix}/lib/sysusers.d \
+                ${exec_prefix}/lib/environment.d \
+                ${localstatedir} \
+                ${rootlibexecdir}/modprobe.d/systemd.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.locale1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.network1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf \
+                ${@bb.utils.contains('PACKAGECONFIG', 'polkit_hostnamed_fallback', '${datadir}/dbus-1/system.d/org.freedesktop.hostname1_no_polkit.conf', '', d)} \
+                ${datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.login1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.portable1.conf \
+                ${datadir}/dbus-1/system.d/org.freedesktop.oom1.conf \
+               "
+
+FILES_${PN}-dev += "${base_libdir}/security/*.la ${datadir}/dbus-1/interfaces/ ${sysconfdir}/rpm/macros.systemd"
+
+RDEPENDS_${PN} += "kmod dbus util-linux-mount util-linux-umount udev (= ${EXTENDPKGV}) systemd-udev-rules util-linux-agetty util-linux-fsck"
+RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'serial-getty-generator', '', 'systemd-serialgetty', d)}"
+RDEPENDS_${PN} += "volatile-binds"
+
+RRECOMMENDS_${PN} += "systemd-extra-utils \
+                      udev-hwdb \
+                      e2fsprogs-e2fsck \
+                      kernel-module-autofs4 kernel-module-unix kernel-module-ipv6 kernel-module-sch-fq-codel \
+                      os-release \
+                      systemd-conf \
+"
+
+INSANE_SKIP_${PN} += "dev-so libdir"
+INSANE_SKIP_${PN}-dbg += "libdir"
+INSANE_SKIP_${PN}-doc += " libdir"
+
+RPROVIDES_udev = "hotplug"
+
+RDEPENDS_udev-hwdb += "udev"
+
+FILES_udev += "${base_sbindir}/udevd \
+               ${rootlibexecdir}/systemd/network/99-default.link \
+               ${rootlibexecdir}/systemd/systemd-udevd \
+               ${rootlibexecdir}/udev/accelerometer \
+               ${rootlibexecdir}/udev/ata_id \
+               ${rootlibexecdir}/udev/cdrom_id \
+               ${rootlibexecdir}/udev/collect \
+               ${rootlibexecdir}/udev/fido_id \
+               ${rootlibexecdir}/udev/findkeyboards \
+               ${rootlibexecdir}/udev/keyboard-force-release.sh \
+               ${rootlibexecdir}/udev/keymap \
+               ${rootlibexecdir}/udev/mtd_probe \
+               ${rootlibexecdir}/udev/scsi_id \
+               ${rootlibexecdir}/udev/v4l_id \
+               ${rootlibexecdir}/udev/keymaps \
+               ${rootlibexecdir}/udev/rules.d/50-udev-default.rules \
+               ${rootlibexecdir}/udev/rules.d/60-autosuspend.rules \
+               ${rootlibexecdir}/udev/rules.d/60-autosuspend-chromiumos.rules \
+               ${rootlibexecdir}/udev/rules.d/60-block.rules \
+               ${rootlibexecdir}/udev/rules.d/60-cdrom_id.rules \
+               ${rootlibexecdir}/udev/rules.d/60-drm.rules \
+               ${rootlibexecdir}/udev/rules.d/60-evdev.rules \
+               ${rootlibexecdir}/udev/rules.d/60-fido-id.rules \
+               ${rootlibexecdir}/udev/rules.d/60-input-id.rules \
+               ${rootlibexecdir}/udev/rules.d/60-persistent-alsa.rules \
+               ${rootlibexecdir}/udev/rules.d/60-persistent-input.rules \
+               ${rootlibexecdir}/udev/rules.d/60-persistent-storage.rules \
+               ${rootlibexecdir}/udev/rules.d/60-persistent-storage-tape.rules \
+               ${rootlibexecdir}/udev/rules.d/60-persistent-v4l.rules \
+               ${rootlibexecdir}/udev/rules.d/60-sensor.rules \
+               ${rootlibexecdir}/udev/rules.d/60-serial.rules \
+               ${rootlibexecdir}/udev/rules.d/61-autosuspend-manual.rules \
+               ${rootlibexecdir}/udev/rules.d/64-btrfs.rules \
+               ${rootlibexecdir}/udev/rules.d/70-joystick.rules \
+               ${rootlibexecdir}/udev/rules.d/70-mouse.rules \
+               ${rootlibexecdir}/udev/rules.d/70-power-switch.rules \
+               ${rootlibexecdir}/udev/rules.d/70-touchpad.rules \
+               ${rootlibexecdir}/udev/rules.d/75-net-description.rules \
+               ${rootlibexecdir}/udev/rules.d/75-probe_mtd.rules \
+               ${rootlibexecdir}/udev/rules.d/78-sound-card.rules \
+               ${rootlibexecdir}/udev/rules.d/80-drivers.rules \
+               ${rootlibexecdir}/udev/rules.d/80-net-setup-link.rules \
+               ${rootlibexecdir}/udev/rules.d/90-vconsole.rules \
+               ${sysconfdir}/udev \
+               ${sysconfdir}/init.d/systemd-udevd \
+               ${systemd_unitdir}/system/*udev* \
+               ${systemd_unitdir}/system/*.wants/*udev* \
+               ${base_bindir}/systemd-hwdb \
+               ${base_bindir}/udevadm \
+               ${base_sbindir}/udevadm \
+               ${libexecdir}/${MLPREFIX}udevadm \
+               ${datadir}/bash-completion/completions/udevadm \
+               ${systemd_unitdir}/system/systemd-hwdb-update.service \
+              "
+
+FILES_udev-hwdb = "${rootlibexecdir}/udev/hwdb.d \
+                   "
+
+RCONFLICTS_${PN} = "tiny-init ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolvconf', '', d)}"
+
+INITSCRIPT_PACKAGES = "udev"
+INITSCRIPT_NAME_udev = "systemd-udevd"
+INITSCRIPT_PARAMS_udev = "start 03 S ."
+
+python __anonymous() {
+    if not bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
+        d.setVar("INHIBIT_UPDATERCD_BBCLASS", "1")
+}
+
+python do_warn_musl() {
+    if d.getVar('TCLIBC') == "musl":
+        bb.warn("Using systemd with musl is not recommended since it is not supported upstream and some patches are known to be problematic.")
+}
+addtask warn_musl before do_configure
+
+ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}"
+
+ALTERNATIVE_TARGET[resolv-conf] = "${sysconfdir}/resolv-conf.systemd"
+ALTERNATIVE_LINK_NAME[resolv-conf] = "${sysconfdir}/resolv.conf"
+ALTERNATIVE_PRIORITY[resolv-conf] ?= "50"
+
+ALTERNATIVE_TARGET[halt] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[halt] = "${base_sbindir}/halt"
+ALTERNATIVE_PRIORITY[halt] ?= "300"
+
+ALTERNATIVE_TARGET[reboot] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[reboot] = "${base_sbindir}/reboot"
+ALTERNATIVE_PRIORITY[reboot] ?= "300"
+
+ALTERNATIVE_TARGET[shutdown] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[shutdown] = "${base_sbindir}/shutdown"
+ALTERNATIVE_PRIORITY[shutdown] ?= "300"
+
+ALTERNATIVE_TARGET[poweroff] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[poweroff] = "${base_sbindir}/poweroff"
+ALTERNATIVE_PRIORITY[poweroff] ?= "300"
+
+ALTERNATIVE_TARGET[runlevel] = "${base_bindir}/systemctl"
+ALTERNATIVE_LINK_NAME[runlevel] = "${base_sbindir}/runlevel"
+ALTERNATIVE_PRIORITY[runlevel] ?= "300"
+
+pkg_postinst_${PN}_libc-glibc () {
+	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
+		-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
+		-i $D${sysconfdir}/nsswitch.conf
+}
+
+pkg_prerm_${PN}_libc-glibc () {
+	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
+		-e '/^hosts:/s/\s*myhostname//' \
+		-i $D${sysconfdir}/nsswitch.conf
+}
+
+PACKAGE_WRITE_DEPS += "qemu-native"
+pkg_postinst_udev-hwdb () {
+	if test -n "$D"; then
+		$INTERCEPT_DIR/postinst_intercept update_udev_hwdb ${PKG} mlprefix=${MLPREFIX} binprefix=${MLPREFIX} rootlibexecdir="${rootlibexecdir}" PREFERRED_PROVIDER_udev="${PREFERRED_PROVIDER_udev}"
+	else
+		udevadm hwdb --update
+	fi
+}
+
+pkg_prerm_udev-hwdb () {
+	rm -f $D${sysconfdir}/udev/hwdb.bin
+}