Print this page
7491 usr/src/lib/libfru is a mess
Reviewed by: Robert Mustacchi <rm@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/lib/Makefile
          +++ new/usr/src/lib/Makefile
↓ open down ↓ 66 lines elided ↑ open up ↑
  67   67          ../cmd/sgs/libelf       \
  68   68          ../cmd/sgs/librtld_db   \
  69   69          abi             \
  70   70          auditd_plugins  \
  71   71          brand           \
  72   72          c_synonyms      \
  73   73          cfgadm_plugins  \
  74   74          crypt_modules   \
  75   75          extendedFILE    \
  76   76          fm              \
       77 +        fru             \
  77   78          getloginx       \
  78   79          gss_mechs/mech_dh       \
  79   80          gss_mechs/mech_dummy    \
  80   81          gss_mechs/mech_krb5     \
  81   82          gss_mechs/mech_spnego   \
  82   83          hal             \
  83   84          hbaapi          \
  84   85          krb5            \
  85   86          libadm          \
  86   87          libads          \
↓ open down ↓ 33 lines elided ↑ open up ↑
 120  121          libdtrace       \
 121  122          libdtrace_jni   \
 122  123          libefi          \
 123  124          libelfsign      \
 124  125          libeti          \
 125  126          libexacct       \
 126  127          libexacct/demo  \
 127  128          libfakekernel   \
 128  129          libfcoe         \
 129  130          libficl         \
 130      -        libfru          \
 131      -        libfruutils     \
 132  131          libfsmgt        \
 133  132          libfstyp        \
 134  133          libgen          \
 135  134          libgrubmgmt     \
 136  135          libgss          \
 137  136          libhotplug      \
 138  137          libidmap        \
 139  138          libilb          \
 140  139          libima          \
 141  140          libinetsvc      \
↓ open down ↓ 219 lines elided ↑ open up ↑
 361  360  sparc_MSGSUBDIRS=       \
 362  361          libprtdiag      \
 363  362          libprtdiag_psr
 364  363  
 365  364  i386_MSGSUBDIRS= libfdisk
 366  365  
 367  366  HDRSUBDIRS=                             \
 368  367          ../cmd/sendmail/libmilter       \
 369  368          auditd_plugins  \
 370  369          fm              \
      370 +        fru             \
 371  371          hal             \
 372  372          hbaapi          \
 373  373          libads          \
 374  374          libast          \
 375  375          libbrand        \
 376  376          libbsm          \
 377  377          libc            \
 378  378          libcmd          \
 379  379          libcmdutils     \
 380  380          libcommputil    \
↓ open down ↓ 13 lines elided ↑ open up ↑
 394  394          libdll          \
 395  395          libdlpi         \
 396  396          libdns_sd       \
 397  397          libdscfg        \
 398  398          libdtrace       \
 399  399          libdtrace_jni   \
 400  400          libelfsign      \
 401  401          libeti          \
 402  402          libfakekernel   \
 403  403          libfcoe         \
 404      -        libfru          \
 405  404          libfstyp        \
 406  405          libgen          \
 407  406          libgrubmgmt     \
 408  407          libidmap        \
 409  408          libilb          \
 410  409          libima          \
 411  410          libinetsvc      \
 412  411          libinetutil     \
 413  412          libinstzones    \
 414  413          libipadm        \
↓ open down ↓ 157 lines elided ↑ open up ↑
 572  571  # The following dependencies don't need to be listed below as they are built
 573  572  # before everything else:
 574  573  # libc libm libmd libmp libnsl libnvpair libsocket
 575  574  abi:            libctf libmapmalloc libproc
 576  575  auditd_plugins: libbsm libsecdb libgss libmtmalloc
 577  576  brand:          libzonecfg libmapmalloc
 578  577  cfgadm_plugins: libdevice libdevinfo libhotplug librcm hbaapi libkstat libscf
 579  578  fm:             libexacct libipmi libzfs scsi libdevinfo libdevid libcfgadm \
 580  579                  libcontract libsysevent ../cmd/sgs/libelf libdladm
 581  580  $(SPARC_BLD)fm: libpri
      581 +$(SPARC_BLD)fru: libpicl
 582  582  gss_mechs/mech_dh: libgss
 583  583  gss_mechs/mech_dummy: libgss
 584  584  gss_mechs/mech_krb5: libgss libresolv2 pkcs11 libkstat
 585  585  gss_mechs/mech_spnego: gss_mechs/mech_krb5
 586  586  hal:            dbusdeps
 587  587  krb5:           gss_mechs/mech_krb5 libtecla libldap5
 588  588  libadt_jni:     libbsm
 589  589  libadutils:     libldap5 libresolv2
 590  590  libbe:          libzfs libinstzones libuuid libgen libdevinfo libefi libficl
 591  591  libbsm:         libinetutil libscf libsecdb libtsol
↓ open down ↓ 16 lines elided ↑ open up ↑
 608  608  libdscfg:       libnsctl libunistat libadm
 609  609  libdtrace:      libproc libgen libctf libmapmalloc
 610  610  libdtrace_jni:  libuutil libdtrace
 611  611  libefi:         libuuid
 612  612  libelfsign:     libcryptoutil libkmf ../cmd/sgs/libelf
 613  613  libeti:         libcurses
 614  614  libexacct/demo: libexacct libproject
 615  615  libfakekernel:  libumem libcryptoutil
 616  616  libfcoe:        libdladm
 617  617  libficl:        libuuid libumem
 618      -libfru:         libfruutils
 619  618  libfsmgt:       libkstat
 620  619  libgrubmgmt:    libdevinfo libzfs libfstyp libefi
 621  620  $(INTEL_BLD)libgrubmgmt: libfdisk
 622  621  libidmap:       libavl libuutil
 623  622  libinetsvc:     libscf
 624  623  libinstzones:   libzonecfg libcontract
 625  624  libipadm:       libinetutil libdlpi libdhcpagent libdladm libsecdb libdhcputil
 626  625  libipmp:        libinetutil
 627  626  libipsecutil:   libtecla libtsol
 628  627  libiscsit:      libstmf libuuid
↓ open down ↓ 61 lines elided ↑ open up ↑
 690  689  passwdutil:     libsldap
 691  690  pkcs11:         libcryptoutil libgen libuuid
 692  691  policykit:      dbusdeps
 693  692  print:          libldap5 libmd5 libsendfile
 694  693  pylibbe:        libbe libzfs
 695  694  pysolaris:      libsec libidmap
 696  695  pyzfs:          libzfs
 697  696  raidcfg_plugins: libraidcfg librcm libcfgadm libpicl libpicltree
 698  697  rpcsec_gss:     libgss
 699  698  sasl_plugins:   pkcs11 libgss libsasl
 700      -scsi:           libfru libumem libdevid libdevinfo
      699 +scsi:           fru libumem libdevid libdevinfo
 701  700  smbsrv:         libxnet libpthread librt libshare libidmap pkcs11 libsqlite \
 702  701                  libcryptoutil libreparse libcmdutils libresolv2 libsmbfs \
 703  702                  libuuid libfakekernel libads libgss libldap5 krb5
 704  703  storage:        libdevice libdevinfo libdevid
 705  704  sun_fc:         libdevinfo libsysevent
 706  705  sun_sas:        libdevinfo libsysevent libkstat libdevid
 707  706  udapl:          libdevinfo libdladm
 708  707  
 709  708  #
 710  709  # The reason this rule checks for the existence of the
↓ open down ↓ 19 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX