From nobody Mon Sep 8 21:11:03 2025 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 4cLKPM72rTz6764P; Mon, 08 Sep 2025 21:11:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cLKPM6Zgjz476N; Mon, 08 Sep 2025 21:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757365863; 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=/9girdayTOby2pUYDPljfkFZS4o1z0bqVHC6jQZ/08I=; b=yxD5DDZqXn4f15PcehoBElveeR46GRoJRMjgg7lvOxX+IQJf5xz2zoyphVK6CvNzn/+9nq HN1LFS9SwVw1CSDpfM5WONRTJ4lyR0JBnS2N9Re8wta+tYO9kWmMGhct0vDrksh5wHjItI nFf/PbpFrioN04nf9+V8m5pWyfVN2SekxY0zVDhkEJfOtYwXW9VBWHbJADwg4NpIT1LeHj QgM+9zmS9xBW74ZFYIUihmZtg6QoKp4mzWpUhwJitfgvtKRjrkIlGhOnjICHWfLTWawGrr YHfezHR+NHLFk/KG+iK4Iw+EG+2TnryDdACFtLalHLyWEUdc3S3g6M2242Xu2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757365863; 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=/9girdayTOby2pUYDPljfkFZS4o1z0bqVHC6jQZ/08I=; b=uPSwUmM+voCEpQ8qxcXQBEbf0bxtJsdGycsyWScdbzgsglfBwkp9hy60OJ9FQQ1RENpqUe 7rZ906hujxLZ/tSALD5QRb9C0DnsbIUhmQZzTF3PEWIgQxQVrBST+vjcdEZVgn7LRydXzh OndIXydzVCHGqUwpeLEnFWLMlYdQNc9jQshs85T5zuVhrJ2pSBDGfAVqgljCAgZht78GeF wOP6ECIayyRBdAYkjaWdXYwvptDmg3IQiBZ5frQ/Caywdt05VxkZLh7k2bNFNHDdPRqKCQ +jdc3wfCSXtQ5FDQofF3Cg2cSJg/7YEoyA8ITfZn8UhyArQaB+ctYfcqW66dmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757365863; a=rsa-sha256; cv=none; b=jyuKJL7axx8jncZxB0qi51w2ZqOPCsL0qpzv2dDYNqdMsIrvh6uNs0DCOWh9pSYziOfPpV /XCnLae2otDSmNRKR+hsLREaygIG0hIkUInTpw99Dpxam8JhnJNl6V+1O6QGO6GCouMV2E bFABnnkubD1wvtxARlQZdbWTKU1sBNGEJcCGibP/XTEDR1FCJx0ns7ZY85ERQqNzBJibDO uaaZy5swGwGlzSQL0jjC0nyw0mfA/Gy6lU3yNVS8SwSLBUxe6uOHxTsagVjuNTqvWx1Qco MsjlABVExV3ieti4CiN3XXHMhPmxqzyprSFpmsORMM0vwWYybPXK+ljeqd+d5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cLKPM65ynz1LfF; Mon, 08 Sep 2025 21:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 588LB3ta028717; Mon, 8 Sep 2025 21:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 588LB32k028714; Mon, 8 Sep 2025 21:11:03 GMT (envelope-from git) Date: Mon, 8 Sep 2025 21:11:03 GMT Message-Id: <202509082111.588LB32k028714@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 7626ba028089 - stable/15 - src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 7626ba028089b97b5bb204b5203ee8fa24f63c48 Auto-Submitted: auto-generated The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7626ba028089b97b5bb204b5203ee8fa24f63c48 commit 7626ba028089b97b5bb204b5203ee8fa24f63c48 Author: Mark Johnston AuthorDate: 2025-09-07 15:44:53 +0000 Commit: Mark Johnston CommitDate: 2025-09-08 20:56:37 +0000 src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list It was added to the list in bsd.opts.mk in commit 4f81c42fbd76, so should have been removed here. On stable/15, this also fixes a problem in commit 6e7cc49f94cf ("Make stable/15 a stable branch"), which made REPRODUCIBLE_BUILD a default-yes option. It modified src.opts.mk instead of bsd.opts.mk. This change modifies the latter accordingly. Reported by: cperciva Approved by: re (cperciva) Fixes: 4f81c42fbd76 ("share/mk: Substitute reproducible prefixes in dwarf info") MFC after: 3 days Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. (cherry picked from commit b2f5dc591ef2547ee2e9b68e58a263cd34948db1) --- share/mk/bsd.opts.mk | 2 +- share/mk/src.opts.mk | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 439924d0d596..2251b499ffdc 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -65,6 +65,7 @@ __DEFAULT_YES_OPTIONS = \ NLS \ OPENSSH \ RELRO \ + REPRODUCIBLE_BUILD \ SSP \ TESTS \ TOOLCHAIN \ @@ -78,7 +79,6 @@ __DEFAULT_NO_OPTIONS = \ CCACHE_BUILD \ CTF \ INSTALL_AS_USER \ - REPRODUCIBLE_BUILD \ RETPOLINE \ RUN_TESTS \ STALE_STAGED \ diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index fe71796d2270..fe4b027a9a1e 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -163,7 +163,6 @@ __DEFAULT_YES_OPTIONS = \ QUOTAS \ RADIUS_SUPPORT \ RBOOTD \ - REPRODUCIBLE_BUILD \ RESCUE \ ROUTED \ SENDMAIL \