From 4a28460712f11cad8c7b6e7eb26fdf330ba62eaa Mon Sep 17 00:00:00 2001 From: Niko Mauno Date: Thu, 3 Nov 2022 09:29:53 +0000 Subject: [PATCH] systemd: Consider PACKAGECONFIG in RRECOMMENDS Since RRECOMMENDS declaration implictly induces building the recipes that provide the runtime recommended packages, conditionalize adding such values according to associated PACKAGECONFIG settings in order to avoid redundant building. (From OE-Core rev: 1859eaba8638549b2dc5d6ab3ae3c0b3793eac67) Signed-off-by: Niko Mauno Signed-off-by: Alexandre Belloni (cherry picked from commit a1989add927f7805378fe4d5afbde780b747ba77) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/systemd/systemd_251.4.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_251.4.bb b/meta/recipes-core/systemd/systemd_251.4.bb index 87668cadc7..1b771a7b86 100644 --- a/meta/recipes-core/systemd/systemd_251.4.bb +++ b/meta/recipes-core/systemd/systemd_251.4.bb @@ -437,9 +437,9 @@ FILES:${PN}-binfmt = "${sysconfdir}/binfmt.d/ \ ${rootlibexecdir}/systemd/systemd-binfmt \ ${systemd_system_unitdir}/proc-sys-fs-binfmt_misc.* \ ${systemd_system_unitdir}/systemd-binfmt.service" -RRECOMMENDS:${PN}-binfmt = "kernel-module-binfmt-misc" +RRECOMMENDS:${PN}-binfmt = "${@bb.utils.contains('PACKAGECONFIG', 'binfmt', 'kernel-module-binfmt-misc', '', d)}" -RRECOMMENDS:${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" +RRECOMMENDS:${PN}-vconsole-setup = "${@bb.utils.contains('PACKAGECONFIG', 'vconsole', 'kbd kbd-consolefonts kbd-keymaps', '', d)}" FILES:${PN}-journal-gatewayd = "${rootlibexecdir}/systemd/systemd-journal-gatewayd \