From nobody Sun Jan 29 23:53:12 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 4P4p6K0SSgz3bMtX; Sun, 29 Jan 2023 23:53:13 +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 4P4p6J5jWVz43tc; Sun, 29 Jan 2023 23:53:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036392; 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=PnkMD3a3ngsE9QI6YvQ3oPDUzKHk4P/Db4w8ko3tcVI=; b=CSvWjWIcRJpFJofxAznSnPD02dcgrq+ZAzG5GLiFHmgveINJE+8UhQHqwHz61ihkD84+ss knQ3tIK2obekP8LMnnoQdlqVLWw3V+mzh6U/IsVAtb9ck+e2DsPpC0mSdaCacrdHKGbKJi b/NNgY5sA61qxgBkLEDdpe54hxdGYDjT8vvqHx8Neu43Yl5LqlUC04dt06tqNdPFZ+s2DT m/dcMIc3hFdWQlpHbvTgkVeG+Qfp2dDKbmjrhJxubFcMrPz/1+SuWsq/rEljYxmwI4kQUG 3mnkTaII+oR1qCaoY7/LcqZ4tnlrq35rTvVE0j4AS98HrpHZ1z/jBcJKjDCQKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675036392; 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=PnkMD3a3ngsE9QI6YvQ3oPDUzKHk4P/Db4w8ko3tcVI=; b=wLm0F/YD0eo0kde2/ttq1aXDo0zyJYlHud+RXhVElbJf2XuwL27MFLb7xAyn6cflBCZxap YiUaC2hGUXliwN+8K2PHMGl7f2wepSuXRbus9Hx6cD3bctXok2wyvoducMt9T6v0RLwEpN vwaSyQFE6G30gVUaKsBGhV0OTms2XaAwLt2oRboC8x1DWAmwrqQgZpUWdODu/Bq/DsUBnh eYA6JTuue7XvMwM8RzUrHej3Coyq8QcKVBkP9TzY5dphdd6H0hYrezhKqezQrldd/VSmWv u8roai3k3eDbyfqABQoTjhJh7CSCAuqLQ4SSmCBe5LjIlCITw3uuYy9IGhvIyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675036392; a=rsa-sha256; cv=none; b=qYmPCS1zhZvSJR8If6lUU1SscxK0ZCjUiQjddS0H33bdZDO03lOZoC2tetuDpbqwwaGGDt qBjBbvRs85Q4EsC2cpU6v1VISKYeWmhvgr0Eno/VkXxwKqS1SXp2sm/0G88ZIQrdjwy6Wq iVRYqFt7sHRC44xtJUiv1Dm7KI8tHwYe85TXccn5DOM3kg9z3STAuNcLcC2zCUhZ8V0IQI 2QeL2ciY90HLbvSlCbYI6VCKFiGsnYIY2ZyWJy0wsVOwOUb7eTce6WztUVZV49awNJwGbQ 8UYvJ3mSgVaSNETmY3ovfFpyao1k+kb/WIN8Y/6FRCZakeZwKE2ICNV5bqBaAw== 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 4P4p6J4Z16zng4; Sun, 29 Jan 2023 23:53:12 +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 30TNrCF2020502; Sun, 29 Jan 2023 23:53:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30TNrCiE020501; Sun, 29 Jan 2023 23:53:12 GMT (envelope-from git) Date: Sun, 29 Jan 2023 23:53:12 GMT Message-Id: <202301292353.30TNrCiE020501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: d4fdfd3f9077 - main - Makefile.inc1: Restore adding tzsetup to _basic_bootstrap_tools 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4fdfd3f9077216e52f38f7364974959c9e43168 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d4fdfd3f9077216e52f38f7364974959c9e43168 commit d4fdfd3f9077216e52f38f7364974959c9e43168 Author: Jessica Clarke AuthorDate: 2023-01-29 23:51:30 +0000 Commit: Jessica Clarke CommitDate: 2023-01-29 23:53:04 +0000 Makefile.inc1: Restore adding tzsetup to _basic_bootstrap_tools ITOOLS is only the list of programs to make a copy of during install, it doesn't cause anything to be bootstrapped. Thus, by removing tzsetup from _basic_bootstrap_tools, we end up without it on non-FreeBSD, and so we error out trying to copy it to INSTALLTMP. Note that _basic_bootstrap_tools is only used for BOOTSTRAP_ALL_TOOLS (which is why zic was moved away from it). Should tzsetup evolve such that the host version is insufficient on older FreeBSD it can be moved to be more like zic, but that seems unnecessary for what is likely to remain a simple tool. This partially reverts commit 7a4a520064cb7fbff79560113682d6fe1a1ae9ee. Fixes: 7a4a520064cb ("Fix cross-build from STABLE or older CURRENT.") --- Makefile.inc1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index dfc9cb8d07fc..7c82c2bfa763 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2446,6 +2446,11 @@ _basic_bootstrap_tools+=usr.bin/jot _basic_bootstrap_tools+=sbin/md5 .endif +# tzsetup is needed as an install tool +.if ${MK_ZONEINFO} != "no" +_basic_bootstrap_tools+=usr.sbin/tzsetup +.endif + .if defined(BOOTSTRAP_ALL_TOOLS) _other_bootstrap_tools+=${_basic_bootstrap_tools} .for _subdir _links in ${_basic_bootstrap_tools_multilink}