From nobody Sat Jan 14 17:20:09 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 4NvQ5j6M3Wz2sXnF; Sat, 14 Jan 2023 17:20:09 +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 4NvQ5j5D3gz3x7x; Sat, 14 Jan 2023 17:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673716809; 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=lCVq+ytfmsYr7Xg9kEcR40EKYQIcEFv4ZXvsVqxRDHM=; b=CEQUgXkcnR9F2PBCS0s0pWYzQ1gTpMd/cU2bm1mU243kA2dWp1P2rQbqpljrspB0M6P35K PJFDnqNK1xVoLpjJ5dj6LOWluOC1blEFQlnQ/1S4rLIqYuT1WXYI9pEyKRyNNT2v1wrWAc 2nZFFqByq3mVCZmZHdfVMkNdcZj4p2+iLpx1qerRAuulddqiIDbYe+r9dd0B+GsNgEDCad xnlKM9MP5YtYwm6V6K2huVjemt+AXVDmYCF42uN4POJbwCPujQTbNha0hweFULrWVy9I9r kMGkJ5IVR4ZFvp/uBvtZYyh+ddSbzBp2ktFyxn+Ey87yLWdJaIuc81M4ok05Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673716809; 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=lCVq+ytfmsYr7Xg9kEcR40EKYQIcEFv4ZXvsVqxRDHM=; b=VzGQb5g0gne4SaFbbwEa33DNh/De9ObynGIO0X0CYN5S4ltQcpgYj4wYJ5kiDbT/LN4BuH Jng4AoFZBVDv3t9Op0CCIdR5Fm8RuTR/Eq3jv0+74NSHXE528F0cd5yu4EFQLgGNjU61Gm I3cdjHLd28Ml32gAr+GcZ1DhsHEQAJQe2FTweqNbebs84inIyFsyuKWVo7S7GPLoKy6gae hjHrsXoxCAryhaYtU7UvnwhtAGIr7KYXS5sOo03DwLWK+OikQcSc3/0lcFOA2D5Zdaxt10 WP20Xwptz/5R1KlFs2wjIJxugfwa04/PIE+E2nBoYedVJaG86kBUF7nvKvAWAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673716809; a=rsa-sha256; cv=none; b=HH9WR5UWsopR0AmEnizCBnoztuH/3Qj4nYx8XpW0lsbXFb6wGPC97NhELf4SUk7oKCejLT QsaxUosFdkvl2bAUI1mZ9ZTbZ5k3CPgFNWGpTZLTE6eBqQWs2pszRXQHxcWuG5EfnmLAdj oAAQTw/nGaG7ZCdctPT7TkEYlB3J1NRnA5DSnj4VIxr6KOoyX5acd+bVk3oOo58TAFhGLe 1jwXKcTlvQh8e1VJ8aPG3mNM6CY2jY4csDFocqAlKYgOvoB1wXnYDGERTEn16s52GbBVQx NnlE3ZH46m5PUqBK4kZn/sGU9T/LI1aA7b5a7Xpx0mrrjGEjMwh7X9wVIpXn0g== 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 4NvQ5j4KxrzvSh; Sat, 14 Jan 2023 17:20:09 +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 30EHK9J5050970; Sat, 14 Jan 2023 17:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EHK9BL050967; Sat, 14 Jan 2023 17:20:09 GMT (envelope-from git) Date: Sat, 14 Jan 2023 17:20:09 GMT Message-Id: <202301141720.30EHK9BL050967@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 4a158fc030b5 - main - depend-cleanup.sh: handle zic moving one level up. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a158fc030b5a31efdbad8b30c9a859df553ae3c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4a158fc030b5a31efdbad8b30c9a859df553ae3c commit 4a158fc030b5a31efdbad8b30c9a859df553ae3c Author: Dag-Erling Smørgrav AuthorDate: 2023-01-13 18:09:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-14 17:17:22 +0000 depend-cleanup.sh: handle zic moving one level up. MFC after: 1 week Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D38044 --- tools/build/depend-cleanup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 195162d3efc8..64213d9c00f1 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -110,3 +110,9 @@ fi # 20221115 42d10b1b56f2 move from rs.c to rs.cc clean_dep usr.bin/rs rs c + +# 20230110 bc42155199b5 usr.sbin/zic/zic -> usr.sbin/zic +if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then + echo "Removing old zic directory" + rm -rf "$OBJTOP"/usr.sbin/zic/zic +fi