Date: Mon, 4 Jul 2011 09:18:47 -0400 (EDT) From: Rick Macklem <rmacklem@uoguelph.ca> To: Hans Ottevanger <hans@beastielabs.net> Cc: freebsd-stable@freebsd.org Subject: Re: NFS related include files and make delete-old Message-ID: <1457531349.170391.1309785527174.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <20110704085438.GA93119@testsoekris.hotsoft.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
> Hi,
>
> For a few months now, during the usual make delete-old after
> make installworld the files
>
> /usr/include/nfs/krpc.h
>
> and
>
> /usr/include/nfs/nfsdiskless.h
>
> turn up time and again. I have them deleted, but they get reinstalled
> during the next make installworld. This is a fairly old installation,
> but running an up-to-date 8.2-STABLE and these header files are also
> present in the directory /usr/include/nfsclient.
>
I moved them from sys/nfsclient to sys/nfs, so that it would be more
obvious that they are shared by both NFS clients (in sys/nfsclient and
sys/fs/nfsclient). So the ones at the new location /usr/include/nfs would
not be deleted, the entry in ObsoleteFiles.inc that removed them from
/usr/include/nfs was deleted (by someone else, after discussing it with me).
I felt that they should remain in the old location for backwards compatibility.
(The "userland" contents of the two copies are identical, so it shouldn't matter
which copy any userland app includes. One problem here is that I have no idea
if any software outside of /usr/src includes these.)
> Could it be that either the wrong files are specified in
> /usr/src/ObsoleteFiles.inc or the headers are installed in the wrong
> directory during make installworld?
>
> On my 9.0-CURRENT systems I also have the headers at both locations,
> but there only those in /usr/include/nfsclient get reinstalled and
> there is no entry in /usr/src/ObsoleteFiles.inc.
>
Actually, only the ones in /usr/include/nfs should get updated, because they
now live in sys/nfs and not sys/nfsclient. I plan on adding an entry to
ObsoleteFiles.inc in head/current for the /usr/include/nfsclient ones.
(Thanks for the reminder w.r.t. this.)
Should I MFC this to stable/8?
(I had assumed that I should leave them in
the old location for backwards compatibility and therefore wasn't going to
MFC deletion of them in /usr/include/nfsclient. If I MFC that, the entries
for them in ObsoleteFiles.inc for /usr/include/nfs need to be deleted, so
they remain in the new location.)
rick
ps: Maybe I shouldn't have MFC'd the changes for making the two NFS clients
use the shared diskless boot code, but that would have made later MFCs
difficult.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1457531349.170391.1309785527174.JavaMail.root>