--- a/usr/src/pkg/Makefile	Tue Aug 30 15:23:33 2011 -0700
+++ b/usr/src/pkg/Makefile	Wed Aug 31 10:25:52 2011 +1000
@@ -1,4 +1,3 @@
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -599,9 +598,9 @@
 	@print "Processing manifest $(<F)"
 	@pkgfmt -c $<
 	$(PKGDEBUG)$(RM) $(@) $(@:%.mog=%) $(@:%.mog=%.nodepend) \
-		$(@:%.mog=%.lics) $(@:%.mog=%).metadata.* $(@).vars
+		$(@:%.mog=%.lics) $(@:%.mog=%).metadata.*
 	$(PKGDEBUG)PKGMOG_OUT=`$(PKGMOGRIFY) $(PKGMOG_VERBOSE) $(PM_INC:%= -I %) \
-		$(PKGMOG_DEFINES:%=-D %) -P $(@).vars -O $(@) \
+		$(PKGMOG_DEFINES:%=-D %) -O $(@) \
 		$(<) $(PM_TRANSFORMS)`; \
 	if [ "$$?" != "0" ]; then \
 		exit 1; \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkg/manifests/system-library-boot-management.mf	Wed Aug 31 10:25:52 2011 +1000
@@ -0,0 +1,87 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri value=pkg:/system/library/boot-management@$(PKGVERS)
+set name=pkg.summary value="Boot management libraries"
+set name=pkg.description \
+    value="Boot management libraries for creating/managing a bootable system"
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
+set name=org.opensolaris.noincorp value=true
+set name=variant.arch value=$(ARCH)
+set name=variant.opensolaris.zone value=global value=nonglobal
+dir  path=usr group=sys
+dir  path=usr/lib
+dir  path=usr/lib/python2.6
+dir  path=usr/lib/python2.6/vendor-packages
+dir  path=usr/lib/python2.6/vendor-packages/bootmgmt
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/solaris.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/solaris.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/solaris.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/solaris.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/solaris.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/solaris.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/bios.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/bios.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/obp.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/obp.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/uefi64.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/uefi64.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/__init__.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/__init__.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/grub2.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/grub2.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/legacygrub.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/legacygrub.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/menulst.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/menulst.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/sbb.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/sbb.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootarchive.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootarchive.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootconfig.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootconfig.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootinfo.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootinfo.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootloader.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootloader.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootutil.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootutil.pyc
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/pysol.py
+file path=usr/lib/python2.6/vendor-packages/bootmgmt/pysol.pyc
+license cr_Sun license=cr_Sun

--- a/usr/src/pkg/manifests/system-library-install.mf	Tue Aug 30 15:23:33 2011 -0700
+++ b/usr/src/pkg/manifests/system-library-install.mf	Wed Aug 31 10:25:52 2011 +1000
@@ -40,55 +40,6 @@
 file path=usr/lib/liblogger.so.1
 dir  path=usr/lib/python2.6
 dir  path=usr/lib/python2.6/vendor-packages
-dir  path=usr/lib/python2.6/vendor-packages/bootmgmt
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/solaris.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/autogen/solaris.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/solaris.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/sparc/solaris.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/solaris.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/bootvars/x86/solaris.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/bios.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/bios.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/obp.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/obp.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/uefi64.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/fw/uefi64.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/__init__.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/__init__.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/grub2.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/grub2.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/legacygrub.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/legacygrub.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/menulst.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/menulst.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/sbb.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/backend/loader/sbb.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootarchive.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootarchive.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootconfig.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootconfig.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootinfo.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootinfo.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootloader.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootloader.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootutil.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/bootutil.pyc
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/pysol.py
-file path=usr/lib/python2.6/vendor-packages/bootmgmt/pysol.pyc
 dir  path=usr/lib/python2.6/vendor-packages/osol_install
 file path=usr/lib/python2.6/vendor-packages/osol_install/_liberrsvc.so
 file path=usr/lib/python2.6/vendor-packages/osol_install/errsvc.py

--- a/usr/src/pkg/pkglintrc	Tue Aug 30 15:23:33 2011 -0700
+++ b/usr/src/pkg/pkglintrc	Wed Aug 31 10:25:52 2011 +1000
@@ -57,3 +57,6 @@
 
 # Whether to ignore publisher differences when comparing package versions
 ignore_different_publishers = True
+
+# workaround https://defect.opensolaris.org/bz/show_bug.cgi?id=18673
+pkglint.exclude = pkg.lint.pkglint_manifest.PkgManifestChecker.variants