Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 28 Jul 2026 13:50:50 +0200
From:      Dimitry Andric <dim@FreeBSD.org>
To:        =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@FreeBSD.org>
Cc:        "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-branches@freebsd.org" <dev-commits-src-branches@FreeBSD.org>
Subject:   Re: git: 2e089a89812b - stable/15 - Add a few missed files to ObsoleteFiles.inc
Message-ID:  <616BA33A-D411-491E-977E-764740C78FC3@FreeBSD.org>
In-Reply-To: <86cxw7tpd9.fsf@ltc.des.dev>
References:  <6a5923cf.37f3a.2c90f9ef@gitrepo.freebsd.org> <86pl0bug2y.fsf@ltc.des.dev> <86cxw7tpd9.fsf@ltc.des.dev>

index | next in thread | previous in thread | raw e-mail

On 28 Jul 2026, at 11:50, Dag-Erling Smørgrav <des@FreeBSD.org> wrote:
> 
> Dag-Erling Smørgrav <des@FreeBSD.org> writes:
>> Dimitry Andric <dim@FreeBSD.org> writes:
>>>    Add a few missed files to ObsoleteFiles.inc
>>> 
>>>    There were still some left-over files under usr/tests/gnu/usr.bin/diff,
>>>    causing the directory to not be fully removed. Add these to OLD_FILES.
>>> 
>>>    Fixes:          134a4c78d070
>>>    (cherry picked from commit f72cfefae99befe47fefc4683cd6957edaaf0e86)
>> These files and directories are still being recreated on every
>> installworld.  This should have gone into OptionalObsoleteFiles.inc like
>> I asked you.
> 
> stable/15 and stable/14 are still broken because of this, please fix at
> your earliest convenience.

Sorry, I seem to have missed the earlier mail. I think the directories don't have to be created at all, since GNU diff is gone in both stable/15 and 14? So probably best to remove them from /etc/mtree/BSD.tests.dists instead of messing with OptionalObsoleteFiles.

I need to have a look on a stable/15 machine first, to see what is actually happening on installation.

-Dimitry



home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?616BA33A-D411-491E-977E-764740C78FC3>