diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-05 10:21:21 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-05 10:21:21 +0000 |
| commit | cf206fc8f2fb52ec7b32430b02caeca7cc9d4f22 (patch) | |
| tree | 7be6c27bb7cff35dde133a4770839efe97b02a05 | |
| parent | 4b0ec0fcb80978afa6204774c050559d41d5b547 (diff) | |
| download | FreeBSD-src-cf206fc8f2fb52ec7b32430b02caeca7cc9d4f22.zip FreeBSD-src-cf206fc8f2fb52ec7b32430b02caeca7cc9d4f22.tar.gz | |
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
| -rw-r--r-- | etc/devd/Makefile | 10 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/etc/devd/Makefile b/etc/devd/Makefile index a6c3b58..9afdb47 100644 --- a/etc/devd/Makefile +++ b/etc/devd/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 536617f..bdbf89e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 |
