From nobody Sat Dec 14 20:58:55 2024 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 4Y9dq356l1z5glrb; Sat, 14 Dec 2024 20:58:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9dq32h4Bz4L52; Sat, 14 Dec 2024 20:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734209935; 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=H0JxZSJ7V/x6iMxs6VO5reEaEHKm6YCb7k9Mfe7KFAY=; b=R9ggjGKkYF0+nYLh02DEvIW37l/A2wetRbIHfVn/E2y6FU5BBS7yJWRDC7Ux5ylJUu/os3 /isLB6y4TLYYlvAi1pKcHc3nUUA6dvgvDIZ4A7sI/OfLw3L6Nbfp14jLlA25ZcX/IUz4fA 3zxG8k9kRaBJbk+BrvgXtcgSPvK36P0ndbGuw317jxsoKEDqlN/O40bsxUwDGK8osrAinh EbV6PZXDDb65fTROVZXDAEi3h7I+WJ0O8WYKjTrHWpiH2T3P0ZS1TaRu5Am9rTr4pMNFeH tLMS4B1qVBISplYfKXJCSlIt8t1eeb3fGs4eVSqyrtJXiZ5usFGNuzZOvadFtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734209935; 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=H0JxZSJ7V/x6iMxs6VO5reEaEHKm6YCb7k9Mfe7KFAY=; b=B8NV6u5BxyqgWh2C0tiaJnOSq45nttrxqEFA5XCfuTeaOfhh+gouVlmgix2ZMZdOjdUnwP YdKgIWf86lKLlo+vkHmlD85MvrLjL/SvMLm4IGeITSFabkMCwHelRCurPWh3bxnQuMnuc2 I5h5wn2mSHdIFC1ShVxUJGHHidKMVauA0TRLnkb38oHbRukSaZLQNt5ZdEHW08a8LolmJE tBnHEwSO0jRnvP1RfRiR7QChChjXdDYRHbQIFwm+0rGIrlmtiRArcYXSELY2yDlyTZq7pS X9sYIB1NVeYa2fkA77nf2CxAU5mI8ILKABgyPPwnMPnneFsvso2PZb5MZDQBvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734209935; a=rsa-sha256; cv=none; b=N13fpP2gmXayYOTsvJmPr8IOhXqSkm1YOY16XV/vbXUiNq80jj061FCe/4alFrU1gdZkjd uRmeMmeBf+Lf36PLJGM1yy5ASOoab840SEclOOS0c7QoHOVo3iMyYljySlQSiOL5+jRAdo 2O6h7pQf5OCwLf2cg9KaKKkEZ7AzAEPQERynaJ8vq8hPM9eaCL/r7woHZuUpLfDDNWPyPr CWOLtBzDZiIRKcPABKexQ+1ow7r3oEG4u4BO9izW3WdxT3SDOiau5GrBUD+q4KckDf4y+W QmnaqHs9ALwK0ewE2j3tF0DR3vhM9eZH4DUU6X93p9APF5YhmRYz9YFzUm92Ig== 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 4Y9dq328g5zdZ9; Sat, 14 Dec 2024 20:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BEKwtHN076405; Sat, 14 Dec 2024 20:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEKwtbi076402; Sat, 14 Dec 2024 20:58:55 GMT (envelope-from git) Date: Sat, 14 Dec 2024 20:58:55 GMT Message-Id: <202412142058.4BEKwtbi076402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d69498623c0 - main - depend-cleanup: Fix test arg 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d69498623c0eced2de0f97cd553aff81a936911 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d69498623c0eced2de0f97cd553aff81a936911 commit 1d69498623c0eced2de0f97cd553aff81a936911 Author: Warner Losh AuthorDate: 2024-12-14 15:55:18 +0000 Commit: Warner Losh CommitDate: 2024-12-14 20:56:10 +0000 depend-cleanup: Fix test arg -e follows the symlink to see if the file exists. I tested on the wrong tree, so it appeared to work for me. Change to -h which see if the link is there or not. The file will never not be a link if present. Fixes: 42ee30f19cc7 Noticed by: Herbert Skuhra Sponsored by: Netflix --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 81acf517f9d7..8aee1d0e9e71 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -233,7 +233,7 @@ clean_dep lib/libcrypt crypt-sha256 c clean_dep lib/libcrypt crypt-sha512 c # 20241213 b55f5e1c4ae3 jemalloc: Move generated jemalloc.3 into lib/libc tree -if [ -e "$OBJTOP"/lib/libc/jemalloc.3 ]; then +if [ -h "$OBJTOP"/lib/libc/jemalloc.3 ]; then # Have to cleanup the jemalloc.3 in the obj tree since make gets # confused and won't use the one in lib/libc/malloc/jemalloc/jemalloc.3 echo "Removing stale jemalloc.3 object"