From nobody Fri May 3 22:24:32 2024 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 4VWQMh5yLhz5JfRd; Fri, 3 May 2024 22:24:32 +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 4VWQMh5Sj7z4cdT; Fri, 3 May 2024 22:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714775072; 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=iQP7rrRaK+3ALi3D4yztrG8IroS7wXBworHhfRmdov8=; b=u1dmR6u4FVj/EvvnVY+U8W8BoJQ5O77WcAkp3hP1rlYNs/wLB8aUkvtE3cesavb7L+khHm xRTFPK6B26qOYVEicLgm78FNhFYi5m4+pszuOG6ydUXYtwiHMoW+VPFDdtnNubAFQ8pooA IRnr2dmaqe9vCdHJ7h9iRAYwlxZmKQy3+OudPtwQzpqCfyyuHDKYCIuuXJKzxtvLttE4WF YmnyIuB4K/u4teaO7CoWHDwVxuOAg3FUaIjFSlXHTRxmC3IkjET3ywyzrxvBeFkKsGCQKY S0nm0QuB/Is4zPArp/QfBJR9weV9w8SSXehMzR26PP5ExqOXnltI9p1MjJQWfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714775072; a=rsa-sha256; cv=none; b=WTT3KIYtn7jRN1i0Y3clLc3qsuXB+BqHHhp1mgQbLoa6iGnOTd43TxJ+YS0nPrMQ416KYD U4wFJDz1xIsqSO8bHy95nPY2geLy7SdFjvtxnYgFTDQm6p53kwvZwStJg7aqkXRHhdvpqL sYqslSCfbe4ZEU75Jm59pNiCXGxCMqQesb29/nb/+xbnf5RRKcX2r18ezy/VHe+2ELbsE6 e3GcmX7Rv3k9WdXjGmlsgvumkusVzqskUI6JVLKZE02Bxcp07s65hBpCwFGSCqBqu7Rkhm Vq76V1/Ft3tQP47Z6V/caXhPFfSsb5tk4dV8Uo7M+WmcWFCflUqFsvKGa12d4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714775072; 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=iQP7rrRaK+3ALi3D4yztrG8IroS7wXBworHhfRmdov8=; b=lgRfRdxQtdiO5WjKhYMJzvCZVtNIWn7R8EdEa7OlPkkHxFDvgOhALYPG0CbV0c0ZA33nGo Hcb7azBs0NZqancmlj1TohR+h//w85G6hiKd8BccV/B1carLv7WSqeqNeZIPGThbf9riUs QDSOnblJN2NiVS3j+PEpnlYw/3QA+jW+NE+wzHMquYkFHPcvAP0A0lAlEIXTathV0fZGX6 122Q2gbxpd0nyl56MfolebPFPqclJkooHcL2xovLnZRIk6v20zFfsDVhvK5CLVtB16WhGy k4Wtwb7sa41jQ6cOo60HBNcpttE/EnKsvFi+MoYNwGCuSWnIQ3AGL53AFG5APg== 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 4VWQMh53wBz1464; Fri, 3 May 2024 22:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 443MOWsn032201; Fri, 3 May 2024 22:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443MOWSM032198; Fri, 3 May 2024 22:24:32 GMT (envelope-from git) Date: Fri, 3 May 2024 22:24:32 GMT Message-Id: <202405032224.443MOWSM032198@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 25c2d762af7a - releng/14.1 - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 25c2d762af7a47bcc2291145f096bf316893159c Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=25c2d762af7a47bcc2291145f096bf316893159c commit 25c2d762af7a47bcc2291145f096bf316893159c Author: Ed Maste AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Colin Percival 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