From nobody Thu Jun 08 18:14:22 2023 X-Original-To: dev-commits-src-main@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 4QcXRL4VgZz4cFfj; Thu, 8 Jun 2023 18:14:22 +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 4QcXRL3jmQz3ymm; Thu, 8 Jun 2023 18:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686248062; 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=UgMBfOGKFqmQfzDjGukigXR8ynOrU1cb+QEUCWLffi8=; b=HnomlKl2QNNXoi3/d7oo8YjHucxWEU2IJzzGZugjJeFBvrecC+1bqPfcjIsRSiYG8yGFIA Exi3hpCs8Suf14GpgAnZrRCEFB7/f5qrPehvdZAzDWKgs48EETozLRblt6l5G2W6vhlkE7 pCMALrUW1GCnoOtTBnywTBg+64rVkAIS04GF1hFfmoEEPEGWe7rzONhYAIMbu+n66jWO4m PKMjuAkIRIBZvGLvLIAnqSxbTob8BN2SzqWL1I0eiJ2J3ma2ZclKmKA/Dtlj/ccmYWV6MH tpNAV/Zxuxtq2b41T1b+4apbYWOdMcHWthAzgYpTaJa/OTsj/WsAvZRt7yhpBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686248062; 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=UgMBfOGKFqmQfzDjGukigXR8ynOrU1cb+QEUCWLffi8=; b=vp0l03VZdhsaLmAEfd6NZX0qHmDmwLaniuWIwnW/zx0L6VTJyfjAtDSJGgsQTWJhBdDSlB zmcsEGdgkuNFjKcz/bJsQ0Epaz0A3COkquX0aO6GZUUdTQcfrg5Qa1Ow1dHrgzAmcw7n+J A1IqGHbNYGhyJIBhKUDOdHHbiK7A8Goe0MMfXCcB23pcQ09aLjIddKibPzko77WYyO+cy2 yD7j3HKBrjS1BZFiT6I6AOVbhV1m1oQFNvhtlQaRk5V0r+8hWmnfL+DVZApQfj4hqNs6Nf WzadL33ldFT3uleI829s8tbBwJMDV079qabmQ+L1RjDtTxGeAKWkL8QncMS11g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686248062; a=rsa-sha256; cv=none; b=T+8OM/qQdHoPO4Lkg3gfWOMrfhj6zNw+UTSs6H8nQSj6CMrY/MBIXSSjFr7XccoxVOG/Go 8Is3YxdsF3aOQGjgF5SzO7jbxq0qf2VX8ClO4LsMttnO/GlL5VAfq6VYqsjP3jeqjURtDX lRIlNB/tPmuSHR7ou5AA19Eiokm59ST99TzVeKlBi7EK6Z5m+iPAaybJjJ048AGH8fidze JVK8S914LgLYLA12rBhvYSF1kscoyL4zAQRD7EFynPGDiKMiD7AcsBsg+NCJvGUuVql9c7 GFIREBojRPcC2o3msMKHKSzdZ762kulwNoSzfAyGt1av8Ysqy8Hws0Qkp9bMdw== 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 4QcXRL2qXhz13l9; Thu, 8 Jun 2023 18:14:22 +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 358IEMBk031942; Thu, 8 Jun 2023 18:14:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 358IEMeG031941; Thu, 8 Jun 2023 18:14:22 GMT (envelope-from git) Date: Thu, 8 Jun 2023 18:14:22 GMT Message-Id: <202306081814.358IEMeG031941@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: dfa1982352ee - main - etc: Don't create stray directories in NO_ROOT distrib-dirs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: dfa1982352ee312079b42ea49adcbc1da15722f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=dfa1982352ee312079b42ea49adcbc1da15722f7 commit dfa1982352ee312079b42ea49adcbc1da15722f7 Author: Jessica Clarke AuthorDate: 2023-06-08 16:00:50 +0000 Commit: Jessica Clarke CommitDate: 2023-06-08 18:14:12 +0000 etc: Don't create stray directories in NO_ROOT distrib-dirs The loop above is responsible for creating the actual directories, whilst this one is just responsible for creating the corresponding METALOG. Since DESTDIR already includes DISTBASE, this results in creating a second set of roots (one per MTREES entry) within DISTBASE whenever DISTBASE is non-empty, such as base/base, base/base/var, base/base/usr, etc. in the distributeworld case. This is purely cosmetic though as they won't appear in the METALOG. --- etc/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/Makefile b/etc/Makefile index 4e28739268e6..528e348d6139 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -146,7 +146,6 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY d=${_d}; \ test "$$d" = "/" && d=""; \ d=${DISTBASE}$$d; \ - test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ ${MTREE_FILTER} $$m | \