aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-11-16 11:48:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-12-04 17:14:37 +0000
commiteb3360c13fe4e803621f5b06e8d8a09211fd7da4 (patch)
treeee49a968c23d21f6b0801184a8503ce8bc51bb08
parent95f9a8ba58c6b790dd9aeea4e88148fbcdd7500c (diff)
downloadopenembedded-core-eb3360c13fe4e803621f5b06e8d8a09211fd7da4.zip
openembedded-core-eb3360c13fe4e803621f5b06e8d8a09211fd7da4.tar.gz
openembedded-core-eb3360c13fe4e803621f5b06e8d8a09211fd7da4.tar.bz2
sudo: improve reproducibility
Delete various build host references from the internally generated file sudo_usage.h. The references get compiled into executables, which leads to non-reproducible builds. The removed references (configure options) were only used as part of the sudo "usage", and even then only when ran as root. Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 090eb9efdb2204673b1d569582813ea8860c8570) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-extended/sudo/sudo.inc6
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 8c16d83..80ec0ae 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -27,6 +27,12 @@ EXTRA_OECONF_append_libc-musl = " --disable-hardening "
# mksigname/mksiglist are used on build host to generate source files
do_compile_prepend () {
+ # Remove build host references from sudo_usage.h
+ sed -i \
+ -e 's,--with-libtool-sysroot=${STAGING_DIR_TARGET},,g' \
+ -e 's,--build=${BUILD_SYS},,g' \
+ -e 's,--host=${HOST_SYS},,g' \
+ ${B}/src/sudo_usage.h
oe_runmake SSP_CFLAGS="" SSP_LDFLAGS="" CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" CPPFLAGS="$BUILD_CPPFLAGS -I${S}/include -I${S} -I${B}" -C lib/util mksigname mksiglist
}