Author: ngie
Date: Fri Aug 15 21:35:31 2014
New Revision: 270028
URL: http://svnweb.freebsd.org/changeset/base/270028
Log:
Make the USB and ZFS devd configuration files optional depending on the
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
Modified:
head/etc/devd/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/etc/devd/Makefile
==============================================================================
--- head/etc/devd/Makefile Fri Aug 15 21:22:49 2014 (r270027)
+++ head/etc/devd/Makefile Fri Aug 15 21:35:31 2014 (r270028)
@@ -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
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Fri Aug 15 21:22:49
2014 (r270027)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Fri Aug 15 21:35:31
2014 (r270028)
@@ -444,6 +444,7 @@ OLD_FILES+=usr/share/man/man1/dtrace.1.g
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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
