From owner-svn-src-head@FreeBSD.ORG Wed Oct 17 17:41:05 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 431D373D; Wed, 17 Oct 2012 17:41:05 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from smtp.fgznet.ch (mail.fgznet.ch [81.92.96.47]) by mx1.freebsd.org (Postfix) with ESMTP id 9906B8FC08; Wed, 17 Oct 2012 17:41:03 +0000 (UTC) Received: from deuterium.andreas.nets (dhclient-91-190-14-19.flashcable.ch [91.190.14.19]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id q9HHf1Tk034934; Wed, 17 Oct 2012 19:41:01 +0200 (CEST) (envelope-from andreast@FreeBSD.org) Message-ID: <507EEDAD.20201@FreeBSD.org> Date: Wed, 17 Oct 2012 19:41:01 +0200 From: Andreas Tobler User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: attilio@FreeBSD.org 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.... References: <201210171116.q9HBGHHb057721@svn.freebsd.org> <507EE97F.6010905@FreeBSD.org> In-Reply-To: Content-Type: multipart/mixed; boundary="------------030207090102060101010503" X-Scanned-By: MIMEDefang 2.64 on 81.92.96.47 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 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 17:41:05 -0000 This is a multi-part message in MIME format. --------------030207090102060101010503 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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. Attached my trial. TIA, Andreas --------------030207090102060101010503 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="netncp_removal.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="netncp_removal.diff" SW5kZXg6IE9ic29sZXRlRmlsZXMuaW5jCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE9ic29sZXRlRmls ZXMuaW5jCShyZXZpc2lvbiAyNDE2NDEpCisrKyBPYnNvbGV0ZUZpbGVzLmluYwkod29ya2lu ZyBjb3B5KQpAQCAtMzgsNiArMzgsNDIgQEAKICMgICB4YXJncyAtbjEgfCBzb3J0IHwgdW5p cSAtZDsKICMgZG9uZQogCisjIDIwMTIxMDE3OiByZW1vdmUgbmV0bmNwCitPTERfRklMRVMr PXVzci9iaW4vbmNwbGlzdAorT0xEX0ZJTEVTKz11c3IvYmluL25jcGxvZ2luCitPTERfRklM RVMrPXVzci9iaW4vbmNwbG9nb3V0CitPTERfRklMRVMrPXVzci9pbmNsdWRlL2ZzL253ZnMv bndmcy5oCitPTERfRklMRVMrPXVzci9pbmNsdWRlL2ZzL253ZnMvbndmc19tb3VudC5oCitP TERfRklMRVMrPXVzci9pbmNsdWRlL2ZzL253ZnMvbndmc19ub2RlLmgKK09MRF9GSUxFUys9 dXNyL2luY2x1ZGUvZnMvbndmcy9ud2ZzX3N1YnIuaAorT0xEX0ZJTEVTKz11c3IvaW5jbHVk ZS9uZXRuY3AvbmNwLmgKK09MRF9GSUxFUys9dXNyL2luY2x1ZGUvbmV0bmNwL25jcF9jZmcu aAorT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX2Nvbm4uaAorT0xEX0ZJTEVT Kz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX2ZpbGUuaAorT0xEX0ZJTEVTKz11c3IvaW5jbHVk ZS9uZXRuY3AvbmNwX2xpYi5oCitPTERfRklMRVMrPXVzci9pbmNsdWRlL25ldG5jcC9uY3Bf bmNwLmgKK09MRF9GSUxFUys9dXNyL2luY2x1ZGUvbmV0bmNwL25jcF9ubHMuaAorT0xEX0ZJ TEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX3JjZmlsZS5oCitPTERfRklMRVMrPXVzci9p bmNsdWRlL25ldG5jcC9uY3BfcnEuaAorT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3Av bmNwX3NvY2suaAorT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX3N1YnIuaAor T0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX3VzZXIuaAorT0xEX0ZJTEVTKz11 c3IvaW5jbHVkZS9uZXRuY3AvbmNwaW8uaAorT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRu Y3AvbndlcnJvci5oCisjT0xEX0RJUlMrPXVzci9pbmNsdWRlL25ldG5jcAorT0xEX0ZJTEVT Kz11c3IvbGliL2xpYm5jcC5hCitPTERfRklMRVMrPXVzci9saWIvbGlibmNwLnNvCitPTERf TElCUys9dXNyL2xpYi9saWJuY3Auc28uNAorT0xEX0ZJTEVTKz11c3IvbGliL2xpYm5jcF9w LmEKK09MRF9GSUxFUys9dXNyL2xpYjMyL2xpYm5jcC5hCitPTERfRklMRVMrPXVzci9saWIz Mi9saWJuY3Auc28KK09MRF9MSUJTKz11c3IvbGliMzIvbGlibmNwLnNvLjQKK09MRF9GSUxF Uys9dXNyL2xpYjMyL2xpYm5jcF9wLmEKK09MRF9GSUxFUys9dXNyL3NiaW4vbW91bnRfbndm cworT0xEX0ZJTEVTKz11c3Ivc2hhcmUvbWFuL21hbjEvbmNwbGlzdC4xLmd6CitPTERfRklM RVMrPXVzci9zaGFyZS9tYW4vbWFuMS9uY3Bsb2dpbi4xLmd6CitPTERfRklMRVMrPXVzci9z aGFyZS9tYW4vbWFuMS9uY3Bsb2dvdXQuMS5negorT0xEX0ZJTEVTKz11c3Ivc2hhcmUvbWFu L21hbjgvbW91bnRfbndmcy44Lmd6CiAjIDIwMTIxMDA0OiByZW1vdmUgaW5jb21wbGV0ZSB1 bndpbmQuaAogT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9jbGFuZy8zLjIvdW53aW5kLmgKICMg MjAxMjA5MDg6IHBmIGNsZWFudXAKSW5kZXg6IHRvb2xzL2J1aWxkL21rL09wdGlvbmFsT2Jz b2xldGVGaWxlcy5pbmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdG9vbHMvYnVpbGQvbWsvT3B0aW9u YWxPYnNvbGV0ZUZpbGVzLmluYwkocmV2aXNpb24gMjQxNjQyKQorKysgdG9vbHMvYnVpbGQv bWsvT3B0aW9uYWxPYnNvbGV0ZUZpbGVzLmluYwkod29ya2luZyBjb3B5KQpAQCAtMzQ1OCw0 NyArMzQ1OCw2IEBACiAjIExpc3RpbmcgYWxsIG9mIHRoZW0gaGVyZSBpcyBvdmVya2lsbC4K ICMuZW5kaWYKIAotLmlmICR7TUtfTkNQfSA9PSBubwotT0xEX0ZJTEVTKz11c3IvYmluL25j cGxpc3QKLU9MRF9GSUxFUys9dXNyL2Jpbi9uY3Bsb2dpbgotT0xEX0ZJTEVTKz11c3IvYmlu L25jcGxvZ291dAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9mcy9ud2ZzL253ZnMuaAotT0xE X0ZJTEVTKz11c3IvaW5jbHVkZS9mcy9ud2ZzL253ZnNfbW91bnQuaAotT0xEX0ZJTEVTKz11 c3IvaW5jbHVkZS9mcy9ud2ZzL253ZnNfbm9kZS5oCi1PTERfRklMRVMrPXVzci9pbmNsdWRl L2ZzL253ZnMvbndmc19zdWJyLmgKLSNPTERfRElSUys9dXNyL2luY2x1ZGUvZnMvbndmcwot T0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwLmgKLU9MRF9GSUxFUys9dXNyL2lu Y2x1ZGUvbmV0bmNwL25jcF9jZmcuaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3Av bmNwX2Nvbm4uaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX2ZpbGUuaAot T0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX2xpYi5oCi1PTERfRklMRVMrPXVz ci9pbmNsdWRlL25ldG5jcC9uY3BfbmNwLmgKLU9MRF9GSUxFUys9dXNyL2luY2x1ZGUvbmV0 bmNwL25jcF9ubHMuaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX3JjZmls ZS5oCi1PTERfRklMRVMrPXVzci9pbmNsdWRlL25ldG5jcC9uY3BfcnEuaAotT0xEX0ZJTEVT Kz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwX3NvY2suaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVk ZS9uZXRuY3AvbmNwX3N1YnIuaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNw X3VzZXIuaAotT0xEX0ZJTEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbmNwaW8uaAotT0xEX0ZJ TEVTKz11c3IvaW5jbHVkZS9uZXRuY3AvbndlcnJvci5oCi0jT0xEX0RJUlMrPXVzci9pbmNs dWRlL25ldG5jcAotT0xEX0ZJTEVTKz11c3IvbGliL2xpYm5jcC5hCi1PTERfRklMRVMrPXVz ci9saWIvbGlibmNwLnNvCi1PTERfTElCUys9dXNyL2xpYi9saWJuY3Auc28uNAotT0xEX0ZJ TEVTKz11c3IvbGliL2xpYm5jcF9wLmEKLS5pZiAke1RBUkdFVF9BUkNIfSA9PSAiYW1kNjQi IHx8ICR7VEFSR0VUX0FSQ0h9ID09ICJwb3dlcnBjNjQiCi1PTERfRklMRVMrPXVzci9saWIz Mi9saWJuY3AuYQotT0xEX0ZJTEVTKz11c3IvbGliMzIvbGlibmNwLnNvCi1PTERfTElCUys9 dXNyL2xpYjMyL2xpYm5jcC5zby40Ci1PTERfRklMRVMrPXVzci9saWIzMi9saWJuY3BfcC5h Ci0uZW5kaWYKLU9MRF9GSUxFUys9dXNyL3NiaW4vbW91bnRfbndmcwotT0xEX0ZJTEVTKz11 c3Ivc2hhcmUvbWFuL21hbjEvbmNwbGlzdC4xLmd6Ci1PTERfRklMRVMrPXVzci9zaGFyZS9t YW4vbWFuMS9uY3Bsb2dpbi4xLmd6Ci1PTERfRklMRVMrPXVzci9zaGFyZS9tYW4vbWFuMS9u Y3Bsb2dvdXQuMS5negotT0xEX0ZJTEVTKz11c3Ivc2hhcmUvbWFuL21hbjgvbW91bnRfbndm cy44Lmd6Ci0uZW5kaWYKLQogLmlmICR7TUtfTkRJU30gPT0gbm8KIE9MRF9GSUxFUys9dXNy L3NiaW4vbmRpc2N2dAogT0xEX0ZJTEVTKz11c3Ivc2Jpbi9uZGlzZ2VuCg== --------------030207090102060101010503--