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

Split Close
Expand all
Collapse all
          --- old/src/util/distro-import/Makefile
          +++ new/src/util/distro-import/Makefile
↓ open down ↓ 89 lines elided ↑ open up ↑
  90   90  GLOBAL_CHATTRS_105 = $(GLOBAL_CHATTRS_101)
  91   91  GLOBAL_CHATTRS_106 = $(GLOBAL_CHATTRS_101) variants
  92   92  GLOBAL_CHATTRS_107 = $(GLOBAL_CHATTRS_106)
  93   93  GLOBAL_CHATTRS_108 = $(GLOBAL_CHATTRS_106)
  94   94  GLOBAL_CHATTRS_109 = $(GLOBAL_CHATTRS_106)
  95   95  GLOBAL_CHATTRS_110 = $(GLOBAL_CHATTRS_106)
  96   96  GLOBAL_CHATTRS_111 = $(GLOBAL_CHATTRS_106)
  97   97  GLOBAL_CHATTRS_111a = $(GLOBAL_CHATTRS_106)
  98   98  GLOBAL_CHATTRS_116 = $(GLOBAL_CHATTRS_106)
  99   99  GLOBAL_CHATTRS_117 = $(GLOBAL_CHATTRS_106)
      100 +GLOBAL_CHATTRS_118 = $(GLOBAL_CHATTRS_106) attrs
 100  101  GLOBAL_CHATTRS = $(GLOBAL_CHATTRS_$(BUILDID))
 101  102  
 102  103  SOLARIS.PY=PYTHONPATH=$(PROTO_AREA)/usr/lib/python2.4/vendor-packages \
 103  104          ./solaris.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
 104  105          $(GLOBAL_CHATTRS:%= -G %) $(ARCH_DEFINES:%= -m %) \
 105  106          -p $(PROTO_AREA)
 106  107  
 107  108  #
 108  109  # always remove the following (editable) files from packages we bulk import;
 109  110  # we're doing this until the necessary actions are available.  For now,
 110  111  # cache as-installed versions.
 111  112  #
 112  113  ELIDED_FILES_BASE= \
 113  114          boot/solaris/devicedb/master    \
 114  115          etc/hba.conf                    \
 115  116          etc/ima.conf                    \
 116  117          etc/inet/services               \
 117      -        etc/mpapi.conf                  \
      118 +        etc/mpapi.conf
      119 +
      120 +ELIDED_FILES_ATTR =     \
 118  121          etc/security/auth_attr          \
 119  122          etc/security/exec_attr          \
 120  123          etc/security/prof_attr          \
 121  124          etc/user_attr
 122  125  
 123      -ELIDED_FILES_86 = $(ELIDED_FILES_BASE) etc/devlink.tab
 124      -ELIDED_FILES_89 = $(ELIDED_FILES_BASE) kernel/drv/sd.conf etc/devlink.tab
      126 +
      127 +ELIDED_FILES_86 = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR) etc/devlink.tab
      128 +ELIDED_FILES_89 = $(ELITED_FILES_86) kernel/drv/sd.conf
 125  129  ELIDED_FILES_90 = $(ELIDED_FILES_89)
 126  130  ELIDED_FILES_91 = $(ELIDED_FILES_89)
 127  131  ELIDED_FILES_92 = $(ELIDED_FILES_89)
 128  132  ELIDED_FILES_93 = $(ELIDED_FILES_89)
 129  133  ELIDED_FILES_94 = $(ELIDED_FILES_89)
 130  134  ELIDED_FILES_95 = $(ELIDED_FILES_89)
 131  135  ELIDED_FILES_96 = $(ELIDED_FILES_89)
 132  136  ELIDED_FILES_97 = $(ELIDED_FILES_89)
 133  137  ELIDED_FILES_98 = $(ELIDED_FILES_89)
 134  138  ELIDED_FILES_99 = $(ELIDED_FILES_89)
 135      -ELIDED_FILES_100a = $(ELIDED_FILES_BASE) kernel/drv/sd.conf
      139 +ELIDED_FILES_100a = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR) kernel/drv/sd.conf
 136  140  ELIDED_FILES_101 = $(ELIDED_FILES_100a)
 137  141  ELIDED_FILES_101a = $(ELIDED_FILES_100a)
 138  142  ELIDED_FILES_105 = $(ELIDED_FILES_100a)
 139      -ELIDED_FILES_106 = $(ELIDED_FILES_BASE)
 140      -ELIDED_FILES_107 = $(ELIDED_FILES_BASE)
 141      -ELIDED_FILES_108 = $(ELIDED_FILES_BASE)
 142      -ELIDED_FILES_109 = $(ELIDED_FILES_BASE)
 143      -ELIDED_FILES_110 = $(ELIDED_FILES_BASE)
 144      -ELIDED_FILES_111 = $(ELIDED_FILES_BASE)
 145      -ELIDED_FILES_111a = $(ELIDED_FILES_BASE)
 146      -ELIDED_FILES_116 = $(ELIDED_FILES_BASE)
 147      -ELIDED_FILES_117 = $(ELIDED_FILES_BASE)
      143 +ELIDED_FILES_106 = $(ELIDED_FILES_BASE) $(ELIDED_FILES_ATTR)
      144 +ELIDED_FILES_107 = $(ELIDED_FILES_106)
      145 +ELIDED_FILES_108 = $(ELIDED_FILES_106)
      146 +ELIDED_FILES_109 = $(ELIDED_FILES_106)
      147 +ELIDED_FILES_110 = $(ELIDED_FILES_106)
      148 +ELIDED_FILES_111 = $(ELIDED_FILES_106)
      149 +ELIDED_FILES_111a = $(ELIDED_FILES_106)
      150 +ELIDED_FILES_116 = $(ELIDED_FILES_106)
      151 +ELIDED_FILES_117 = $(ELIDED_FILES_106)
      152 +ELIDED_FILES_118 = $(ELIDED_FILES_BASE)
 148  153  ELIDED_FILES = $(ELIDED_FILES_$(BUILDID))
 149  154  
 150  155  #
 151  156  # these files get placed into proto area from per-build cached versions
 152  157  #
 153  158  CACHED_FILES_BASE=                                                      \
 154  159          $(ELIDED_FILES)                                                 \
 155  160          boot/grub/menu.lst                                              \
 156  161          boot/grub/splash.xpm.gz                                         \
 157  162          etc/inet/hosts                                                  \
↓ open down ↓ 50 lines elided ↑ open up ↑
 208  213  CACHED_FILES_110 = $(CACHED_FILES_107)
 209  214  CACHED_FILES_111 = $(CACHED_FILES_107)
 210  215  CACHED_FILES_111a = $(CACHED_FILES_107)                                 \
 211  216          etc/zones/SUNWtsoldef.xml                                       \
 212  217          usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.bfc   \
 213  218          usr/jdk/instances/jdk1.6.0/jre/lib/fontconfig.OpenSolaris.properties.src \
 214  219          usr/lib/brand/labeled/config.xml                                \
 215  220          usr/lib/brand/labeled/platform.xml
 216  221  CACHED_FILES_116 =
 217  222  CACHED_FILES_117 =
      223 +CACHED_FILES_118 = 
 218  224  
 219  225  CACHED_FILES = $(CACHED_FILES_$(BUILDID))
 220  226  
 221  227  FIX_FILES_BASE =                                \
 222  228          $(CACHED_FILES)                         \
 223  229          etc/driver_aliases                      \
 224  230          etc/name_to_major                       \
 225  231          etc/nsswitch.conf                       \
 226  232          etc/pam.conf                            \
 227  233          etc/passwd                              \
↓ open down ↓ 45 lines elided ↑ open up ↑
 273  279  FIX_FILES_105 = $(FIX_FILES_BASE)
 274  280  FIX_FILES_106 = $(FIX_FILES_BASE)
 275  281  FIX_FILES_107 = $(FIX_FILES_BASE)
 276  282  FIX_FILES_108 = $(FIX_FILES_BASE)
 277  283  FIX_FILES_109 = $(FIX_FILES_BASE)
 278  284  FIX_FILES_110 = $(FIX_FILES_BASE)
 279  285  FIX_FILES_111 = $(FIX_FILES_BASE)
 280  286  FIX_FILES_111a = $(FIX_FILES_BASE)
 281  287  FIX_FILES_116 = $(FIX_FILES_BASE)
 282  288  FIX_FILES_117 = $(FIX_FILES_BASE)
      289 +FIX_FILES_118 = $(FIX_FILES_BASE)
 283  290  FIX_FILES = $(FIX_FILES_$(BUILDID))
 284  291  
 285  292  JDKFILES = LICENSE README.html
 286  293  JREFILES = LICENSE README
 287  294  
 288  295  PROG=   ksh-wrapper
 289  296  
 290  297  OBJS=   ksh-wrapper.o
 291  298  
 292  299  SRCS=   $(OBJS:%.o=%.c)
↓ open down ↓ 41 lines elided ↑ open up ↑
 334  341          101a                    \
 335  342          105                     \
 336  343          106                     \
 337  344          107                     \
 338  345          108                     \
 339  346          109                     \
 340  347          110                     \
 341  348          111                     \
 342  349          111a                    \
 343  350          116                     \
 344      -        117
      351 +        117                     \
      352 +        118
 345  353  
 346  354  #
 347  355  # Starting in build 80, filelist.ramdisk began moving between various
 348  356  # packages.
 349  357  #
 350  358  FILELIST_RAMDISK_PKG_$(BUILDID) = SUNWckr
 351  359  FILELIST_RAMDISK_PKG_79b        = SUNWcakr.i
 352  360  FILELIST_RAMDISK_PKG_75a        = SUNWcakr.i
 353  361  FILELIST_RAMDISK_PKG_74         = SUNWcakr.i
 354  362  FILELIST_RAMDISK_PKG_72         = SUNWcakr.i
↓ open down ↓ 173 lines elided ↑ open up ↑
 528  536  INCLUDE_PATH_105 = 105:104:103:102:$(INCLUDE_PATH_101a)
 529  537  INCLUDE_PATH_106 = 106:$(INCLUDE_PATH_105)
 530  538  INCLUDE_PATH_107 = 107:$(INCLUDE_PATH_106)
 531  539  INCLUDE_PATH_108 = 108:$(INCLUDE_PATH_107)
 532  540  INCLUDE_PATH_109 = 109:$(INCLUDE_PATH_108)
 533  541  INCLUDE_PATH_110 = 110:$(INCLUDE_PATH_109)
 534  542  INCLUDE_PATH_111 = 111:$(INCLUDE_PATH_110)
 535  543  INCLUDE_PATH_111a = 111a:$(INCLUDE_PATH_111)
 536  544  INCLUDE_PATH_116 = 116:$(INCLUDE_PATH_111a)
 537  545  INCLUDE_PATH_117 = 117:$(INCLUDE_PATH_116)
      546 +INCLUDE_PATH_118 = 118:$(INCLUDE_PATH_117)
 538  547  
 539  548  import: cluster.import $(TMPPKGS)
 540  549          $(SOLARIS.PY) -s $(REPO) -w $(WOS_PKGS) $(ELIDED_FILES:%=-D %) \
 541  550                  $(INCLUDE_PATH_$(BUILDID):%=-I %) $(BUILDID)/all.i386
 542  551  
 543  552  %/import:
 544  553          $(MAKE) BUILDID=$(@:%/import=%) import
 545  554  
 546  555  slim_import:    $(BUILDID)/slim_cluster $(TMPPKGS)
 547  556          $(SOLARIS.PY) -s $(REPO) $(ALL_PKGS:%=-w %) $(ELIDED_FILES:%=-D %) \
↓ open down ↓ 90 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX