Date: Mon, 6 Mar 2023 13:51:00 GMT From: Ed Maste <emaste@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: d8644a5d2458 - stable/13 - Enable kernel reproducible builds on stable branch Message-ID: <202303061351.326Dp0Vh056259@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8644a5d2458588dd7d8e44bd23c6cacaead19b7 commit d8644a5d2458588dd7d8e44bd23c6cacaead19b7 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2023-03-06 13:50:33 +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 --- share/man/man5/src.conf.5 | 10 +++++----- sys/conf/kern.opts.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 62439ee77a41..b7ea2be546ab 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd March 2, 2023 +.Dd March 6, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1437,10 +1437,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 a6e0a48d3272..2f452b432f42 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -43,6 +43,7 @@ __DEFAULT_YES_OPTIONS = \ NETGRAPH \ OFED \ PF \ + REPRODUCIBLE_BUILD \ SCTP_SUPPORT \ SOURCELESS_HOST \ SOURCELESS_UCODE \ @@ -57,8 +58,7 @@ __DEFAULT_NO_OPTIONS = \ INIT_ALL_PATTERN \ INIT_ALL_ZERO \ KERNEL_RETPOLINE \ - RATELIMIT \ - REPRODUCIBLE_BUILD + RATELIMIT # Some options are totally broken on some architectures. We disable # them. If you need to enable them on an experimental basis, you
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303061351.326Dp0Vh056259>