diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2023-09-11 15:36:15 +0300 |
| commit | 80d41842d41c701edac5b2c768da574f260fa6a3 (patch) | |
| tree | 7d58015c844bd241f3c1737b1af0d4b53dfe8c67 /meta-raspberrypi/.github | |
| parent | fc7e7973f3119e2bad511209aa336537dc5ffbed (diff) | |
| download | openbmc-80d41842d41c701edac5b2c768da574f260fa6a3.tar.xz | |
Revert "subtree updates"
Needs to go through CI
This reverts commit fc7e7973f3119e2bad511209aa336537dc5ffbed.
Diffstat (limited to 'meta-raspberrypi/.github')
| -rwxr-xr-x | meta-raspberrypi/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh | 4 |
1 files changed, 1 insertions, 3 deletions
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 65999d0cf7..d2c6dc0ea7 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 @@ printf "\n# ------ ci ------\n" >> conf/local.conf 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" |