From owner-freebsd-current@FreeBSD.ORG Sat Feb 10 22:09:00 2007 Return-Path: X-Original-To: freebsd-current@freebsd.org Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 54F0216A400 for ; Sat, 10 Feb 2007 22:09:00 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx22.fluidhosting.com [204.14.89.5]) by mx1.freebsd.org (Postfix) with SMTP id E8DC513C441 for ; Sat, 10 Feb 2007 22:08:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 3981 invoked by uid 399); 10 Feb 2007 22:08:55 -0000 Received: from localhost (HELO ?192.168.0.4?) (dougb@dougbarton.us@127.0.0.1) by localhost with SMTP; 10 Feb 2007 22:08:55 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <45CE426F.6090208@FreeBSD.org> Date: Sat, 10 Feb 2007 14:08:47 -0800 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0b2 (Windows/20070116) MIME-Version: 1.0 To: David Wolfskill References: <20070210165904.GA58269@crodrigues.org> <200702101837.l1AIb4xo058251@lurza.secnetix.de> <20070210191346.GA48740@bunrab.catwhisker.org> In-Reply-To: <20070210191346.GA48740@bunrab.catwhisker.org> X-Enigmail-Version: 0.94.2.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org Subject: Re: Populating /usr/include for make buildworld? X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Feb 2007 22:09:00 -0000 David Wolfskill wrote: > On Sat, Feb 10, 2007 at 07:37:04PM +0100, Oliver Fromme wrote: >> Craig Rodrigues wrote: >> > I am trying to see if I have any outdated files in /usr/include by >> ... >> I had exactly the same problem (but on RELENG_6). >> >> At first I copied the missing files from the source tree >> ... >> > What is the correct way to populate /usr/include >> > before buildworld? >> >> I would like to know the answer, too. > > I approach the problem from a different point: as part of my > {build,install}world procedure, I do: > > make buildworld && make kernel && mergemaster -u 0022 -p && \ > rm -fr /usr/include.old && mv /usr/include{,.old} && \ > make installworld && make delete-old && mergemaster -u 0022 -i I have something similar that I've used for years, the method works well: doinstall () { cd /usr && [ -d include-old ] && /bin/rm -r include-old; [ ! -e include-old ] && mv -i include include-old; /bin/rm -r /usr/share/man; cd /usr/src && touch /var/tmp/installdate && make installworld } hth, Doug -- This .signature sanitized for your protection