From nobody Fri May 3 22:22:43 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 4VWQKb6yKXz5JdqF; Fri, 3 May 2024 22:22:43 +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 4VWQKb6QK8z4cYG; Fri, 3 May 2024 22:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714774963; 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=k4qqqKKVu1JXzdhPNsOURNbAyS+9QcWZZsymzoCZ/cs=; b=i4nxLr1BWgzfAhFTY+uOvGj5EaFvevYUAoTVTMc7M/jl7XFBdlUUWVtZdiRh7Nh6oIiY+M Uc4463VE5kufmBiZskID4ibMq3PMmkrlzTS1mzKiXCHROkdeB5ToCbRpJPHg6kpH7xTZLg ZvIy2E4dCHbbvVsDsFrLq+bqDqDiMBG/yNE1cUy6DHqxzOhlB/hgJ+MSiQsYut4Wp7oWrH h8Mg+m03io28+b0IJyo+boRKkrpqA04Phb2wgQfh/i+y4LlcaCNPtQOYjlX0/3ES+lOJeR 8WD+9BU6aOPLrlwHSoXmR9hV6kix1TPEvYFGh3VEkb8G/BTFp66fsKqoj7+KpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714774963; a=rsa-sha256; cv=none; b=pyrOW0hsq2dmg9EuyT0Pigao0Zg3y2aGXrP2Nn6FVap4QIqaDkK8aspCTg1tdwbFe8JhSe tH5KNoC7P6eR/FF03Rkl1LUXkI34iq/s/X1aerTRvNUgBzuIe0P7//gAP2K8q8CGqcKCVB TDKBEOm52uHqKqp7E6wAHsvCxVW5M3MgdH4HByLOrgsiKvSHgx485+g3AjqvuaF+il4whD Z+ZDQnBCXXZQuwZZK34FIQStO3PZzYcvzua8AJuEMsXAGfd6Ib5TtqjSrNltYhbv0jBLVC NNpdCrrb8S5naUq/anO1RSQf48MB31SR/EufdDVyO2P3KZIIW3dH0a++66g6ig== 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=1714774963; 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=k4qqqKKVu1JXzdhPNsOURNbAyS+9QcWZZsymzoCZ/cs=; b=uz0rRdNcoztB9zlZRylP+y2bz46NJwl/iQFoqeHbRXd0/+DpFOOqKRxmizqFuZy3khWT9y 7wNJiWG5Ikr6HrpN9mrPonBPvCoMElTGv/pW7Le1/PoXsif3O7DRbR4mOPg+W/0dIVRkmU AQrOYoo0S8j85SZ9x2sK07cKAzbZ38VTmoo1Jh4KCY/bZgpJwdFDTzAYB3EoBRCbIjgdeZ cfpClC+GMf66iwFcdwfwElJfn//IaVY53Mg9W9Z7gmz4/B7/+OH7xpYqnk3+Mh1ASgOK3s 0jNm0Tqx/cKBMIf5TlcKe/QP4jfpPAAWJbwNKCh34Nl3XbCf5mP9wft8Aole8Q== 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 4VWQKb5vjPz13Fk; Fri, 3 May 2024 22:22:43 +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 443MMhMq031812; Fri, 3 May 2024 22:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 443MMhRa031809; Fri, 3 May 2024 22:22:43 GMT (envelope-from git) Date: Fri, 3 May 2024 22:22:43 GMT Message-Id: <202405032222.443MMhRa031809@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: 3a8e15354ec5 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 3a8e15354ec58abeec2ee2fe96cbabb46083d183 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8e15354ec58abeec2ee2fe96cbabb46083d183 commit 3a8e15354ec58abeec2ee2fe96cbabb46083d183 Author: Ed Maste AuthorDate: 2023-03-06 13:38:17 +0000 Commit: Colin Percival CommitDate: 2024-05-03 22:22:16 +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 MFS from: stable/13 MFS to: releng/14.1 (cherry picked from commit d8644a5d2458588dd7d8e44bd23c6cacaead19b7) --- 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