From nobody Sat Apr 22 20:14:27 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 4Q3jKc3gNSz46DqT; Sat, 22 Apr 2023 20:14:28 +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 4Q3jKb6wpdz3HmK; Sat, 22 Apr 2023 20:14:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682194468; 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=0rl0NpJKu09UMX5ihvDGHZaP0RzPD2eMqHE1Z3/QWMM=; b=OKCGD70mzJw0OdY1j67srZcvJHTrvUGWuL8sBYbbP4w7xFmeMgElJ41Zjgbi/29c0d2sJj +SrsMDk8ZTQBuMxEPMR2KU8OKKW5Vb03HxJ1xLUZkQe6IlssFxwDVhtxpYGLfp3Q1GdLUk agSnS+Bn8IBlxQYOmoUGJM9WG+PKbsG4cb2kGZIoJBjamKUr/G+Mmf7TLSrDWVjpdOGnTm NMg82yREuVR67ckEwqy1QLHosF49DeCLccHKt2vOUk1Bql3vGNpWZPIlGYfoX7Y1qcJjjD UVgqAbZU6LFUCv8/uPjPTiTFSph8jJET3mSe6Cwp7VRibuKIRB3N7MFhhID/eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682194468; 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=0rl0NpJKu09UMX5ihvDGHZaP0RzPD2eMqHE1Z3/QWMM=; b=v7cHvVmWwmjvM3zFYtNQlgBaWX9obHxmCZP74V+YaIMDEmr5doZ+HR6nFlA6ZQWpcvu4m/ 75Uyk2dfwJqFpSMvXwPHZVky8XFJTh+4tF4h1pmlRWAgoXB/s2exkh8ylQ/+SafHqlNu3a 4H6eeHY70H+SN8s2OmgQMvKYkCME5FCu0VV8ulK+SZFNpSccIzKfjspTuYTEarJpUc7HsU i5CMJkrZZjmkKKWiT+Da/pyc2HPTEHC4gzEQuvcL9oLzBDFqPkhopl+/jOLoiq66DJ5GSg UBogl7jNDnC4nr4xSxTC+K9oUrAkFl8j7l1PBymaZMFHHfoY331NrVvCN++kaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682194468; a=rsa-sha256; cv=none; b=HzgCQdpXoSWWPNwF8ZCJLG2U5g0xtvRNLez2AUoTI8VayfD2ZoXVEs+RpjPzwO2S2eWIXB Tmx5NpS9eULfouVLIaPWkM3YJD92fPzeUhSokbtP4dN3yB9C68aJGHHrbeJJDnZSvwNUJQ 4JiNccVCsvrEefiaOQOUvOI70t8dXODQqN+4WP1tb6XSiSFyoZWMiAlqkvJOzFr78qQB4i NX+TATApPGxR8e9JnuIvpWhv96JdJXG3Q/uNNAr0B/iRzZu6F3Syz1Q6+Yd2QFapsoDb1d WL15iZl8DLWx1lz+8Z+Ag8c9haji8Nw/OCqVwzfHqgJAVDW0iMbgEcQZooJFrA== 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 4Q3jKb5fhRzG0l; Sat, 22 Apr 2023 20:14:27 +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 33MKER5M083342; Sat, 22 Apr 2023 20:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MKERAc083341; Sat, 22 Apr 2023 20:14:27 GMT (envelope-from git) Date: Sat, 22 Apr 2023 20:14:27 GMT Message-Id: <202304222014.33MKERAc083341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 188bf8876fdc - main - Build host tools on non-FreeBSD host with DIRDEPS_BUILD 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: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 188bf8876fdc6e3edebeb76f80e764e419a65f1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=188bf8876fdc6e3edebeb76f80e764e419a65f1e commit 188bf8876fdc6e3edebeb76f80e764e419a65f1e Author: Simon J. Gerraty AuthorDate: 2023-04-22 20:13:22 +0000 Commit: Simon J. Gerraty CommitDate: 2023-04-22 20:13:22 +0000 Build host tools on non-FreeBSD host with DIRDEPS_BUILD Add Makefile.depend.options to libnetbsd, mkimg and makefs to ensure libegacy is build if needed. targets/pseudo/stage/Makefile avoid the need for mtree the staging process creates target dirs as needed anyway. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39757 --- lib/libnetbsd/Makefile.depend.options | 6 ++++++ targets/pseudo/host-tools/Makefile | 1 + targets/pseudo/host-tools/Makefile.depend.host | 7 +++++++ targets/pseudo/stage/Makefile | 16 ++++++++++++++++ usr.bin/mkimg/Makefile.depend.host | 11 +++++++++++ usr.bin/mkimg/Makefile.depend.options | 6 ++++++ usr.sbin/makefs/Makefile.depend.host | 12 ++++++++++++ usr.sbin/makefs/Makefile.depend.options | 6 ++++++ 8 files changed, 65 insertions(+) diff --git a/lib/libnetbsd/Makefile.depend.options b/lib/libnetbsd/Makefile.depend.options new file mode 100644 index 000000000000..4dcc6c412671 --- /dev/null +++ b/lib/libnetbsd/Makefile.depend.options @@ -0,0 +1,6 @@ +DIRDEPS_OPTIONS = host_egacy + +DIRDEPS.host_egacy.yes = tools/build + +.include + diff --git a/targets/pseudo/host-tools/Makefile b/targets/pseudo/host-tools/Makefile new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/targets/pseudo/host-tools/Makefile @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/targets/pseudo/host-tools/Makefile.depend.host b/targets/pseudo/host-tools/Makefile.depend.host new file mode 100644 index 000000000000..3be07061c202 --- /dev/null +++ b/targets/pseudo/host-tools/Makefile.depend.host @@ -0,0 +1,7 @@ +DIRDEPS= \ + usr.bin/mkimg \ + usr.bin/tar \ + usr.sbin/makefs \ + +.include + diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile index ed3217d9f743..3a17f8a2e648 100644 --- a/targets/pseudo/stage/Makefile +++ b/targets/pseudo/stage/Makefile @@ -4,6 +4,7 @@ # distrib-dirs can be done in STAGE_OBJTOP all: +.if ${.MAKE.OS} == "FreeBSD" # mtree makes a lot of noise if we are not root, # we don't need to see it. stage-distrib-dirs: .META ${META_DEPS} @@ -11,6 +12,21 @@ stage-distrib-dirs: .META ${META_DEPS} INSTALL="sh ${SRCTOP}/tools/install.sh" ${.MAKE} -C ${SRCTOP}/etc \ distrib-dirs -DNO_FSCHG -DWITH_TESTS DESTDIR=${STAGE_OBJTOP} +.else +std_dirs= \ + /bin \ + /etc \ + /sbin \ + /usr/bin \ + /usr/include/sys \ + /usr/lib \ + /usr/sbin \ + +stage-distrib-dirs: .META + mkdir -p ${std_dirs:@d@${STAGE_OBJTOP}$d@} + +.endif + .include .if ${.MAKE.LEVEL} > 0 && ${MK_STAGING} == "yes" diff --git a/usr.bin/mkimg/Makefile.depend.host b/usr.bin/mkimg/Makefile.depend.host new file mode 100644 index 000000000000..f80275d86ab1 --- /dev/null +++ b/usr.bin/mkimg/Makefile.depend.host @@ -0,0 +1,11 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.bin/mkimg/Makefile.depend.options b/usr.bin/mkimg/Makefile.depend.options new file mode 100644 index 000000000000..4dcc6c412671 --- /dev/null +++ b/usr.bin/mkimg/Makefile.depend.options @@ -0,0 +1,6 @@ +DIRDEPS_OPTIONS = host_egacy + +DIRDEPS.host_egacy.yes = tools/build + +.include + diff --git a/usr.sbin/makefs/Makefile.depend.host b/usr.sbin/makefs/Makefile.depend.host new file mode 100644 index 000000000000..858c2f2c11ec --- /dev/null +++ b/usr.sbin/makefs/Makefile.depend.host @@ -0,0 +1,12 @@ +# $FreeBSD$ +# Autogenerated - do NOT edit! + +DIRDEPS = \ + lib/libnetbsd \ + + +.include + +.if ${DEP_RELDIR} == ${_DEP_RELDIR} +# local dependencies - needed for -jN in clean tree +.endif diff --git a/usr.sbin/makefs/Makefile.depend.options b/usr.sbin/makefs/Makefile.depend.options new file mode 100644 index 000000000000..4dcc6c412671 --- /dev/null +++ b/usr.sbin/makefs/Makefile.depend.options @@ -0,0 +1,6 @@ +DIRDEPS_OPTIONS = host_egacy + +DIRDEPS.host_egacy.yes = tools/build + +.include +