Date: Fri, 3 May 2024 22:24:32 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 25c2d762af7a - releng/14.1 - Enable kernel reproducible builds on stable branch Message-ID: <202405032224.443MOWSM032198@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=25c2d762af7a47bcc2291145f096bf316893159c commit 25c2d762af7a47bcc2291145f096bf316893159c Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-05-03 22:23:27 +0000 Enable kernel reproducible builds on stable branch When the stable/13 branch was created the userland knob (in share/mk/src.opts.mk) was changed to default to yes, but the kernel default was not changed. These two should always have the same default. Regenerate src.conf.5, as the differing defaults previously confused `makeman`. Fixes: bfd15705156b ("Create the stable/13 branch") Sponsored by: The FreeBSD Foundation Approved by: re (cperciva) (cherry picked from commit d8644a5d2458588dd7d8e44bd23c6cacaead19b7) (cherry picked from commit 3a8e15354ec58abeec2ee2fe96cbabb46083d183) --- share/man/man5/src.conf.5 | 8 ++++---- sys/conf/kern.opts.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 4bb38fe61a77..3a7789a95a07 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1506,10 +1506,10 @@ Do not apply the Relocation Read-Only (RELRO) vulnerability mitigation. See also the .Va BIND_NOW option. -.It Va WITH_REPRODUCIBLE_BUILD -Exclude build metadata (such as the build time, user, or host) -from the kernel, boot loaders, and uname output, so that builds produce -bit-for-bit identical output. +.It Va WITHOUT_REPRODUCIBLE_BUILD +Include build metadata (such as the build time, user, and host) +in the kernel, boot loaders, and uname output. +Successive builds will not be bit-for-bit identical. .It Va WITHOUT_RESCUE Do not build .Xr rescue 8 . diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index f8bedab700b4..de32da2acebb 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -46,6 +46,7 @@ __DEFAULT_YES_OPTIONS = \ NETGRAPH \ OFED \ PF \ + REPRODUCIBLE_BUILD \ SCTP_SUPPORT \ SOURCELESS_HOST \ SOURCELESS_UCODE \ @@ -60,7 +61,6 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_ZERO \ KERNEL_RETPOLINE \ RATELIMIT \ - REPRODUCIBLE_BUILD \ VERIEXEC # Some options are totally broken on some architectures. We disable
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405032224.443MOWSM032198>