[Buildroot] [PATCH] toolchain/toolchain-wrapper: explicitly set Build ID to none if BR2_REPRODUCIBLE
Yann E. MORIN
yann.morin.1998 at free.fr
Fri Aug 16 21:12:40 UTC 2019
Atharva, All,
On 2019-08-16 22:33 +0530, Atharva Lele spake thusly:
> Build ID is added to binaries at link time. Building in different output
> directories causes some packages to have different Build IDs, thus resulting in
> non-reproducibility.
>
> Adding "-Wl,--build-id=none" fixes this issue by disabling setting of Build ID.
>
> Diffoscope output for Build ID issue: https://gitlab.com/snippets/1886180/raw
>
> After this patch, build is reproducible - i.e. diffoscope does not produce any
> output.
>
> Signed-off-by: Atharva Lele <itsatharva at gmail.com>
> ---
> toolchain/toolchain-wrapper.c | 3 +++
> toolchain/toolchain-wrapper.mk | 4 ++++
> 2 files changed, 7 insertions(+)
>
> diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c
> index 7a4b9c4007..f7f2a9ec97 100644
> --- a/toolchain/toolchain-wrapper.c
> +++ b/toolchain/toolchain-wrapper.c
> @@ -98,6 +98,9 @@ static char *predef_args[] = {
> #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN)
> "-EB",
> #endif
> +#ifdef BR2_REPRODUCIBLE
> + "-Wl,--build-id=none",
One thing I forgot in my previous review: --build-id has been supported
only since binutils 2.18, released 12 years ago now (20017-08-28).
I'm not sure if some oldish toolchains are still using this version, and
if so, whether we want to support those or not...
Regards,
Yann E. MORIN.
> +#endif
> #ifdef BR_ADDITIONAL_CFLAGS
> BR_ADDITIONAL_CFLAGS
> #endif
> diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk
> index 970bde76a0..21fc08f3ee 100644
> --- a/toolchain/toolchain-wrapper.mk
> +++ b/toolchain/toolchain-wrapper.mk
> @@ -59,6 +59,10 @@ else ifeq ($(BR2_RELRO_FULL),y)
> TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL
> endif
>
> +ifeq ($(BR2_REPRODUCIBLE),y)
> +TOOLCHAIN_WRAPPER_ARGS += -DBR2_REPRODUCIBLE
> +endif
> +
> define TOOLCHAIN_WRAPPER_BUILD
> $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \
> -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \
> --
> 2.22.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list