From nobody Tue Apr 28 19:50:57 2026 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 4g4rdt2xhQz6c1MG for ; Tue, 28 Apr 2026 19:50:58 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4rds6QGXz3ClB for ; Tue, 28 Apr 2026 19:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777405857; 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=xNbzCYQ0eLjQVujiEuUxOW3XPXREogVnGa9k8US+6fw=; b=HnTs9m0rCKGjugshDUVovcN3BX8vO9kDejBzZZ74gCHF5QPmY/s3qqO6MAUY6b0v93oHxn CqVjUcZJSjIlXl386eeGHkCunSOblxBsnvxLeiTKBy3B1lsThjpNFQsgfWu8ylSCrFj7kY C12pIDzorf3qUWu3OYmRQsK9IPc4yWfrmwJOlX73wzuHg2yBhqcfphKDZeDF1v3J738SsF Y9K0MlXCjDxUjUSOEYjoWlJOkmoClikxTJp85JZ0aA++xpmeNIOg7C2vdEEPCInL6dCVBg znfMubMu1Fq1m7qUm3bRlxyBy2gjwwh3ISL2XTYuQfNCiARyGE2L50kRaXxv0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777405857; a=rsa-sha256; cv=none; b=T6TDYAvuPU2YpMG8gIb1iGbNxinAnPowEiIRZ6Bd5CXmiTQ81m2tJ97zOQUaYkfGgNKozE xo80cbWkAZU4KM9Ba4KA2c6Xhn+pCm29PlS0S0bHdF5v/yBI9/7wFAKUouazzVz7esOa75 b1SbwBU+EVnAbjQGmhkFQI2TikiOL8rNyBnQKAUuhW5W4nVdWpoYkLHNG5p3p80xdg+cv+ IMMFXIwZvpSin2oCMCZnkbnTKClgH3vPw23bCm06sNS12JHWilw8a8JHp/bu+agYa6BdA8 3//UuY8Bdxgp672VNyBZfNvfVsnCs1bkTQyigZJc9i+/1AjOUNBDJ1ZFCX1mhg== 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=1777405857; 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=xNbzCYQ0eLjQVujiEuUxOW3XPXREogVnGa9k8US+6fw=; b=ZOt2uPaYQCiGr8/VU+LmXU/xva14N8kqonuAZL4nauYpJF1fBlTDXButhEEiTJy9FRK4nf zH7B40lHsB6gplkisAK9xl3yWXDEigDsqVQpDCbXr+5f621QrzTI31Q8b+Vtac7qVEXxNR /g8Ix666b+uwWoCyOZaPDuWxo96sNjN/pRFBPzFQtAcfMxj5a2RvkDANxkPXXjE99eAjYj ZtC8FSnEfmfTEdx/tBY9Vr8iTsR9908Og1YtJ/tLJ9y1SrnApS1cXzwNH+rWsJ/l95bGU1 eiJ+PX/Ac8pOG19wz0+6RGyrV3LOG6EDAoJr67reencouiZ/3BsTRW9meMSSzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4rds5QTsz172N for ; Tue, 28 Apr 2026 19:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 347d7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 19:50:57 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 4429630d1ca9 - main - Makefile.inc1: Only copy locales to INSTALLTMP on FreeBSD 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4429630d1ca9d90c886bae1eaa0d8ee32d0fee12 Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 19:50:57 +0000 Message-Id: <69f10fa1.347d7.63c0c38@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=4429630d1ca9d90c886bae1eaa0d8ee32d0fee12 commit 4429630d1ca9d90c886bae1eaa0d8ee32d0fee12 Author: Lexi Winter AuthorDate: 2026-04-28 19:42:39 +0000 Commit: Lexi Winter CommitDate: 2026-04-28 19:50:42 +0000 Makefile.inc1: Only copy locales to INSTALLTMP on FreeBSD Makefile.inc1 copies locales to ${INSTALLTMP} to avoid issues when running make installworld on a live system. However, this can break on non-FreeBSD systems, e.g. on openSUSE where /usr/share/locales has mode 0555, which means after we copy it, we can't delete it, so the build fails. Since this functionality is only useful when installing over a live system, disable it when the build host is not FreeBSD. MFC after: 2 weeks Reviewed by: kevans, emaste Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56677 --- Makefile.inc1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index dcdc735aa645..3c93159645fd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -965,8 +965,10 @@ IMAKE= ${TIME_ENV} ${IMAKEENV} ${MAKE} -f Makefile.inc1 \ ${IMAKE_INSTALL} ${IMAKE_MTREE} .if empty(.MAKEFLAGS:M-n) IMAKEENV+= PATH=${STRICTTMPPATH:Q}:${INSTALLTMP:Q} \ - LD_LIBRARY_PATH=${INSTALLTMP:Q} \ - PATH_LOCALE=${INSTALLTMP}/locale + LD_LIBRARY_PATH=${INSTALLTMP:Q} +.if ${.MAKE.OS} == "FreeBSD" +IMAKEENV+= PATH_LOCALE=${INSTALLTMP}/locale +.endif IMAKE+= __MAKE_SHELL=${INSTALLTMP}/sh .else IMAKEENV+= PATH=${TMPPATH:Q}:${INSTALLTMP:Q} @@ -1475,7 +1477,12 @@ distributeworld installworld stageworld: _installcheck_world .PHONY done); \ fi; \ ${INSTALLTMP_COPY_HOST_TOOL} $$libs $$progs ${INSTALLTMP} + # On non-FreeBSD systems, there's no point copying locales here + # since we aren't going to overwrite them anyway. This avoids + # failing if /usr/share/locale has odd modes (e.g., openSUSE). +.if ${.MAKE.OS} == "FreeBSD" cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale +.endif .if defined(NO_ROOT) -mkdir -p ${METALOG:H} echo "#${MTREE_MAGIC}" > ${METALOG}