9726 solaris.py needs to use new service for /etc/security/*attr files in build 118

*** 95,104 ****
--- 95,105 ----
  GLOBAL_CHATTRS_110 = $(GLOBAL_CHATTRS_106)
  GLOBAL_CHATTRS_111 = $(GLOBAL_CHATTRS_106)
  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 \
          ./solaris.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
          $(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
*** 112,129 ****
  ELIDED_FILES_BASE= \
          boot/solaris/devicedb/master    \
          etc/hba.conf                    \
          etc/ima.conf                    \
          etc/inet/services               \
!         etc/mpapi.conf                  \
          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_90 = $(ELIDED_FILES_89)
  ELIDED_FILES_91 = $(ELIDED_FILES_89)
  ELIDED_FILES_92 = $(ELIDED_FILES_89)
  ELIDED_FILES_93 = $(ELIDED_FILES_89)
  ELIDED_FILES_94 = $(ELIDED_FILES_89)
--- 113,133 ----
  ELIDED_FILES_BASE= \
          boot/solaris/devicedb/master    \
          etc/hba.conf                    \
          etc/ima.conf                    \
          etc/inet/services               \
!         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) $(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)
  ELIDED_FILES_93 = $(ELIDED_FILES_89)
  ELIDED_FILES_94 = $(ELIDED_FILES_89)
*** 130,152 ****
  ELIDED_FILES_95 = $(ELIDED_FILES_89)
  ELIDED_FILES_96 = $(ELIDED_FILES_89)
  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_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 = $(ELIDED_FILES_$(BUILDID))
  
  #
  # these files get placed into proto area from per-build cached versions
  #
--- 134,157 ----
  ELIDED_FILES_95 = $(ELIDED_FILES_89)
  ELIDED_FILES_96 = $(ELIDED_FILES_89)
  ELIDED_FILES_97 = $(ELIDED_FILES_89)
  ELIDED_FILES_98 = $(ELIDED_FILES_89)
  ELIDED_FILES_99 = $(ELIDED_FILES_89)
! 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_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))
  
  #
  # these files get placed into proto area from per-build cached versions
  #
*** 213,222 ****
--- 218,228 ----
          usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src \
          usr/lib/brand/labeled/config.xml                                \
          usr/lib/brand/labeled/platform.xml
  CACHED_FILES_116 =
  CACHED_FILES_117 =
+ CACHED_FILES_118 = 
  
  CACHED_FILES = $(CACHED_FILES_$(BUILDID))
  
  FIX_FILES_BASE =                                \
          $(CACHED_FILES)                         \
*** 278,287 ****
--- 284,294 ----
  FIX_FILES_110 = $(FIX_FILES_BASE)
  FIX_FILES_111 = $(FIX_FILES_BASE)
  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
  JREFILES = LICENSE README
  
*** 339,349 ****
          109                     \
          110                     \
          111                     \
          111a                    \
          116                     \
!         117
  
  #
  # Starting in build 80, filelist.ramdisk began moving between various
  # packages.
  #
--- 346,357 ----
          109                     \
          110                     \
          111                     \
          111a                    \
          116                     \
!         117                     \
!         118
  
  #
  # Starting in build 80, filelist.ramdisk began moving between various
  # packages.
  #
*** 533,542 ****
--- 541,551 ----
  INCLUDE_PATH_110 = 110:$(INCLUDE_PATH_109)
  INCLUDE_PATH_111 = 111:$(INCLUDE_PATH_110)
  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 %) \
                  $(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386