--- a/src/util/distro-import/Makefile	Thu Jul 02 16:57:40 2009 -0700
+++ b/src/util/distro-import/Makefile	Thu Jul 02 19:43:04 2009 -0700
@@ -97,6 +97,7 @@
 GLOBAL_CHATTRS_111a = $(GLOBAL_CHATTRS_106)
 GLOBAL_CHATTRS_116 = $(GLOBAL_CHATTRS_106)
 GLOBAL_CHATTRS_117 = $(GLOBAL_CHATTRS_106)
+GLOBAL_CHATTRS_118 = $(GLOBAL_CHATTRS_106) attrs
 GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 
 SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.4/vendor-packages \
@@ -114,14 +115,17 @@
 	etc/hba.conf			\
 	etc/ima.conf			\
 	etc/inet/services		\
-	etc/mpapi.conf			\
+	etc/mpapi.conf
+
+ELIDED_FILES_ATTR = 	\
 	etc/security/auth_attr		\
 	etc/security/exec_attr		\
 	etc/security/prof_attr		\
 	etc/user_attr
 
-ELIDED_FILES_86 = $(ELIDED_FILES_BASE) etc/devlink.tab
-ELIDED_FILES_89 = $(ELIDED_FILES_BASE) kernel/drv/sd.conf etc/devlink.tab
+
+ELIDED_FILES_86 = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR) etc/devlink.tab
+ELIDED_FILES_89 = $(ELITED_FILES_86) kernel/drv/sd.conf
 ELIDED_FILES_90 = $(ELIDED_FILES_89)
 ELIDED_FILES_91 = $(ELIDED_FILES_89)
 ELIDED_FILES_92 = $(ELIDED_FILES_89)
@@ -132,19 +136,20 @@
 ELIDED_FILES_97 = $(ELIDED_FILES_89)
 ELIDED_FILES_98 = $(ELIDED_FILES_89)
 ELIDED_FILES_99 = $(ELIDED_FILES_89)
-ELIDED_FILES_100a = $(ELIDED_FILES_BASE) kernel/drv/sd.conf
+ELIDED_FILES_100a = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR) kernel/drv/sd.conf
 ELIDED_FILES_101 = $(ELIDED_FILES_100a)
 ELIDED_FILES_101a = $(ELIDED_FILES_100a)
 ELIDED_FILES_105 = $(ELIDED_FILES_100a)
-ELIDED_FILES_106 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_107 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_108 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_109 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_110 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_111 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_111a = $(ELIDED_FILES_BASE)
-ELIDED_FILES_116 = $(ELIDED_FILES_BASE)
-ELIDED_FILES_117 = $(ELIDED_FILES_BASE)
+ELIDED_FILES_106 = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR)
+ELIDED_FILES_107 = $(ELIDED_FILES_106)
+ELIDED_FILES_108 = $(ELIDED_FILES_106)
+ELIDED_FILES_109 = $(ELIDED_FILES_106)
+ELIDED_FILES_110 = $(ELIDED_FILES_106)
+ELIDED_FILES_111 = $(ELIDED_FILES_106)
+ELIDED_FILES_111a = $(ELIDED_FILES_106)
+ELIDED_FILES_116 = $(ELIDED_FILES_106)
+ELIDED_FILES_117 = $(ELIDED_FILES_106)
+ELIDED_FILES_118 = $(ELIDED_FILES_BASE)
 ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
 
 #
@@ -215,6 +220,7 @@
 	usr/lib/brand/labeled/platform.xml
 CACHED_FILES_116 =
 CACHED_FILES_117 =
+CACHED_FILES_118 = 
 
 CACHED_FILES = $(CACHED_FILES_$(BUILDID))
 
@@ -280,6 +286,7 @@
 FIX_FILES_111a = $(FIX_FILES_BASE)
 FIX_FILES_116 = $(FIX_FILES_BASE)
 FIX_FILES_117 = $(FIX_FILES_BASE)
+FIX_FILES_118 = $(FIX_FILES_BASE)
 FIX_FILES = $(FIX_FILES_$(BUILDID))
 
 JDKFILES = LICENSE README.html
@@ -341,7 +348,8 @@
 	111			\
 	111a			\
 	116			\
-	117
+	117			\
+	118
 
 #
 # Starting in build 80, filelist.ramdisk began moving between various
@@ -535,6 +543,7 @@
 INCLUDE_PATH_111a = 111a:$(INCLUDE_PATH_111)
 INCLUDE_PATH_116 = 116:$(INCLUDE_PATH_111a)
 INCLUDE_PATH_117 = 117:$(INCLUDE_PATH_116)
+INCLUDE_PATH_118 = 118:$(INCLUDE_PATH_117)
 
 import:	cluster.import $(TMPPKGS)
 	$(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \