Author: ngie
Date: Thu Feb 5 10:26:24 2015
New Revision: 278245
URL: https://svnweb.freebsd.org/changeset/base/278245
Log:
MFstable/10 r278244:
MFC 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/9/etc/devd/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/devd/Makefile
==============================================================================
--- stable/9/etc/devd/Makefile Thu Feb 5 10:21:21 2015 (r278244)
+++ stable/9/etc/devd/Makefile Thu Feb 5 10:26:24 2015 (r278245)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= uath.conf usb.conf zfs.conf
+.include <bsd.own.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: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 10:21:21
2015 (r278244)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 10:26:24
2015 (r278245)
@@ -709,6 +709,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
@@ -3854,9 +3855,10 @@ OLD_FILES+=usr/share/man/man8/telnetd.8.
# to be filled in
#.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-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
