Print this page
7192 Remove SPARC-only ONLY64 option

Split Close
Expand all
Collapse all
          --- old/usr/src/Targetdirs
          +++ new/usr/src/Targetdirs
↓ open down ↓ 16 lines elided ↑ open up ↑
  17   17  #
  18   18  # CDDL HEADER END
  19   19  #
  20   20  
  21   21  #
  22   22  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23  # Copyright 2011, Richard Lowe
  24   24  # Copyright (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright (c) 2012, Igor Kozhukhov <ikozhukhov@gmail.com>
  26   26  # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
  27      -# Copyright (c) 2013 RackTop Systems.
  28   27  # Copyright 2014 Garrett D'Amore <garrett@damore.org>
  29   28  # Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
       29 +# Copyright 2016 RackTop Systems.
  30   30  #
  31   31  
  32   32  #
  33   33  # It is easier to think in terms of directory names without the ROOT macro
  34   34  # prefix.  ROOTDIRS is TARGETDIRS with ROOT prefixes.  It is necessary
  35   35  # to work with ROOT prefixes when controlling conditional assignments.
  36   36  #
  37   37  
  38   38  DIRLINKS=       $(SYM.DIRS)
  39   39  $(BUILD64)      DIRLINKS += $(SYM.DIRS64)
  40   40  
  41   41  FILELINKS= $(SYM.USRCCSLIB) $(SYM.USRLIB)
  42   42  $(BUILD64)      FILELINKS += $(SYM.USRCCSLIB64) $(SYM.USRLIB64)
  43   43  
  44      -TARGETDIRS=     $(DIRS)
       44 +TARGETDIRS=     $(DIRS) $(DIRS32)
  45   45  $(BUILD64)      TARGETDIRS += $(DIRS64)
  46   46  
  47   47  TARGETDIRS      += $(FILELINKS) $(DIRLINKS)
  48   48  
  49   49  i386_DIRS=                      \
  50   50          /boot/acpi              \
  51   51          /boot/acpi/tables       \
  52   52          /boot/grub              \
  53   53          /boot/grub/bin          \
  54   54          /platform/i86pc         \
  55   55          /lib/libmvec            \
  56   56          /usr/lib/xen            \
  57   57          /usr/lib/xen/bin
  58   58  
  59   59  sparc_DIRS=                             \
  60   60          /usr/lib/ldoms
  61   61  
  62      -sparc_64ONLY= $(POUND_SIGN)
  63      -64ONLY=  $($(MACH)_64ONLY)
  64      -
  65      -$(64ONLY) MACH32_DIRS=/usr/ucb/$(MACH32)
  66      -
  67   62  DIRS= \
  68   63          /boot \
  69   64          /boot/solaris \
  70   65          /boot/solaris/bin \
  71   66          $($(MACH)_DIRS) \
  72   67          /dev \
  73   68          /dev/dsk \
  74   69          /dev/fd \
  75   70          /dev/ipnet \
  76   71          /dev/net \
↓ open down ↓ 131 lines elided ↑ open up ↑
 208  203          /system \
 209  204          /system/boot \
 210  205          /system/contract \
 211  206          /system/object \
 212  207          /tmp \
 213  208          /usr  \
 214  209          /usr/4lib \
 215  210          /usr/ast \
 216  211          /usr/ast/bin \
 217  212          /usr/bin \
 218      -        /usr/bin/$(MACH32) \
 219  213          /usr/ccs \
 220  214          /usr/ccs/bin \
 221  215          /usr/ccs/lib \
 222  216          /usr/demo \
 223  217          /usr/demo/SOUND \
 224  218          /usr/games \
 225  219          /usr/has \
 226  220          /usr/has/bin \
 227  221          /usr/has/lib \
 228  222          /usr/has/man \
↓ open down ↓ 35 lines elided ↑ open up ↑
 264  258          /usr/lib/font \
 265  259          /usr/lib/fs \
 266  260          /usr/lib/fs/nfs \
 267  261          /usr/lib/fs/proc \
 268  262          /usr/lib/fs/smb \
 269  263          /usr/lib/fs/zfs \
 270  264          /usr/lib/gss \
 271  265          /usr/lib/hal \
 272  266          /usr/lib/inet \
 273  267          /usr/lib/inet/ilb \
 274      -        /usr/lib/inet/$(MACH32) \
 275  268          /usr/lib/inet/wanboot \
 276  269          /usr/lib/krb5 \
 277  270          /usr/lib/link_audit \
 278  271          /usr/lib/lwp \
 279  272          /usr/lib/mdb \
 280  273          /usr/lib/mdb/kvm \
 281  274          /usr/lib/mdb/proc \
 282  275          /usr/lib/nfs \
 283  276          /usr/net \
 284  277          /usr/net/servers \
 285  278          /usr/lib/pool \
 286  279          /usr/lib/python2.6 \
 287  280          /usr/lib/python2.6/vendor-packages \
 288  281          /usr/lib/python2.6/vendor-packages/64 \
 289  282          /usr/lib/python2.6/vendor-packages/solaris \
 290  283          /usr/lib/python2.6/vendor-packages/zfs \
 291  284          /usr/lib/python2.6/vendor-packages/beadm \
 292  285          /usr/lib/rcap \
 293      -        /usr/lib/rcap/$(MACH32) \
 294  286          /usr/lib/sa  \
 295  287          /usr/lib/saf \
 296  288          /usr/lib/sasl \
 297  289          /usr/lib/scsi \
 298  290          /usr/lib/secure \
 299  291          /usr/lib/security \
 300  292          /usr/lib/smbsrv \
 301  293          /usr/lib/vscan \
 302  294          /usr/lib/zfs \
 303  295          /usr/lib/zones \
 304  296          /usr/old \
 305  297          /usr/platform  \
 306  298          /usr/proc \
 307  299          /usr/proc/bin \
 308  300          /usr/sadm \
 309  301          /usr/sadm/install \
 310  302          /usr/sadm/install/bin \
 311  303          /usr/sadm/install/scripts \
 312  304          /usr/sbin \
 313      -        /usr/sbin/$(MACH32) \
 314  305          /usr/share  \
 315  306          /usr/share/applications \
 316  307          /usr/share/audio \
 317  308          /usr/share/audio/samples \
 318  309          /usr/share/audio/samples/au \
 319  310          /usr/share/gnome \
 320  311          /usr/share/gnome/autostart \
 321  312          /usr/share/hwdata \
 322  313          /usr/share/lib \
 323  314          /usr/share/lib/ccs \
 324  315          /usr/share/lib/tmac  \
 325  316          /usr/share/lib/ldif  \
 326  317          /usr/share/lib/xml \
 327  318          /usr/share/lib/xml/dtd \
 328  319          /usr/share/man \
 329  320          /usr/share/src \
 330  321          /usr/snadm \
 331  322          /usr/snadm/lib \
 332  323          /usr/ucb \
 333      -        $(MACH32_DIRS) \
 334  324          /usr/ucblib \
 335  325          /usr/xpg4 \
 336  326          /usr/xpg4/bin \
 337  327          /usr/xpg4/include \
 338  328          /usr/xpg4/lib \
 339  329          /usr/xpg6 \
 340  330          /usr/xpg6/bin \
 341  331          /var  \
 342  332          /var/adm  \
 343  333          /var/adm/exacct \
↓ open down ↓ 67 lines elided ↑ open up ↑
 411  401          /var/svc/manifest/application/security \
 412  402          /var/svc/manifest/platform \
 413  403          /var/svc/manifest/platform/sun4u \
 414  404          /var/svc/manifest/platform/sun4v \
 415  405          /var/svc/manifest/site \
 416  406          /var/svc/profile \
 417  407          /var/uucp \
 418  408          /var/tmp \
 419  409          /var/tsol \
 420  410          /var/tsol/doors
      411 +
      412 +i386_DIRS32= \
      413 +        /usr/ucb/$(MACH32)
      414 +
      415 +DIRS32= \
      416 +        $((MACH)_DIRS32) \
      417 +        /usr/bin/$(MACH32) \
      418 +        /usr/lib/inet/$(MACH32) \
      419 +        /usr/lib/rcap/$(MACH32) \
      420 +        /usr/sbin/$(MACH32)
 421  421  
 422  422  sparcv9_DIRS64= \
 423  423          /platform/sun4u \
 424  424          /platform/sun4u/lib \
 425  425          /platform/sun4u/lib/$(MACH64) \
 426  426          /usr/platform/sun4u \
 427  427          /usr/platform/sun4u/sbin \
 428  428          /usr/platform/sun4u/lib \
 429  429          /platform/sun4v/lib \
 430  430          /platform/sun4v/lib/$(MACH64) \
↓ open down ↓ 1459 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX