From nobody Tue Sep 2 11:43:23 2025 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 4cGP5D0rgFz66ZFZ; Tue, 02 Sep 2025 11:43:28 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGP5B68Jtz3QJD; Tue, 02 Sep 2025 11:43:26 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zabbadoz.net header.s=20240622 header.b=XpyNHLR0; dmarc=pass (policy=none) header.from=zabbadoz.net; spf=pass (mx1.freebsd.org: domain of bzeeb-lists@lists.zabbadoz.net designates 2003:a:140a:2200:6:594:fffe:19 as permitted sender) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id 6AF84A64806; Tue, 02 Sep 2025 11:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zabbadoz.net; s=20240622; t=1756813397; bh=vRON47Z2YM76gK2CQrzDHvAkYrDzOTPSbBdQVIkUiRE=; h=Date:From:To:cc:Subject:In-Reply-To:References; b=XpyNHLR0aKXm2yyNOMhWKLzHYTn6WpiePPrWIQ/MCcADF7iuRaLTRuwQ5vPiLLEcp DbKEeOhKePGYDYa1ZEAIDWmxyOE/z+W3y2En7hH/MU3DZpd7SREbdwSAbJ7sz4zSJs ZRCeZ806p7yA62yBPo3fdzQ68JkY9sFtlesmiwfeCVpYBU4GW0kKWgKSve83+7a6+h u594IDGVI0YVlnGHwL0DDl8zlqLkC8/n+yQCJujAU8817OBcy7US0R5cDKo4zrXL2N NpcLX0b8FQlpVhmiDwj13m9/YgEDgp0+Vz46ldtoP7jpwZFgQ7Iv9SvJb+BZI9YjPW tZRqREBBnh+CgaV1g3Ar1DSvEvfOKymqsbMnva54gcsu73rQm4jBqQ9PSfhOpktXmK /0NDv5D0j1X1y6hfl8dWxn7oVm5bYTfLj6Pe64bsXr72MlZN+OuW0gj2hu178aI8OJ f53I5E/scKlmz4IBJiy7yYjE+Qb9Mwd/B2IN8L21dhO8R7IVkglo/HtJ81n9x3vxu1 NOnehUGRYHnOdsDi9zFeyOgyqV+se8FlRtkZKAf3hulT1EcEDNxvMB5rTLykJ5ShU7 aIEvlZrg8P1he+QJc7G4x6/c4ZWTxs7MHegm+UwQklHtqsDF8KkwiAGTQBFDCEB92a SZRTHoFuqlrDIrHsWtuvaXwU= Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id DBD382D029D8; Tue, 2 Sep 2025 11:43:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id ygk05IbVJkUi; Tue, 2 Sep 2025 11:43:23 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:a66b:b6ff:fe40:39a9]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id EB1972D029E3; Tue, 2 Sep 2025 11:43:23 +0000 (UTC) Date: Tue, 2 Sep 2025 11:43:23 +0000 (UTC) From: "Bjoern A. Zeeb" To: Lexi Winter cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: aa730a66bc74 - main - sh: Add config tag to /.profile In-Reply-To: <5p49s627-11ps-53ns-s327-550s12o38q96@yvfgf.mnoonqbm.arg> Message-ID: <9po4s20n-24sp-39s0-4s5r-r3o35229p739@yvfgf.mnoonqbm.arg> References: <202509020831.5828V5wg092563@gitrepo.freebsd.org> <5p49s627-11ps-53ns-s327-550s12o38q96@yvfgf.mnoonqbm.arg> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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=US-ASCII; format=flowed X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; DMARC_POLICY_ALLOW(-0.50)[zabbadoz.net,none]; R_DKIM_ALLOW(-0.20)[zabbadoz.net:s=20240622]; R_SPF_ALLOW(-0.20)[+ip6:2003:a:140a:2200:6:594:fffe:19]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:3320, ipnet:2003::/19, country:DE]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; DKIM_TRACE(0.00)[zabbadoz.net:+] X-Rspamd-Queue-Id: 4cGP5B68Jtz3QJD On Tue, 2 Sep 2025, Bjoern A. Zeeb wrote: > On Tue, 2 Sep 2025, Lexi Winter wrote: > >> The branch main has been updated by ivy: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=aa730a66bc74696df85b21ec2719c75d8eab8c9f >> >> commit aa730a66bc74696df85b21ec2719c75d8eab8c9f >> Author: Lexi Winter >> AuthorDate: 2025-09-02 08:22:56 +0000 >> Commit: Lexi Winter >> CommitDate: 2025-09-02 08:22:56 +0000 >> >> sh: Add config tag to /.profile >> >> The file /.profile is installed as a hard link to /root/.profile. The >> file in /root has the config tag, but the file in / does not, which >> causes it to be overwritten by pkg upgrade. Since they're linked, this >> also overwrites the file in /root. >> >> Add the config tag to the file in / as well, so pkg treates both links >> as config files and won't overwrite them. >> >> PR: 289097 >> MFC after: 3 days >> Reviewed by: bapt, emaste >> Differential Revision: https://reviews.freebsd.org/D52162 > > > make distribution ... I assume... now fails: > > ... > ===> bin/rm (installconfig) > ===> bin/rmdir (installconfig) > ===> bin/setfacl (installconfig) > ===> bin/sh (installconfig) > install: target directory `/dest/foo/.profile' does not exist > usage: install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] > [-M log] [-D dest] [-h hash] [-T tags] > [-B suffix] [-l linkflags] [-N dbdir] > file1 file2 > install [-bCcpSsUv] [-f flags] [-g group] [-m mode] [-o owner] > [-M log] [-D dest] [-h hash] [-T tags] > [-B suffix] [-l linkflags] [-N dbdir] > file1 ... fileN directory > install -dU [-vU] [-g group] [-m mode] [-N dbdir] [-o owner] > [-M log] [-D dest] [-h hash] [-T tags] > directory ... > *** Error code 64 > > Stop. > make[4]: stopped making "installconfig" in /usr/usr/bin/sh re-run make without -s and it simply showed ,config; I think you need: diff --git bin/sh/Makefile bin/sh/Makefile index 4dbbf344bfb5..916bb88b57fa 100644 --- bin/sh/Makefile +++ bin/sh/Makefile @@ -74,6 +74,6 @@ beforeinstallconfig: LINKMODE=${CONFMODE} afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS},config ${DESTDIR}/root/.profile ${DESTDIR}/.profile + ${INSTALL_LINK} ${TAG_ARGS:D${TAG_ARGS},config} ${DESTDIR}/root/.profile ${DESTDIR}/.profile .include > >> --- >> bin/sh/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/bin/sh/Makefile b/bin/sh/Makefile >> index 087dbf40c3bd..4dbbf344bfb5 100644 >> --- a/bin/sh/Makefile >> +++ b/bin/sh/Makefile >> @@ -74,6 +74,6 @@ beforeinstallconfig: >> >> LINKMODE=${CONFMODE} >> afterinstallconfig: >> - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile >> ${DESTDIR}/.profile >> + ${INSTALL_LINK} ${TAG_ARGS},config ${DESTDIR}/root/.profile >> ${DESTDIR}/.profile >> >> .include >> > > -- Bjoern A. Zeeb r15:7