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 /usr.sbin | |
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 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile.amd64 | 3 | ||||
-rw-r--r-- | usr.sbin/Makefile.i386 | 3 | ||||
-rw-r--r-- | usr.sbin/hyperv/Makefile | 7 | ||||
-rw-r--r-- | usr.sbin/hyperv/Makefile.inc | 3 | ||||
-rw-r--r-- | usr.sbin/hyperv/tools/Makefile | 13 |
5 files changed, 0 insertions, 29 deletions
diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index 2d1a3e8..b821625 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -18,9 +18,6 @@ SUBDIR+= boot0cfg SUBDIR+= btxld .endif SUBDIR+= cpucontrol -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif SUBDIR+= kgmon SUBDIR+= lptcontrol SUBDIR+= mount_smbfs diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index de7bb46..7d66f78 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -9,9 +9,6 @@ SUBDIR+= asf SUBDIR+= btxld .endif SUBDIR+= cpucontrol -.if ${MK_HYPERV} != "no" -SUBDIR+= hyperv -.endif SUBDIR+= kgmon SUBDIR+= kgzip SUBDIR+= lptcontrol diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile deleted file mode 100644 index c11b341..0000000 --- a/usr.sbin/hyperv/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# $FreeBSD$ - -.include <bsd.own.mk> - -SUBDIR = tools - -.include <bsd.subdir.mk> diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc deleted file mode 100644 index 265f86d..0000000 --- a/usr.sbin/hyperv/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# $FreeBSD$ - -.include "../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/Makefile b/usr.sbin/hyperv/tools/Makefile deleted file mode 100644 index 3cfc001..0000000 --- a/usr.sbin/hyperv/tools/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -.include <bsd.own.mk> - -HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../contrib/hyperv/tools -.PATH: ${HV_KVP_DAEMON_DISTDIR} - -PROG= hv_kvp_daemon -MAN= hv_kvp_daemon.8 - -CFLAGS+= -I${.CURDIR}/../../../sys/dev/hyperv/utilities - -.include <bsd.prog.mk> |