From nobody Fri Mar 15 15:02:00 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 4Tx6sh6GpQz5DZGH; Fri, 15 Mar 2024 15:02: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 4Tx6sh595sz4WGj; Fri, 15 Mar 2024 15:02:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710514920; 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=n4mjPW/qSRVzizOKK93HFWRKOj4KNfaVliqV6UX3wbk=; b=cG0526ezp3Anct6KlDiUNYeWG+qOEO4n6rz6E4lA4g8l76NeqSjJTcmRHczy2F7zvCfYVj Zg/lVidut3HtOz9w210BdaPnKVn91qD1kUITpQUUvaV2n59lDMwv3wzVM8xyCzg/mSeTkd t3e560loWW3gCYm2J+7pv++tJYLlv3yi+MYx+lgglBNY/ILM/qydi/HSryz4rH8hrJ3+/g tvq0OJnps19SAf6vuraUZESEZD7xflsprJeP0Gvc5RTL2NQpip6GGaxDLIPK7qd3/HA1nV JAztLXeHGmsO8o5vBxB9GOHqYfKGheykSR9bl3ERC54jxiJP7T5oV93aplwuiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710514920; a=rsa-sha256; cv=none; b=iqqF7A7WQ+O6SWaCLl0xEyX7kOy+V2m+cDEw3DDFiqlUliFcufs3qiCaWqYBhGCYQBNQi2 BmYgvPDWFvcS8dGwkMZVEpPR7tSf3DB/BtVPJ4QehRh61O2EoZaB5682yta8CXCW51Dxaq W5P4E1qwYTYpLWDt/t+1BoDu8P3z3EzXZQrbiZym37GBcho1fr2d7oGFeyxFv6fvmFoMs9 e7ZBQnzlutYFdINfD3KdeywIPq6QAOY2j2l+O27mZksDAd0cWn4zEUeFrDd+7q/Diqb2f6 DigavY14zibw7afpyCCgo3N2UhvME+P3rGDo1cvijRgrPvFZLl8ap4t3msOeMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710514920; 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=n4mjPW/qSRVzizOKK93HFWRKOj4KNfaVliqV6UX3wbk=; b=TJ3MtP2UDjqnpDiStudnUd5WxLFTBKCth/9uz7N+FcAzJb+YE/RhJltxAgrTWqN1l/qnvX o/WPuxyba54VZo1u49AL/3Sgzoc/sOdpQA1cLg3y7Rgl1FbrBqbdeOiSffKXcWpa3QTLbA mO8clPUQZ6bdBbvarrfLjrfiJwt0x665AqmW39OFwy1sTVIeZuGAJpGUfD03ZAkch2is0C iuyVs6mx5kixpZ6TEnXHzQjDQIeL4QvnD0TdSwvG23Jk1SUQzMnnzzmgxzivr6EF5gth1e vPKy/QBb1eoMSU8EoGp9EscIJCkpWgFO0oJiUcvi0f2kuduw6nudbQxoz8x00A== 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 4Tx6sh4V9tzG5g; Fri, 15 Mar 2024 15:02:00 +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 42FF206W013890; Fri, 15 Mar 2024 15:02:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FF20ul013887; Fri, 15 Mar 2024 15:02:00 GMT (envelope-from git) Date: Fri, 15 Mar 2024 15:02:00 GMT Message-Id: <202403151502.42FF20ul013887@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: d2a824c29d69 - main - share/mk: Don't install only differing in case files on case insensitive fs 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2a824c29d6925ba8675a811aa81f2ad7d92129d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d2a824c29d6925ba8675a811aa81f2ad7d92129d commit d2a824c29d6925ba8675a811aa81f2ad7d92129d Author: Warner Losh AuthorDate: 2024-03-15 04:33:33 +0000 Commit: Warner Losh CommitDate: 2024-03-15 15:01:25 +0000 share/mk: Don't install only differing in case files on case insensitive fs MacOS has case insensitive filesystems by default. So trying to link between foo.X and FOO.X causes an error of some sort since we unlink the old foo file destroying the newly installed foo due to the insensitive nature of the FS. Assume that this is true on darwin/macos, though it is only try by default there. Perhaps install should grow smarts to know when this is the case, though that looked much trickier. There didn't seem to be a flag to check. This would be better, imho, since we could still write the METALOG data correctly (images created from these metalogs are imperfect due to this relatively issue...). Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44347 --- share/mk/bsd.links.mk | 6 ++++++ share/mk/bsd.man.mk | 3 +++ 2 files changed, 9 insertions(+) diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 6070979612bf..437ffd0d3b34 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -14,16 +14,22 @@ afterinstall: _installlinks .ORDER: realinstall _installlinks _installlinks: .for s t in ${LINKS} +# On MacOS, assume case folding FS, and don't install links from foo.x to FOO.x. +.if ${.MAKE.OS} != "Darwin" || ${s:tu} != ${t:tu} .if defined(LINKTAGS) ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${DESTDIR}${s} ${DESTDIR}${t} .else ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${s} ${DESTDIR}${t} .endif +.endif .endfor .for s t in ${SYMLINKS} +# On MacOS, assume case folding FS, and don't install links from foo.x to FOO.x. +.if ${.MAKE.OS} != "Darwin" || ${s:tu} != ${t:tu} .if defined(LINKTAGS) ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},${LINKTAGS}} ${s} ${DESTDIR}${t} .else ${INSTALL_SYMLINK} ${TAG_ARGS} ${s} ${DESTDIR}${t} .endif +.endif .endfor diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index c80c618e48db..2845d0c1fc1c 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -234,6 +234,8 @@ maninstall: ${MAN} .endif # ${MK_MANCOMPRESS} == "no" .endif .for l t in ${_MANLINKS} +# On MacOS, assume case folding FS, and don't install links from foo.x to FOO.x. +.if ${.MAKE.OS} != "Darwin" || ${l:tu} != ${t:tu} .if ${MK_MANSPLITPKG} == "no" rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \ ${INSTALL_MANLINK} ${TAG_ARGS} ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT} @@ -241,6 +243,7 @@ maninstall: ${MAN} rm -f ${DESTDIR}${t} ${DESTDIR}${t}${MCOMPRESS_EXT}; \ ${INSTALL_MANLINK} ${TAG_ARGS:D${TAG_ARGS},man} ${DESTDIR}${l}${ZEXT} ${DESTDIR}${t}${ZEXT} .endif +.endif .endfor manlint: