From owner-freebsd-stable@FreeBSD.ORG Mon Jul 4 13:18:48 2011 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53F74106566C for ; Mon, 4 Jul 2011 13:18:48 +0000 (UTC) (envelope-from rmacklem@uoguelph.ca) Received: from esa-annu.mail.uoguelph.ca (esa-annu.mail.uoguelph.ca [131.104.91.36]) by mx1.freebsd.org (Postfix) with ESMTP id 11F648FC1A for ; Mon, 4 Jul 2011 13:18:47 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ap0EAIa9EU6DaFvO/2dsb2JhbABShEKkMoh6sFWQKYErg3+BDASSNpBS X-IronPort-AV: E=Sophos;i="4.65,472,1304308800"; d="scan'208";a="125956811" Received: from erie.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.206]) by esa-annu-pri.mail.uoguelph.ca with ESMTP; 04 Jul 2011 09:18:47 -0400 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id 2DB7EB3F28; Mon, 4 Jul 2011 09:18:47 -0400 (EDT) Date: Mon, 4 Jul 2011 09:18:47 -0400 (EDT) From: Rick Macklem To: Hans Ottevanger Message-ID: <1457531349.170391.1309785527174.JavaMail.root@erie.cs.uoguelph.ca> In-Reply-To: <20110704085438.GA93119@testsoekris.hotsoft.nl> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [172.17.91.201] X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - IE7 (Win)/6.0.10_GA_2692) Cc: freebsd-stable@freebsd.org Subject: Re: NFS related include files and make delete-old X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jul 2011 13:18:48 -0000 > 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.