From a7f7272dcacdcf30174358876da1b278e5258a39 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 29 Aug 2023 11:13:00 +0100 Subject: [PATCH] ci: Add usrmerge to distro features unmerged-usr was deprecated upstream[1]. Follow up with our CI builds. [1] https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/ Signed-off-by: Andrei Gherzan --- .../workflows/docker-images/yocto-builder/entrypoint-build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh index d2c6dc0..65999d0 100755 --- a/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh +++ b/.github/workflows/docker-images/yocto-builder/entrypoint-build.sh @@ -42,7 +42,9 @@ printf "\n# ------ ci ------\n" >> conf/local.conf cat <>conf/local.conf BB_NUMBER_THREADS = "6" PARALLEL_MAKE = "-j 6" -DISTRO_FEATURES:append = " systemd" +# unmerged-usr is deprecated +# https://lore.kernel.org/all/3f2f03085301d22854e5429019fb010f27d98bc7.camel@linuxfoundation.org/t/ +DISTRO_FEATURES:append = " systemd usrmerge" VIRTUAL-RUNTIME_init_manager = "systemd" DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"