From nobody Mon Mar 06 13:51:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PVg2r6DDGz3wwGH; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PVg2r5QYQz3NdC; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/LC2TCAkgKkFLPiCrFr+jQl/tODLdreFL6TDvOCg4I=; b=fIUcwJjjt09H9UzS2dfxFU7QCCu1X0byFcySgYs2/sbGucefOdLCCj2gWTx7pVljHPqM+b pec+Lok0unciDfkgTfHbPNaO3QsSNDmO1qoHcBDUzhTiO3wYGWpv5/iX3PBYV+C5PBoatt bXCFEipSbTx0M6kfhIPEZmYbTaYED2Zp98B0FY9pSvFw/4yIC6AH6kPuqgAhquZlyUSvaW iVHvKHEOuxpniT8rKnH9mBH7LufN1zafHjmRvAygSXNg70S4QFbI11BvIy2ChZLqFPvS/x Dt71vjmRRggeL+/H5IpFkJJb77PCzvLRvIWvBBKZqBmlpPJQqM9kuqM7x6E2iQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678110660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P/LC2TCAkgKkFLPiCrFr+jQl/tODLdreFL6TDvOCg4I=; b=ZHfQHUfWG0JSJp4fIqDy3xlnNR6Ht20heEPffMz0+ThFfSgPolR/m/0y6RgMWMmCbbwKIe yW+cr8Apy4eHmTEM2JBLvpJ59yLphHPXXKTL7Ag0AXPWuOPLyKkgsfsifFuN0pXkuUKD5t VWh7qkrR+8pUQVs9fYUtQk2cEwWpjC1RGdXOaQzTVQLkxFUNp4Ii3NXlnKqkCtzp47PsDA vAmZxRfESw7nTiOEDsQa2vxYczV7C/dz8DQ4KSveUR2DlBMORKy6KZRdGOVEn/Fptwbp2X 7NP2WL3++hPDaPxahcAbdmtJSYndbE73WGV3yoWuz/RNrEE+fQXL7KcYG5/zpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678110660; a=rsa-sha256; cv=none; b=Y24vfguYTUdJhkoRA70agL9QekXIkGXG/u00FThUjBfrOnV4X8+TKIUQoQNJVtCGwSrkn7 keFlxzEvpt+U4JHPM7+xveG9D8V9ibvGMyFn7w13E+4ro0HUEdUzz5lKglMqrXbrZDCa+c ew9HuaXGDlFlWNjOrMeeYdu7Hl8DvVgSD+8XVuc0+hhU82EnvXohYa9bs4q0VgM+2HDNYR Kq7kyszawc8fhHfzawVCDlJkK9hRe300QP2k+mnwgjHeTo5k2uhXCVIVqEcpiu9rO0+XMs N7HJ5Lds1vra54C9Z89TXZR43ki141/XArKtuzka3ZqE0UAGgaEcGJ+tTqtr8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PVg2r4Wjsz14V5; Mon, 6 Mar 2023 13:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326Dp0s2056260; Mon, 6 Mar 2023 13:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326Dp0Vh056259; Mon, 6 Mar 2023 13:51:00 GMT (envelope-from git) Date: Mon, 6 Mar 2023 13:51:00 GMT Message-Id: <202303061351.326Dp0Vh056259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d8644a5d2458 - stable/13 - Enable kernel reproducible builds on stable branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8644a5d2458588dd7d8e44bd23c6cacaead19b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8644a5d2458588dd7d8e44bd23c6cacaead19b7 commit d8644a5d2458588dd7d8e44bd23c6cacaead19b7 Author: Ed Maste AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Ed Maste 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