]> code.ossystems Code Review - openembedded-core.git/commitdiff
iputils: Fix build determinism
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 Feb 2020 23:34:46 +0000 (23:34 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 8 Feb 2020 13:36:46 +0000 (13:36 +0000)
The suid/setcap code depends on whether setcap is on the host system or not
with suid as a fallback. Disable this functionality to be deterministic.

(From OE-Core rev: 8b00ec484fb851c301f13145e17707c0167feab1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-extended/iputils/iputils_s20190709.bb

index 3f9e9917f0b9ee7dcc3a09067861caa24a5e4603..42260f531ef168829f3722e568161f5cfec29ddc 100644 (file)
@@ -32,7 +32,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN
 
 inherit meson update-alternatives
 
-EXTRA_OEMESON += "--prefix=${root_prefix}/"
+# Have to disable setcap/suid as its not deterministic
+EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true"
 
 ALTERNATIVE_PRIORITY = "100"