From nobody Tue Apr 16 20:12:17 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 4VJwDx4F1bz5H0DJ; Tue, 16 Apr 2024 20:12:17 +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 4VJwDx2RRNz4sCT; Tue, 16 Apr 2024 20:12:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713298337; 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=2z3NKjkjJswq7jIp+PxZjfQfHeyEs7hbhDFad6ck/rc=; b=ooxHeNe+iRJq1orD0WStwqdoP4UtDzr5MNeAR4hSSaQIEac94RtadIeIHVrq6mP9yBU4WX bLYr+qKpdE94viQ8nGeAA92AC9gBfPOBK1JuW/c1Tx+a5ocqijR2b6OJORW1QF86e2RvQT fGKn0COC64eDt24HTrdUPlhZNKhB8FBinmbSmoHRqA9teY69reRtXC4/Bu/3IOlsIOnXEz 1VTVxuAytrMhBBnf0M4lNLllISCxsVAsvDZYT5jj94LEFqScMJgL3qch3g/QfiTV9ML08b V9MYcEiYFzh3omCDkFvaM9Wl/U3QpfJ0Vc/YaAERVp7C48T4makf6AqvddSHDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713298337; a=rsa-sha256; cv=none; b=OapmqvbOEzrHO2v4zpXWEdOodSeTnpoIdPosClo088B013uA4Pzwj354jyz6M4WohBn1zY LduAOWFcAfduCKmpPVoJsWCGUpZ7+I1cluH6HtHlWDK4FN/KHfKZB4kk3+DHsw8RqFi2Nr MuyrdhDHOa8+1r2hPa3oM9HtnYc8mIrCIYipQH76ilwmfKjYaCvM08N2Txw7qPzQhnNTuy JCVj5qQ5Peq5flixadSHwK0m3ZeZksk8C23A+YfdfmhBgZHSUN4C7+YyfglCGPMfAy0eGK hs7VodaESPwj3S/s41+IL3Zb2mo3NBzo2XwpkRyc00eAWdYPloQu5xwj0eZzXw== 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=1713298337; 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=2z3NKjkjJswq7jIp+PxZjfQfHeyEs7hbhDFad6ck/rc=; b=ZlQw5pFRnqkMYZgGVqYYMOElNcDykV0l5MuO5PY6hAcmLNoFMFcqqIF9Rl8SCce3gHbgkX sRI4yzFuIFoFRt0j710CeOVF4WEw+ZPkVY6y3UhrCGRw9n9Et248WVtYnMDf6YGBe9wN/a S5Q1nLjoJ0PogYE/JV5zGWXWpRg6LJ5KlGVaecHjobPp4G92VCYl7ou4N4R6D1l3R6XvWc BXNxfZfmZuMbYU7t5CWtgHWAU7WbJpx3jI9//VAuUm06DvQTsAnAAZFuu8B8jBiBAzUAww i5JXQ1qd/o+vI2ZIYdagvmerIKWfOrO7ISCf1TV/O0T80ML9+p8DuFI1Cu6cIA== 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 4VJwDx22p5zxJR; Tue, 16 Apr 2024 20:12:17 +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 43GKCH62035582; Tue, 16 Apr 2024 20:12:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43GKCHkB035577; Tue, 16 Apr 2024 20:12:17 GMT (envelope-from git) Date: Tue, 16 Apr 2024 20:12:17 GMT Message-Id: <202404162012.43GKCHkB035577@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 656183c21b58 - stable/14 - 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: 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 656183c21b58cf6fe9b8c8ee78d2a9245b11fedd Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=656183c21b58cf6fe9b8c8ee78d2a9245b11fedd commit 656183c21b58cf6fe9b8c8ee78d2a9245b11fedd Author: Warner Losh AuthorDate: 2024-03-15 04:33:33 +0000 Commit: Warner Losh CommitDate: 2024-04-16 19:54:20 +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 (cherry picked from commit d2a824c29d6925ba8675a811aa81f2ad7d92129d) --- 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 444144e6d626..04316c46b705 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -229,6 +229,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} @@ -236,6 +238,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: