These group names may be used as a cookie, so replace any non-fs-safe characters.

One example is in cddl/usr.sbin/dtrace/tests/common/aggs.  It could be
fixed but other uses of this would break, especially in the
DIRDEPS_BUILD which uses the group names for stage cookies.

MFC after:	1 week
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-03-09 22:45:00 +00:00
parent 9593179053
commit 17e75d1cd2
3 changed files with 12 additions and 6 deletions

View File

@ -6,8 +6,10 @@
CONFGROUPS?= CONFS
_CONFGROUPS= ${CONFGROUPS:C,[/*],_,g}
.if !target(buildconfig)
.for group in ${CONFGROUPS}
.for group in ${_CONFGROUPS}
buildconfig: ${${group}}
.endfor
.endif
@ -17,7 +19,7 @@ all: buildconfig
.endif
.if !target(installconfig)
.for group in ${CONFGROUPS}
.for group in ${_CONFGROUPS}
.if defined(${group}) && !empty(${group})
${group}OWN?= ${SHAREOWN}

View File

@ -9,7 +9,9 @@ __<bsd.files.mk>__:
FILESGROUPS?= FILES
.for group in ${FILESGROUPS}
_FILESGROUPS= ${FILESGROUPS:C,[/*],_,g}
.for group in ${_FILESGROUPS}
# Add in foo.yes and remove duplicates from all the groups
${${group}}:= ${${group}} ${${group}.yes}
${${group}}:= ${${group}:O:u}
@ -20,7 +22,7 @@ buildfiles: ${${group}}
all: buildfiles
.endif
.for group in ${FILESGROUPS}
.for group in ${_FILESGROUPS}
.if defined(${group}) && !empty(${group})
installfiles: installfiles-${group}

View File

@ -8,8 +8,10 @@
INCSGROUPS?= INCS
_INCSGROUPS= ${INCSGROUPS:C,[/*],_,g}
.if !target(buildincludes)
.for group in ${INCSGROUPS}
.for group in ${_INCSGROUPS}
buildincludes: ${${group}}
.endfor
.endif
@ -19,7 +21,7 @@ all: buildincludes
.endif
.if !target(installincludes)
.for group in ${INCSGROUPS}
.for group in ${_INCSGROUPS}
.if defined(${group}) && !empty(${group})
${group}OWN?= ${BINOWN}