From 4ed311eaf7cc0c8529cb2ec25a5dcfe2631b15ee Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Tue, 21 Mar 2023 08:12:58 -0400 Subject: packagegroup-core-security: refactor the inclusion of krill Signed-off-by: Armin Kuster --- recipes-core/packagegroup/packagegroup-core-security.bb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-core/packagegroup/packagegroup-core-security.bb b/recipes-core/packagegroup/packagegroup-core-security.bb index 22c1245..b009a4d 100644 --- a/recipes-core/packagegroup/packagegroup-core-security.bb +++ b/recipes-core/packagegroup/packagegroup-core-security.bb @@ -40,16 +40,16 @@ RDEPENDS:packagegroup-security-utils = "\ sshguard \ firejail \ ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "pam", "google-authenticator-libpam krill", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "pam", "google-authenticator-libpam", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "pax", "pax-utils packctl", "",d)} \ " -RDEPENDS:packagegroup-security-utils:append:x86 = " chipsec" -RDEPENDS:packagegroup-security-utils:append:x86-64 = " chipsec" -RDEPENDS:packagegroup-security-utils:remove:mipsarch = "firejail krill" +have_krill = "${@bb.utils.contains("DISTRO_FEATURES", "pam", "krill", "",d)}" +RDEPENDS:packagegroup-security-utils:append:x86 = " chipsec ${have_krill}" +RDEPENDS:packagegroup-security-utils:append:x86-64 = " chipsec ${have_krill}" +RDEPENDS:packagegroup-security-utils:append:aarch64 = " ${have_krill}" +RDEPENDS:packagegroup-security-utils:remove:mipsarch = "firejail" RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill" -RDEPENDS:packagegroup-security-utils:remove:riscv64 = "krill" -RDEPENDS:packagegroup-security-utils:remove:armv7ve = " krill" SUMMARY:packagegroup-security-scanners = "Security scanners" RDEPENDS:packagegroup-security-scanners = "\ -- cgit v1.2.3-54-g00ecf