svn commit: r289085 - head/share/mk
Baptiste Daroussin
bapt at FreeBSD.org
Fri Oct 9 21:57:44 UTC 2015
Author: bapt
Date: Fri Oct 9 21:57:42 2015
New Revision: 289085
URL: https://svnweb.freebsd.org/changeset/base/289085
Log:
Add a new bsd.confs.mk similar to bsd.files.mk or bsd.incs.mk
It defines a CONFS variable for all files supposed to be installed as a
configuration file and handle as such
Added:
head/share/mk/bsd.confs.mk (contents, props changed)
Modified:
head/share/mk/bsd.README
head/share/mk/bsd.lib.mk
head/share/mk/bsd.own.mk
head/share/mk/bsd.prog.mk
head/share/mk/bsd.progs.mk
head/share/mk/bsd.subdir.mk
Modified: head/share/mk/bsd.README
==============================================================================
--- head/share/mk/bsd.README Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.README Fri Oct 9 21:57:42 2015 (r289085)
@@ -18,6 +18,7 @@ bsd.lib.mk.
bsd.arch.inc.mk - includes arch-specific Makefile.$arch
bsd.compiler.mk - defined based on current compiler
+bsd.confs.mk - install of configuration files
bsd.cpu.mk - sets CPU/arch-related variables (included from sys.mk)
bsd.dep.mk - handle Makefile dependencies
bsd.doc.mk - building troff system documents
Added: head/share/mk/bsd.confs.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/share/mk/bsd.confs.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -0,0 +1,87 @@
+# $FreeBSD$
+
+.if !target(__<bsd.init.mk>__)
+.error bsd.conf.mk cannot be included directly.
+.endif
+
+.if ${MK_INCLUDES} != "no"
+CONFGROUPS?= CONFS
+
+.if !target(buildconfig)
+.for group in ${CONFSGROUPS}
+buildconfig: ${${group}}
+.endfor
+.endif
+
+all: buildconfig
+
+.if !target(installconfig)
+.for group in ${CONFGROUPS}
+.if defined(${group}) && !empty(${group})
+
+${group}OWN?= ${SHAREOWN}
+${group}GRP?= ${SHAREGRP}
+${group}MODE?= ${SHAREMODE}
+${group}DIR?= ${ETCDIR}/
+STAGE_SETS+= ${group}
+STAGE_DIR.${group}= ${STAGE_OBJTOP}${${group}DIR}
+STAGE_SYMLINKS_DIR.${group}= ${STAGE_OBJTOP}
+
+_${group}CONFS=
+.for cnf in ${${group}}
+.if defined(${group}OWN_${cnf:T}) || defined(${group}GRP_${cnf:T}) || \
+ defined(${group}MODE_${cnf:T}) || defined(${group}DIR_${cnf:T}) || \
+ defined(${group}NAME_${cnf:T}) || defined(${group}NAME)
+${group}OWN_${cnf:T}?= ${${group}OWN}
+${group}GRP_${cnf:T}?= ${${group}GRP}
+${group}MODE_${cnf:T}?= ${${group}MODE}
+${group}DIR_${cnf:T}?= ${${group}DIR}
+.if defined(${group}NAME)
+${group}NAME_${cnf:T}?= ${${group}NAME}
+.else
+${group}NAME_${cnf:T}?= ${cnf:T}
+.endif
+STAGE_AS_SETS+= ${cnf:T}
+STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
+# XXX {group}OWN,GRP,MODE
+STAGE_DIR.${cnf:T}= ${STAGE_OBJTOP}${${group}DIR_${cnf:T}}
+stage_as.${cnf:T}: ${cnf}
+stage_config: stage_as.${cnf:T}
+
+installconfig: _${group}INS_${cnf:T}
+_${group}INS_${cnf:T}: ${cnf}
+ ${INSTALL} -C -o ${${group}OWN_${.ALLSRC:T}} \
+ -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
+ ${.ALLSRC} \
+ ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
+.else
+_${group}CONFS+= ${cnf}
+.endif
+.endfor
+.if !empty(_${group}CONFS)
+stage_files.${group}: ${_${group}CONFS}
+stage_config: stage_files.${group}
+
+installconfig: _${group}INS
+_${group}INS: ${_${group}CONFS}
+.if defined(${group}NAME)
+ ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}/${${group}NAME}
+.else
+ ${INSTALL} -C -o ${${group}OWN} -g ${${group}GRP} -m ${${group}MODE} \
+ ${.ALLSRC} ${DESTDIR}${${group}DIR}
+.endif
+.endif
+
+.endif # defined(${group}) && !empty(${group})
+.endfor
+
+.endif # !target(installconfig)
+
+.if ${MK_STAGING} != "no" && !defined(_SKIP_BUILD)
+.if !defined(NO_STAGE_CONFIG)
+STAGE_TARGETS+= stage_config
+.endif
+.endif
+
+.endif # ${MK_TOOLCHAIN} != "no"
Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.lib.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -390,6 +390,7 @@ _libinstall:
.include <bsd.nls.mk>
.include <bsd.files.mk>
.include <bsd.incs.mk>
+.include <bsd.confs.mk>
.endif
.include <bsd.links.mk>
Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.own.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -213,6 +213,7 @@ NLSGRP?= ${SHAREGRP}
NLSMODE?= ${NOBINMODE}
INCLUDEDIR?= /usr/include
+ETCDIR?= /etc
#
# install(1) parameters.
Modified: head/share/mk/bsd.prog.mk
==============================================================================
--- head/share/mk/bsd.prog.mk Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.prog.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -249,6 +249,7 @@ _SCRIPTSINS_${script:T}: ${script}
NLSNAME?= ${PROG}
.include <bsd.nls.mk>
+.include <bsd.confs.mk>
.include <bsd.files.mk>
.include <bsd.incs.mk>
.include <bsd.links.mk>
Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.progs.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -71,7 +71,7 @@ UPDATE_DEPENDFILE = NO
# These are handled by the main make process.
.ifdef _RECURSING_PROGS
-_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS
+_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS CONFGROUPS
.for v in ${_PROGS_GLOBAL_VARS}
$v =
.endfor
Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk Fri Oct 9 21:34:46 2015 (r289084)
+++ head/share/mk/bsd.subdir.mk Fri Oct 9 21:57:42 2015 (r289085)
@@ -122,7 +122,7 @@ _sub.${__target}: _SUBDIR
.endif
.endfor
-.for __target in files includes
+.for __target in files includes config
.for __stage in build install
${__stage}${__target}:
.if make(${__stage}${__target})
More information about the svn-src-head
mailing list