mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-01-11 15:00:34 +00:00
Code Issues Projects Releases Wiki Activity

packagegroup-core-security: unify conditional adding of packages on RISCV

Browse Source 
The package choice was using TUNE_FEATURES that doesn't work anymore
with multiple sub-architectures of RISCV. Instead use the overrides
and make sure to take into account also qemu versions.

Only riscv32/riscv64 does not work, fail on RDEPEND for qemu targets.

Signed-off-by: Marta Rybczynska <marta.rybczynska@ygreky.com>
This commit is contained in:
Marta Rybczynska
2025-07-16 05:48:02 +02:00
parent b82a936797
commit aa7213378a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
recipes-core/packagegroup/packagegroup-core-security.bb
View File

@@ -51,13 +51,23 @@ RDEPENDS:packagegroup-security-utils:append:x86-64 = " firejail chipsec ${have_k
RDEPENDS:packagegroup-security-utils:append:aarch64 = " firejail ${have_krill}" RDEPENDS:packagegroup-security-utils:append:aarch64 = " firejail ${have_krill}"
RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill firejail" RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill firejail"
ARPWATCH = "arpwatch"
ARPWATCH:riscv32 = ""
ARPWATCH:riscv64 = ""
ARPWATCH:qemuriscv64 = ""
CLAMAV = "clamav clamav-daemon clamav-freshclam"
CLAMAV:riscv32 = ""
CLAMAV:riscv64 = ""
CLAMAV:qemuriscv64 = ""
SUMMARY:packagegroup-security-scanners = "Security scanners" SUMMARY:packagegroup-security-scanners = "Security scanners"
RDEPENDS:packagegroup-security-scanners = "\ RDEPENDS:packagegroup-security-scanners = "\
${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " arpwatch",d)} \ ${ARPWATCH} \
chkrootkit \ chkrootkit \
isic \ isic \
${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 riscv64", "", " clamav clamav-daemon clamav-freshclam",d)} \ ${CLAMAV} \
" "
RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "clamav clamav-daemon clamav-freshclam" RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "clamav clamav-daemon clamav-freshclam"
RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "arpwatch" RDEPENDS:packagegroup-security-scanners:remove:libc-musl = "arpwatch"