Date: Tue, 26 Feb 2008 12:17:03 GMT From: Richard Tector <richardtector@thekeelecentre.com> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/121118: Update OptionalObsoleteFiles.inc for builds without NCP Message-ID: <200802261217.m1QCH3Ai038370@www.freebsd.org> Resent-Message-ID: <200802261220.m1QCK3b0090142@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121118
>Category: misc
>Synopsis: Update OptionalObsoleteFiles.inc for builds without NCP
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 26 12:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Richard Tector
>Release: FreeBSD 7.0-PRERELEASE
>Organization:
CAPL Limited
>Environment:
FreeBSD daffy.tector.org.uk 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #0: Mon Feb 25 18:07:37 GMT 2008 richard@daffy.tector.org.uk:/usr/obj/usr/src/sys/DAFFY amd64
>Description:
The attached patch adds a list to tools/build/mk/OptionalObsoleteFiles.inc to remove the files built under the NCP category.
Therefore, setting WITHOUT_NCP=true in src.conf with patch allows make delete-old to remove the relevant files from the base system.
NB. I have added the lib32 alternatives for amd64. I assume these actually need putting under an if ARCH=amd64 if? I did not find any other examples in the original file where lib32/* libraries are set to be removed on a 64bit system.
The patch works fine however on an i386 system I have.
>How-To-Repeat:
>Fix:
See attached patch.
Patch attached with submission follows:
--- tools/build/mk/OptionalObsoleteFiles.inc.old 2008-01-21 18:47:37.000000000 +0000
+++ tools/build/mk/OptionalObsoleteFiles.inc 2008-02-26 12:18:06.000000000 +0000
@@ -940,9 +940,35 @@
# Listing all of them here is overkill.
#.endif
-#.if ${MK_NCP} == no
-# to be filled in
-#.endif
+.if ${MK_NCP} == no
+OLD_FILES+=usr/bin/ncplist
+OLD_FILES+=usr/bin/ncplogin
+OLD_FILES+=usr/lib/libncp.a
+OLD_FILES+=usr/lib/libncp.so
+OLD_LIBS+=usr/lib/libncp.so.3
+OLD_FILES+=usr/lib32/libncp.a
+OLD_FILES+=usr/lib32/libncp.so
+OLD_LIBS+=usr/lib32/libncp.so.3
+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/man8/mount_nwfs.8.gz
+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
+.endif
.if ${MK_NETCAT} == no
OLD_FILES+=usr/bin/nc
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802261217.m1QCH3Ai038370>