svn commit: r278244 - in stable/10: etc/devd tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Thu Feb  5 10:21:21 2015
New Revision: 278244
URL: https://svnweb.freebsd.org/changeset/base/278244

Log:
  MFC r270028:
  
  r270028:
  
    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:
  stable/10/etc/devd/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/devd/Makefile
==============================================================================
--- stable/10/etc/devd/Makefile	Thu Feb  5 10:06:44 2015	(r278243)
+++ stable/10/etc/devd/Makefile	Thu Feb  5 10:21:21 2015	(r278244)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-FILES=	uath.conf usb.conf zfs.conf
-
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
 .endif
@@ -16,6 +14,14 @@ FILES+=	asus.conf
 FILES+=	hyperv.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: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 10:06:44 2015	(r278243)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 10:21:21 2015	(r278244)
@@ -511,6 +511,7 @@ OLD_DIRS+=usr/share/dtrace
 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
@@ -4732,9 +4733,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