patch-queues/mq_vpanels: oi-releng-disable_hypervisor@f949115789a8 (annotated)

0 fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	1	Disable hypervisor module f or oi_147 since libvirt (xvm) is missing
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	2
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	3	diff --git a/usr/src/cmd/applications/Makefile b/usr/src/cmd/applications/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	4	--- a/usr/src/cmd/applications/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	5	+++ b/usr/src/cmd/applications/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	6	@@ -29,7 +29,6 @@
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	7	APPS= vp-apache.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	8	vp-coreadm.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	9	vp-firewall.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	10	- vp-hypervisor.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	11	vp-shares.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	12	vp-svcs.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	13	vp-sysmon.desktop \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	14	diff --git a/usr/src/cmd/rad/mod/Makefile b/usr/src/cmd/rad/mod/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	15	--- a/usr/src/cmd/rad/mod/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	16	+++ b/usr/src/cmd/rad/mod/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	17	@@ -42,7 +42,7 @@
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	18	usermgr \
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	19	zones
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	20	MODULE_SUBDIRS_sparc = $(MODULE_SUBDIRS)
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	21	-MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS) hypervisor
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	22	+MODULE_SUBDIRS_i386 = $(MODULE_SUBDIRS)
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	23
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	24	SUBDIRS = $(PROTO_SUBDIRS) $(XPORT_SUBDIRS) $(MODULE_SUBDIRS_$(ISA))
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	25
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	26	diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	27	--- a/usr/src/pkg/Makefile
fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	28	+++ b/usr/src/pkg/Makefile
4 477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	29	@@ -47,7 +47,6 @@
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	30	MFDIR_normal = manifests
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	31	MFDIR_wos = manifests_wos
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	32	MFDIR=$(MFDIR_$(TYPE))
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	33	-BAGGAGE = baggage
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	34
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	35	publish := PKG_REPO = http://localhost:80
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	36
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	37	@@ -81,14 +80,13 @@
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	38	DYNAMIC_MANIFEST_wos = system-management-visual-panels.mf
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	39	DYNAMIC_MANIFEST = $(DYNAMIC_MANIFEST_$(TYPE))
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	40
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	41	-STATIC_MDIRS = $(MFDIR) $(BAGGAGE)
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	42	+STATIC_MDIRS = $(MFDIR)
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	43	MDIRS = $(STATIC_MDIRS) $(SCRATCH)
0 fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	44
4 477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	45	# This unfortunately gets executed a number of times.
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	46	# Alternative implementations aren't much better.
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	47	RMANIFESTS.cmd = $(MOG.filter) $(MFDIR)/*.mf
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	48	-BAGGAGE.cmd = echo $(BAGGAGE)/*.mf
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	49	-RMANIFESTS = $(RMANIFESTS.cmd:sh) $(BAGGAGE.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%)
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	50	+RMANIFESTS = $(RMANIFESTS.cmd:sh) $(DYNAMIC_MANIFEST:%=$(SCRATCH)/%)
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	51	MANIFESTS.cmd = for i in $(RMANIFESTS); do basename $$i; done
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	52	MANIFESTS = $(MANIFESTS.cmd:sh)
0 fbc79057b3aa Add vpanels rebranding and RE patches Albert Lee <trisk@opensolaris.org> parents: diff changeset	53
4 477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	54	@@ -126,9 +124,6 @@
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	55	# Rules for mogrifying package manifests whereever they may be found
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	56	#
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	57
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	58	-$(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(BAGGAGE)/%.mf
6 ed4389fd16e4 Fix hypervisor patch Jon Tibble <meths@btinternet.com> parents: 4 diff changeset	59	- $(MOG.mf)
4 477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	60	-
477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	61	$(SCRATCH)/%.mog: $(SCRATCH) $(TRANSFORMS:%=transforms/%) $(MFDIR)/%.mf
6 ed4389fd16e4 Fix hypervisor patch Jon Tibble <meths@btinternet.com> parents: 4 diff changeset	62	$(MOG.mf)
4 477298610f38 Update hypervisor removal Jon Tibble <meths@btinternet.com> parents: 0 diff changeset	63
7 92e60ef9bdcb Another hypervisor removal fix Jon Tibble <meths@btinternet.com> parents: 6 diff changeset	64	diff --git a/usr/src/pkg/manifests/system-management-visual-panels-hypervisor.mf b/usr/src/pkg/baggage/system-management-visual-panels-hypervisor.mf
92e60ef9bdcb Another hypervisor removal fix Jon Tibble <meths@btinternet.com> parents: 6 diff changeset	65	rename from usr/src/pkg/manifests/system-management-visual-panels-hypervisor.mf
92e60ef9bdcb Another hypervisor removal fix Jon Tibble <meths@btinternet.com> parents: 6 diff changeset	66	rename to usr/src/pkg/baggage/system-management-visual-panels-hypervisor.mf

author	Jon Tibble <meths@btinternet.com>
	Thu, 02 Dec 2010 12:39:52 +0000
changeset 8	f949115789a8
parent 7	92e60ef9bdcb
permissions	-rw-r--r--