commit 80d41842d41c701edac5b2c768da574f260fa6a3
author Andrew Geissler <geissonator@yahoo.com> Mon Sep 11 08:36:15 2023 -0400
committer Andrew Geissler <geissonator@yahoo.com> Mon Sep 11 08:36:15 2023 -0400
tree 7d58015c844bd241f3c1737b1af0d4b53dfe8c67
parent fc7e7973f3119e2bad511209aa336537dc5ffbed

Revert "subtree updates"

Needs to go through CI

This reverts commit fc7e7973f3119e2bad511209aa336537dc5ffbed.

meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh

diff --git a/meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh b/meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
index 65999d0..d2c6dc0 100755
--- a/meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
+++ b/meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh
@@ -42,9 +42,7 @@
 cat <<EOCONF >>conf/local.conf
 BB_NUMBER_THREADS = "6"
 PARALLEL_MAKE = "-j 6"
-# unmerged-usr is deprecated
-# https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/
-DISTRO_FEATURES:append = " systemd usrmerge"
+DISTRO_FEATURES:append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit"
 VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"