Move all devd related configs to sbin/devd/

This helps with pkgbase as it switches these to using CONFS so they are
properly tagged as config files.

Approved by:	will (mentor), imp
Differential Revision:	https://reviews.freebsd.org/D16781
This commit is contained in:
Brad Davis 2018-08-21 16:51:45 +00:00
parent 83a90bffd8
commit 44e1285c7b
11 changed files with 24 additions and 36 deletions

View File

@ -13,7 +13,6 @@ SUBDIR+=sendmail
.endif
BIN1= crontab \
devd.conf \
devfs.conf \
dhclient.conf \
disktab \
@ -152,7 +151,6 @@ distribution:
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap

View File

@ -1,34 +0,0 @@
# $FreeBSD$
.include <src.opts.mk>
FILEGROUPS= FILES
FILES+= devmatch.conf
.if ${MACHINE} == "powerpc"
FILES+= apple.conf
.endif
.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
.if ${MK_ACPI} != "no"
FILES+= asus.conf
.endif
.if ${MK_HYPERV} != "no"
FILES+= hyperv.conf
.endif
.endif
.if ${MK_USB} != "no"
FILES+= uath.conf ulpt.conf
.endif
.if ${MK_ZFS} != "no"
FILES+= zfs.conf
.endif
NO_OBJ=
FILESDIR= /etc/devd
FILESMODE= 644
.include <bsd.prog.mk>

View File

@ -4,6 +4,30 @@
WARNS?= 3
PACKAGE=runtime
CONFGROUPS= CONFS DEVD
CONFS= devd.conf
DEVD= devmatch.conf
DEVDDIR= /etc/devd
.if ${MK_ACPI} != "no"
DEVD+= asus.conf
.endif
.if ${MK_HYPERV} != "no"
DEVD+= hyperv.conf
.endif
.if ${MK_USB} != "no"
DEVD+= uath.conf ulpt.conf
.endif
.if ${MACHINE_ARCH} == "powerpc"
DEVD+= apple.conf
.endif
.if ${MK_ZFS} != "no"
DEVD+= zfs.conf
.endif
PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
MAN= devd.8 devd.conf.5