--- a/oi-releng-disable_hypervisor	Thu Oct 28 19:22:00 2010 +0100
+++ b/oi-releng-disable_hypervisor	Fri Oct 29 00:36:06 2010 +0100
@@ -26,13 +26,38 @@
 diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
 --- a/usr/src/pkg/Makefile
 +++ b/usr/src/pkg/Makefile
-@@ -47,8 +47,7 @@
- MANIFEST_DOC = \
- 	system-management-visual-panels-doc.mf
+@@ -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)
  
--MANIFESTS_i386 = \
--	system-management-visual-panels-hypervisor.mf
-+MANIFESTS_i386 =
+ # 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)
  
- MANIFESTS = $(MANIFESTS_$(ISA)) \
- 	$(MANIFEST_DOC) \
+@@ -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)
+