From nobody Thu Jun 29 19:02:59 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 4QsSWm1Dxrz4kTB0; Thu, 29 Jun 2023 19:03:00 +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 4QsSWm0p9xz4LtX; Thu, 29 Jun 2023 19:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688065380; 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=U43N3VctwbgeTIM+uzxrM+KwXTbtMtcscnCBd/ms11M=; b=Qj1s5Lfr7hoPPfxbEIe+Kz09CqO1tHdpcfKydXoi3haH2mGCfeLipkyX5jbsnteaQH3Dt0 CfTtSJjZale3oXvABbcG3N1dRWYAhdXt8yUiVbjrGjbJirPHeMa2Gggnajy8jn8ay24OwZ Ag63vgJV0+AExn0+ROzNytqnKsaKdCwACFfylG04r2NbWtAfXwHIk0srNBtIlkuvaciJTi zJUfFX5g9k5+kU4EpqwNB1PwaCevTNnqAv+ofpFQr3OGLQmlZQgtq82l3uP+SBO43kHuwG t3t7ktlcbICjLy4zBQBNQ8hBQZvnrhhiujEz+iJ2/j+ACWfs8WSQkMt0h4BWBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688065380; 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=U43N3VctwbgeTIM+uzxrM+KwXTbtMtcscnCBd/ms11M=; b=cWyIwkzj0VnoGgUom+2pPhgFZ7X5BdwZdKjv6sMwxlml6eT5yCi7zpdHbnauLqwTa3Nl9T UCBmXoaLnKzKXckeQZU2KRX+vSwvTHc/QHV6QNkPuP2nC2BU84HpeUjF7gQWpdmzr6/nMO 0VnQnmv6/lHQmXitEAlQitnQKXWP5XrxLLaBSqEFdyGcHGptgzecphso8/cnorxe5k9YyT kv4PECAGZVoH0PB6oXgcg9liIviOXF46MNuo5qLVfnb+J2j4vBiyDM9HeqRY5KJKIT+tP1 NDLJt0jfB3ZSQpEMaGnso3PbVdr+HuUXchbkUDD9KaaHlkpL64eKu/9i9OhyWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688065380; a=rsa-sha256; cv=none; b=azgbuKQ0f9Vwbb1DGH/r6on5vuB5dW64vdFbiS/VklMuFtv1KO4l4jthrA7uIpWP5lUnHy dcmQjhymH1J/YP/udiv2CXWoVWkbAUlsxtXf2bpOjRlmJ+75TFy/VzFtvhZh9C5RBVOC2P Pe+fzGXDeIK95h+GTboIu2PT1KqGwyP/xIid80Dej70EBURqtpGVPRNI2c6Zag4DcF5vo2 tkt/qUB1GZI2wzugpvDBwt0G+o27bhuzknm7BKpLoygf3njUdI4vWpZx/Y1TZ5qWDGdQ4w 2p49d1xE6JAmQCBg+fxEtqEpmVjwPzCu6AnHNNvrtTxYFmInDmPwACupnMOGRA== 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 4QsSWl6yzjzSTF; Thu, 29 Jun 2023 19:02:59 +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 35TJ2xx8051213; Thu, 29 Jun 2023 19:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35TJ2xYs051212; Thu, 29 Jun 2023 19:02:59 GMT (envelope-from git) Date: Thu, 29 Jun 2023 19:02:59 GMT Message-Id: <202306291902.35TJ2xYs051212@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: 84c84ae15b31 - main - BOOT_MACHINE_DIR should be stand not boot 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: 84c84ae15b31e71375a9f713432cd69265a21fe7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84c84ae15b31e71375a9f713432cd69265a21fe7 commit 84c84ae15b31e71375a9f713432cd69265a21fe7 Author: Simon J. Gerraty AuthorDate: 2023-06-29 19:02:27 +0000 Commit: Simon J. Gerraty CommitDate: 2023-06-29 19:02:27 +0000 BOOT_MACHINE_DIR should be stand not boot Reviewed by: stevek --- share/mk/local.sys.dirdeps.env.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk index fdc03cae29eb..bbac39935ad8 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -13,14 +13,14 @@ TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX} # some corner cases -BOOT_MACHINE_DIR.amd64 = boot/i386 +BOOT_MACHINE_DIR.amd64 = stand/i386 .-include ALL_MACHINE_LIST?= ${TARGET_MACHINE_LIST} .for m in ${ALL_MACHINE_LIST:O:u} -BOOT_MACHINE_DIR.$m ?= boot/$m +BOOT_MACHINE_DIR.$m ?= stand/$m .endfor HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET}