Skip to contentSkip to conversation

packagegroup-core-security: only include firejail x86-64 and arch64

PATCH New Armin Kuster 1 participant 2 messages Jun 30, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 packagegroup-core-security: only include firejail x86-64 and arch64

---
 recipes-core/packagegroup/packagegroup-core-security.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
recipes-core/packagegroup/packagegroup-core-security.bb +2 -4
index 494745b..3ef77e5 100644
@@ -40,7 +40,6 @@ RDEPENDS:packagegroup-security-utils = "\
     pinentry \
     softhsm \
     sshguard \
-    firejail \
     ${@bb.utils.contains_any("TUNE_FEATURES", "riscv32 ", "", " libseccomp",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "pam", "google-authenticator-libpam", "",d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "pax", "pax-utils packctl", "",d)} \
@@ -48,9 +47,8 @@ RDEPENDS:packagegroup-security-utils = "\
 
 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:append:x86-64 = " firejail chipsec ${have_krill}"
+RDEPENDS:packagegroup-security-utils:append:aarch64 = " firejail ${have_krill}"
 RDEPENDS:packagegroup-security-utils:remove:libc-musl = "krill"
 
 SUMMARY:packagegroup-security-scanners = "Security scanners"
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 firejail: only allow x86-64 and arm64 to build

---
 recipes-security/Firejail/firejail_0.9.72.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-security/Firejail/firejail_0.9.72.bb +2 -1
index 12a3105..5713f46 100644
@@ -59,6 +59,7 @@ pkg_postinst_ontarget:${PN} () {
     ${libdir}/${BPN}/fseccomp memory-deny-write-execute ${libdir}/${BPN}/seccomp.mdwx
 }
 
-COMPATIBLE_MACHINE:mips64 = "(!.*mips64).*"
+COMPATIBLE_MACHINE:x86_64 = "x86_64"
+COMPATIBLE_MACHINE:arm64 = "arch64"
 
 RDEPENDS:${PN} = "bash"
Signature · 1 line
2.34.1