d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the USB and ZFS devd configuration files optional depending on the

Browse Source 
values of MK_USB/MK_ZFS

Making zfs.conf optional resolves PR # 186971

PR: 186971
Phabric: D606
Approved by: jmmv (mentor)
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2014-08-15 21:35:31 +00:00
parent 51483c42ed
commit aecd25eea9
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etc/devd/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
FILES= uath.conf usb.conf zfs.conf
.include <src.opts.mk>
.if ${MACHINE} == "powerpc"
FILES+= apple.conf
@ -10,6 +10,14 @@ FILES+= apple.conf
FILES+= asus.conf
.endif
.if ${MK_USB} != "no"
FILES+= uath.conf usb.conf
.endif
.if ${MK_ZFS} != "no"
FILES+= zfs.conf
.endif
NO_OBJ=
FILESDIR= /etc/devd
FILESMODE= 644

8
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -444,6 +444,7 @@ OLD_FILES+=usr/share/man/man1/dtrace.1.gz
OLD_FILES+=boot/gptzfsboot
OLD_FILES+=boot/zfsboot
OLD_FILES+=boot/zfsloader
OLD_FILES+=etc/devd/zfs.conf
OLD_FILES+=etc/periodic/daily/404.status-zfs
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
OLD_LIBS+=lib/libzfs.so.2
@ -4677,9 +4678,10 @@ OLD_FILES+=usr/sbin/unbound-control
OLD_FILES+=usr/sbin/unbound-control-setup
.endif
#.if ${MK_USB} == no
# to be filled in
#.endif
.if ${MK_USB} == no
OLD_FILES+=etc/devd/uauth.conf
OLD_FILES+=etc/devd/usb.conf
.endif
.if ${MK_UTMPX} == no
OLD_FILES+=etc/periodic/monthly/200.accounting