Disable hypervisor module f or oi_147 since libvirt (xvm) is missing

diff --git a/usr/src/cmd/applications/Makefile b/usr/src/cmd/applications/Makefile
--- a/usr/src/cmd/applications/Makefile
+++ b/usr/src/cmd/applications/Makefile
@@ -29,7 +29,6 @@
 APPS=	vp-apache.desktop \
 	vp-coreadm.desktop \
 	vp-firewall.desktop \
-	vp-hypervisor.desktop \
 	vp-shares.desktop \
 	vp-svcs.desktop \
 	vp-sysmon.desktop \
diff --git a/usr/src/cmd/rad/mod/Makefile b/usr/src/cmd/rad/mod/Makefile
--- a/usr/src/cmd/rad/mod/Makefile
+++ b/usr/src/cmd/rad/mod/Makefile
@@ -42,7 +42,7 @@
 	usermgr \
 	zones
 MODULE_SUBDIRS_sparc = $(MODULE_SUBDIRS)
-MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS) hypervisor
+MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS)
 
 SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA))
 
diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
--- a/usr/src/pkg/Makefile
+++ b/usr/src/pkg/Makefile
@@ -47,7 +47,6 @@
 MFDIR_normal = manifests
 MFDIR_wos = manifests_wos
 MFDIR=$(MFDIR_$(TYPE))
-BAGGAGE = baggage
 
 publish := PKG_REPO = http://localhost:80
 
@@ -81,14 +80,13 @@
 DYNAMIC_MANIFEST_wos = system-management-visual-panels.mf
 DYNAMIC_MANIFEST = $(DYNAMIC_MANIFEST_$(TYPE))
 
-STATIC_MDIRS = $(MFDIR) $(BAGGAGE)
+STATIC_MDIRS = $(MFDIR)
 MDIRS = $(STATIC_MDIRS) $(SCRATCH)
 
 # This unfortunately gets executed a number of times.
 # Alternative implementations aren't much better.
 RMANIFESTS.cmd = $(MOG.filter) $(MFDIR)/*.mf
-BAGGAGE.cmd = echo $(BAGGAGE)/*.mf
-RMANIFESTS = $(RMANIFESTS.cmd:sh) $(BAGGAGE.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%)
+RMANIFESTS = $(RMANIFESTS.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%)
 MANIFESTS.cmd = for i in $(RMANIFESTS); do basename $$i; done
 MANIFESTS = $(MANIFESTS.cmd:sh)
 
@@ -126,9 +124,6 @@
 # Rules for mogrifying package manifests whereever they may be found
 #
 
-$(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(BAGGAGE)/%.mf
-       $(MOG.mf)
-
 $(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(MFDIR)/%.mf
        $(MOG.mf)