[meta-security][wrynose][PATCH 01/13] firejail: fix COMPATIBLE_MACHINE setting
Scott Murray <[email protected]>
| Newsgroups | org.yoctoproject.lists.yocto-patches |
|---|---|
| Message-ID | <a289f2287818930a3386401db529a6b01f7bde20.1779625557.git.scott.murray@konsulko.com> |
From: Li Zhou <[email protected]> Because "x86_64" and "arm64" aren't valid in bitbake OVERRIDES, they should be corrected to "x86-64" and "aarch64". On the other side, "x86_64" and "arch64" aren't valid MACHINE name. So correct the way to "only allow x86-64 and arm64 to build": COMPATIBLE_MACHINE = "(-)" => disallow all machine first COMPATIBLE_MACHINE:aarch64 = "(.*)" => when arch "aarch64" in OVERRIDES, allow all machines. COMPATIBLE_MACHINE:x86-64 = "(.*)" => when arch "x84-64" in OVERRIDES, allow all machines. Fix 1dd076d3a76f ("firejail: only allow x86-64 and arm64 to build") Signed-off-by: Li Zhou <[email protected]> Signed-off-by: Scott Murray <[email protected]> --- recipes-security/Firejail/firejail_0.9.72.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes-security/Firejail/firejail_0.9.72.bb b/recipes-security/Firejail/firejail_0.9.72.bb index cf0190d..746f788 100644 --- a/recipes-security/Firejail/firejail_0.9.72.bb +++ b/recipes-security/Firejail/firejail_0.9.72.bb @@ -57,7 +57,8 @@ pkg_postinst_ontarget:${PN} () { ${libdir}/${BPN}/fseccomp memory-deny-write-execute ${libdir}/${BPN}/seccomp.mdwx } -COMPATIBLE_MACHINE:x86_64 = "x86_64" -COMPATIBLE_MACHINE:arm64 = "arch64" +COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE:aarch64 = "(.*)" +COMPATIBLE_MACHINE:x86-64 = "(.*)" RDEPENDS:${PN} = "bash" -- 2.53.0