From 77e4a39103314a5c1f3ca673097e0b7f78ebf361 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Mon, 17 Sep 2018 19:20:50 +0000 Subject: [PATCH] Move rpc and netconfig to lib/libc/rpc/ This uses relative paths to make it more specific to avoid any potential future problems with .PATH and leverages CONFS. libc was picked as the destination location for these because of the syscalls that use these files as the lowest level place they are referenced. Approved by: re (gjb), will (mentor) Differential Revision: https://reviews.freebsd.org/D17163 --- etc/Makefile | 2 -- lib/libc/rpc/Makefile.inc | 1 + {etc => lib/libc/rpc}/netconfig | 0 {etc => lib/libc/rpc}/rpc | 0 4 files changed, 1 insertion(+), 2 deletions(-) rename {etc => lib/libc/rpc}/netconfig (100%) rename {etc => lib/libc/rpc}/rpc (100%) diff --git a/etc/Makefile b/etc/Makefile index 91eaa0ca50fc..164e769fea11 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -21,12 +21,10 @@ BIN1= \ libmap.conf \ login.access \ mac.conf \ - netconfig \ phones \ rc.bsdextended \ rc.firewall \ remote \ - rpc \ termcap.small # NB: keep these sorted by MK_* knobs diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index c3e5502d68df..9f3bb453c0b6 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -2,6 +2,7 @@ # $FreeBSD$ .PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/. +CONFS= rpc/netconfig rpc/rpc SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \ diff --git a/etc/netconfig b/lib/libc/rpc/netconfig similarity index 100% rename from etc/netconfig rename to lib/libc/rpc/netconfig diff --git a/etc/rpc b/lib/libc/rpc/rpc similarity index 100% rename from etc/rpc rename to lib/libc/rpc/rpc