Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Sep 2018 00:25:00 +0000 (UTC)
From:      Brad Davis <brd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r338741 - in head: etc libexec/rtld-elf
Message-ID:  <201809180025.w8I0P0qY021502@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brd
Date: Tue Sep 18 00:25:00 2018
New Revision: 338741
URL: https://svnweb.freebsd.org/changeset/base/338741

Log:
  Move libmap.conf to libexec/rtld-elf/
  
  This leverages CONFS to handle the config file install.
  
  Approved by:	re (gjb), will (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17161

Added:
  head/libexec/rtld-elf/libmap.conf
     - copied unchanged from r338740, head/etc/libmap.conf
Deleted:
  head/etc/libmap.conf
Modified:
  head/etc/Makefile
  head/libexec/rtld-elf/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 18 00:11:45 2018	(r338740)
+++ head/etc/Makefile	Tue Sep 18 00:25:00 2018	(r338741)
@@ -17,7 +17,6 @@ BIN1=	\
 	group \
 	hosts.allow \
 	libalias.conf \
-	libmap.conf \
 	login.access \
 	mac.conf \
 	phones \

Modified: head/libexec/rtld-elf/Makefile
==============================================================================
--- head/libexec/rtld-elf/Makefile	Tue Sep 18 00:11:45 2018	(r338740)
+++ head/libexec/rtld-elf/Makefile	Tue Sep 18 00:25:00 2018	(r338741)
@@ -8,6 +8,7 @@
 PACKAGE=	clibs
 MK_SSP=		no
 
+CONFS=		libmap.conf
 PROG?=		ld-elf.so.1
 .if (${PROG:M*ld-elf32*} != "")
 TAGS+=		lib32

Copied: head/libexec/rtld-elf/libmap.conf (from r338740, head/etc/libmap.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/libexec/rtld-elf/libmap.conf	Tue Sep 18 00:25:00 2018	(r338741, copy of r338740, head/etc/libmap.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+includedir /usr/local/etc/libmap.d



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809180025.w8I0P0qY021502>