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....

[Andreas Tobler]

On 17.10.12 19:35, Attilio Rao wrote:
> On Wed, Oct 17, 2012 at 6:23 PM, Andreas Tobler <andreast at freebsd.org> 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 at 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

-------------- next part --------------
Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc	(revision 241641)
+++ ObsoleteFiles.inc	(working copy)
@@ -38,6 +38,42 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20121017: remove netncp
+OLD_FILES+=usr/bin/ncplist
+OLD_FILES+=usr/bin/ncplogin
+OLD_FILES+=usr/bin/ncplogout
+OLD_FILES+=usr/include/fs/nwfs/nwfs.h
+OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
+OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
+OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
+OLD_FILES+=usr/include/netncp/ncp.h
+OLD_FILES+=usr/include/netncp/ncp_cfg.h
+OLD_FILES+=usr/include/netncp/ncp_conn.h
+OLD_FILES+=usr/include/netncp/ncp_file.h
+OLD_FILES+=usr/include/netncp/ncp_lib.h
+OLD_FILES+=usr/include/netncp/ncp_ncp.h
+OLD_FILES+=usr/include/netncp/ncp_nls.h
+OLD_FILES+=usr/include/netncp/ncp_rcfile.h
+OLD_FILES+=usr/include/netncp/ncp_rq.h
+OLD_FILES+=usr/include/netncp/ncp_sock.h
+OLD_FILES+=usr/include/netncp/ncp_subr.h
+OLD_FILES+=usr/include/netncp/ncp_user.h
+OLD_FILES+=usr/include/netncp/ncpio.h
+OLD_FILES+=usr/include/netncp/nwerror.h
+#OLD_DIRS+=usr/include/netncp
+OLD_FILES+=usr/lib/libncp.a
+OLD_FILES+=usr/lib/libncp.so
+OLD_LIBS+=usr/lib/libncp.so.4
+OLD_FILES+=usr/lib/libncp_p.a
+OLD_FILES+=usr/lib32/libncp.a
+OLD_FILES+=usr/lib32/libncp.so
+OLD_LIBS+=usr/lib32/libncp.so.4
+OLD_FILES+=usr/lib32/libncp_p.a
+OLD_FILES+=usr/sbin/mount_nwfs
+OLD_FILES+=usr/share/man/man1/ncplist.1.gz
+OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
+OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
+OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
 # 20121004: remove incomplete unwind.h
 OLD_FILES+=usr/include/clang/3.2/unwind.h
 # 20120908: pf cleanup
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc	(revision 241642)
+++ tools/build/mk/OptionalObsoleteFiles.inc	(working copy)
@@ -3458,47 +3458,6 @@
 # Listing all of them here is overkill.
 #.endif
 
-.if ${MK_NCP} == no
-OLD_FILES+=usr/bin/ncplist
-OLD_FILES+=usr/bin/ncplogin
-OLD_FILES+=usr/bin/ncplogout
-OLD_FILES+=usr/include/fs/nwfs/nwfs.h
-OLD_FILES+=usr/include/fs/nwfs/nwfs_mount.h
-OLD_FILES+=usr/include/fs/nwfs/nwfs_node.h
-OLD_FILES+=usr/include/fs/nwfs/nwfs_subr.h
-#OLD_DIRS+=usr/include/fs/nwfs
-OLD_FILES+=usr/include/netncp/ncp.h
-OLD_FILES+=usr/include/netncp/ncp_cfg.h
-OLD_FILES+=usr/include/netncp/ncp_conn.h
-OLD_FILES+=usr/include/netncp/ncp_file.h
-OLD_FILES+=usr/include/netncp/ncp_lib.h
-OLD_FILES+=usr/include/netncp/ncp_ncp.h
-OLD_FILES+=usr/include/netncp/ncp_nls.h
-OLD_FILES+=usr/include/netncp/ncp_rcfile.h
-OLD_FILES+=usr/include/netncp/ncp_rq.h
-OLD_FILES+=usr/include/netncp/ncp_sock.h
-OLD_FILES+=usr/include/netncp/ncp_subr.h
-OLD_FILES+=usr/include/netncp/ncp_user.h
-OLD_FILES+=usr/include/netncp/ncpio.h
-OLD_FILES+=usr/include/netncp/nwerror.h
-#OLD_DIRS+=usr/include/netncp
-OLD_FILES+=usr/lib/libncp.a
-OLD_FILES+=usr/lib/libncp.so
-OLD_LIBS+=usr/lib/libncp.so.4
-OLD_FILES+=usr/lib/libncp_p.a
-.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
-OLD_FILES+=usr/lib32/libncp.a
-OLD_FILES+=usr/lib32/libncp.so
-OLD_LIBS+=usr/lib32/libncp.so.4
-OLD_FILES+=usr/lib32/libncp_p.a
-.endif
-OLD_FILES+=usr/sbin/mount_nwfs
-OLD_FILES+=usr/share/man/man1/ncplist.1.gz
-OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
-OLD_FILES+=usr/share/man/man1/ncplogout.1.gz
-OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
-.endif
-
 .if ${MK_NDIS} == no
 OLD_FILES+=usr/sbin/ndiscvt
 OLD_FILES+=usr/sbin/ndisgen