From owner-svn-src-head@FreeBSD.ORG Wed Oct 17 18:50:52 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 858948A7; Wed, 17 Oct 2012 18:50:52 +0000 (UTC) (envelope-from asmrookie@gmail.com) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id E76D38FC0A; Wed, 17 Oct 2012 18:50:51 +0000 (UTC) Received: by mail-vb0-f54.google.com with SMTP id v11so9817524vbm.13 for ; Wed, 17 Oct 2012 11:50:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=jTALlLC9JptUyuog1i0brOeWIBgU7XbzFoFrfYwuhc8=; b=sry7qMOugYUzuq2Jk6bCNXRjG/W0GYJN9Bcs8qy05fEAZ0Dlvdx7LevVFkZ6fLKskR 2mDi9w5hBFnDE2FWxxBnfvH8AG+BTBFh8E9HNFbQXyPM0dvGxVi//xDiPqvk5emlCDK7 J6HZxRyVNVNcLaPbxvhwUaUD8W20dzLt7GorIp3wMIbsb7Frlh7MMFB2iGZX59UY/DF9 5iBSICWg5E+6t2QBB6ImzNeTq9y4gvceQGwhlJr8Dhx0x8crSbZwlzF9lWzRQ3LSh1cn jP9ASqeCRHQ8qfkOetijnvwQhOFK1T0R4I3ATE2BKG+Q8NqytrXuF+r5Vn6/Bdq1wwCu wEnA== MIME-Version: 1.0 Received: by 10.220.150.201 with SMTP id z9mr1252915vcv.70.1350499850165; Wed, 17 Oct 2012 11:50:50 -0700 (PDT) Sender: asmrookie@gmail.com Received: by 10.220.150.197 with HTTP; Wed, 17 Oct 2012 11:50:50 -0700 (PDT) In-Reply-To: <507EEDAD.20201@FreeBSD.org> References: <201210171116.q9HBGHHb057721@svn.freebsd.org> <507EE97F.6010905@FreeBSD.org> <507EEDAD.20201@FreeBSD.org> Date: Wed, 17 Oct 2012 19:50:50 +0100 X-Google-Sender-Auth: AKHHHccX8uGrVBi2Ors_qTQHoZo Message-ID: Subject: Re: svn commit: r241629 - in head: . etc/defaults etc/mtree include lib lib/libprocstat rescue/rescue sbin/mount share/examples share/man/man5 share/man/man7 share/mk sys/conf sys/kern sys/modules usr.... From: Attilio Rao To: Andreas Tobler Content-Type: text/plain; charset=UTF-8 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: attilio@FreeBSD.org List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Oct 2012 18:50:52 -0000 On Wed, Oct 17, 2012 at 6:41 PM, Andreas Tobler wrote: > On 17.10.12 19:35, Attilio Rao wrote: >> >> On Wed, Oct 17, 2012 at 6:23 PM, Andreas Tobler >> wrote: >>> >>> On 17.10.12 13:16, Attilio Rao wrote: >>>> >>>> >>>> Author: attilio >>>> Date: Wed Oct 17 11:16:17 2012 >>>> New Revision: 241629 >>>> URL: http://svn.freebsd.org/changeset/base/241629 >>>> >>>> Log: >>>> Disconnect non-MPSAFE NWFS from the build in preparation for >>>> dropping >>>> GIANT from VFS. In addition, disconnect also netncp, which is a base >>>> requirement for NWFS. >>>> >>>> In the possibility of a future maintenance of the code and later >>>> readd to the FreeBSD base, maybe we should think about a better >>>> location >>>> for netncp. I'm not entirely sure the / top location is actually >>>> right, >>>> however I will let network people to comment on that more >>>> specifically. >>>> >>>> This is not targeted for MFC. >>> >>> >>> >>> Hi Attilio, >>> >>> I get the following error when running 'make delete-old': >>> >>> [root@tritium] /usr/src/> make delete-old >>> "/export/devel/fbsd/src/tools/build/mk/OptionalObsoleteFiles.inc", line >>> 3461: Malformed conditional (${MK_NCP} == no) >>> "/export/devel/fbsd/src/Makefile.inc1", line 1566: if-less endif >>> make: fatal errors encountered -- cannot continue >>> *** [delete-old] Error code 1 >>> >>> Do we have to remove the stuff in >>> tools/build/mk/OptionalObsoleteFiles.inc too where we have the >>> >>> .if ${MK_NCP} == no >>> ... >>> .endif >>> >>> If so I'm happy to prep a patch, test and commit it. >> >> >> You are indeed right. Please go ahead. > > > Just to be sure, am I right to move the part from > tools/build/mk/OptionalObsoleteFiles.inc enclosed in the if MK_NCP == no > to the toplevel ObsoleteFiles.inc without any ifdefs. > Iow, the netncp part should go away. For the moment we should not move the files yet into ObsoleteFiles.inc. This is done because all the FS removed code will make it into ObsoleteFiles.inc into a separate pass, in 3-4 months, giving people time to possibly fix and re-link a filesystem. What I suggest to do, then, is just axe the OptionalObsoleteFIles.inc part out. I will take care to do the proper ObsoleteFiles.inc move when needed. Thanks, Attilio -- Peace can only be achieved by understanding - A. Einstein