diff options
| author | gjb <gjb@FreeBSD.org> | 2014-09-26 01:08:31 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-09-26 01:08:31 +0000 |
| commit | 9ffa63da8b3eb152cd548cd3be42835f22a16bac (patch) | |
| tree | 8da1b1d926bf9d196a7ca20cf478b278c86b22c4 /tools/build | |
| parent | b4e7c78b8f72409ce09222bbcba90e6a277ee622 (diff) | |
| download | FreeBSD-src-9ffa63da8b3eb152cd548cd3be42835f22a16bac.zip FreeBSD-src-9ffa63da8b3eb152cd548cd3be42835f22a16bac.tar.gz | |
Revert r272128:
Though this passes the buildworld test, this fails during
installworld with:
make[3]: "/releng/scripts-release/chroots/10/i386/release/etc/devd/Makefile"
line 13: Malformed conditional (${MK_HYPERV} != "no")
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 8 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_HYPERV | 2 | ||||
| -rw-r--r-- | tools/build/options/WITH_HYPERV | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index cfa369b..62542b7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -4670,11 +4670,3 @@ OLD_FILES+=usr/bin/svnserve OLD_FILES+=usr/bin/svnsync OLD_FILES+=usr/bin/svnversion .endif - -.if ${MK_HYPERV} == no -OLD_FILES+=etc/devd/hyperv.conf -OLD_FILES+=usr/libexec/hyperv/hv_set_ifconfig -OLD_FILES+=usr/libexec/hyperv/hv_get_dns_info -OLD_FILES+=usr/libexec/hyperv/hv_get_dhcp_info -OLD_FILES+=usr/sbin/hv_kvpd -.endif diff --git a/tools/build/options/WITHOUT_HYPERV b/tools/build/options/WITHOUT_HYPERV deleted file mode 100644 index ef63f70..0000000 --- a/tools/build/options/WITHOUT_HYPERV +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to not build or install HyperV utilities. diff --git a/tools/build/options/WITH_HYPERV b/tools/build/options/WITH_HYPERV deleted file mode 100644 index a6bdf72..0000000 --- a/tools/build/options/WITH_HYPERV +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to build and install HyperV utilities. |
