[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8243/8267] sudo: improve reproducibility



commit b472addc93b55360325ff6504cf2adc8cab83fbc
Author: Juro Bystricky <juro bystricky intel com>
Date:   Thu Nov 16 11:48:50 2017 -0800

    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.
    
    (From OE-Core rev: eb3360c13fe4e803621f5b06e8d8a09211fd7da4)
    
    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>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-extended/sudo/sudo.inc |    6 ++++++
 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
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]