From nobody Sat Jul 25 13:08:03 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 4h6lXM49W7z6lNmH for ; Sat, 25 Jul 2026 13:08:03 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXM22mPz3m1F for ; Sat, 25 Jul 2026 13:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984883; 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=lFkwq6PbC8+UUmZUcjyvxmPJsvFWXDncjnxOWHS+wJ4=; b=DQnzNtUnd1ZAn2nqNiOF2P5phTb/xNbuhxb2DTif4WJ+rpSh2jJUI7ixsrGvi5msuYXoZN pYu7kekgQRTfwavOSvN3CGq5lNu2r3Oajw4m0+DuItb/wUdvbKf7vzC9722NVRxgltgOEv PLEGXRxKpV/18UV/BIniP/FfAphzgFxrZjk44koDaPQs7B5WWhG3TCr0kiOhBA1Wic4q1y WPScGDzLImJ5mv9l9ysR8wjn5RxeB2dJKHD9yswJsCw9rb+19J4CavUWBIsL8vqxArb0hV dQlfw7F5YMfySRuAGStr+1vMsYJWGWfPg2Bz5KWITNgV5nG3iKwmfzyBrq+Fiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984883; a=rsa-sha256; cv=none; b=QpdiPaP8WccCMvQz6oP8E8ikV945zx3iAxA9XBN1Zf+39BCUtAjejaR0d/9oq6JuJ9xNZb YQPmJtMzhW2CU9apVYv3lEgz0Orv7uFtyj2fvdpLqkUFhKqYshlZPD7isJqK181phJ3bSK ptoV9Gnv8i1JEfhHFFcHfat+0/TUmvnMijmFo1ymulDDdNqiPS5dAX2abSyblH80r/Z0V9 UU67xki2YYL0cIUFv/dtINj0DoXQio8hUFmvjoIMIWPKPAjtyXP76218N+Jg2DD7SR8Ndw ZUrO8mqDyva3gjbgCBf+5s+ssQkJ5Wgd37NEY+3+nhKY85GLlDfFjwL2+oC35Q== 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=1784984883; 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=lFkwq6PbC8+UUmZUcjyvxmPJsvFWXDncjnxOWHS+wJ4=; b=o9X9LqVsZanAYQocpiriPPa1Ukn0wuqldbtxsY4tc02YkAtGkCzJROUdb2jwp+1niyWa/K 3UbLAIp8G7oj5mD46zaBF8hJoEPdCUUBqUaSs4swGENUKVHquabd0IRuPXah3Z/1cPWXkT sh6U1EShrQRj6vpF+3cZE9K4hE4GjXczIIlFz+ybnpPV5bCYrfCa9e7rt9Ho3GM1SoMzbL 1A3+RuN1/hZoz74o1Ut0wHWBjt1d62SZ6NbmBJyS0m8LeYS9xPpyXL1+TDsTJHJBIV6AmN UD2Qncy9Rb0MltpY7i+YO+r11Mk75HU9YKLwtxbXMNr3PdBWoJwbrXDi2XwAgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXM0yTHzdRc for ; Sat, 25 Jul 2026 13:08:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2504b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:08:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: f8b81bfc76d8 - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/15 X-Git-Reftype: branch X-Git-Commit: f8b81bfc76d8e3c8ceb11e7285d0c04cb62a802e Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:08:03 +0000 Message-Id: <6a64b533.2504b.47803c4d@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=f8b81bfc76d8e3c8ceb11e7285d0c04cb62a802e commit f8b81bfc76d8e3c8ceb11e7285d0c04cb62a802e Author: Lexi Winter AuthorDate: 2026-04-28 19:42:39 +0000 Commit: Lexi Winter CommitDate: 2026-07-25 13:01:23 +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 (cherry picked from commit 4429630d1ca9d90c886bae1eaa0d8ee32d0fee12) --- Makefile.inc1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index b2f491ff254b..fb2a5e2ce527 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -961,8 +961,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} @@ -1471,7 +1473,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}