illumos-gate-1681 Wdiff usr/src/pkg/manifests/system-file-system-smb.mf

Print this page

1681 support for BUILD64=# no longer works

Split	Close
Expand all
Collapse all

          --- old/usr/src/pkg/manifests/system-file-system-smb.mf
          +++ new/usr/src/pkg/manifests/system-file-system-smb.mf

   1    1  #
   2    2  # CDDL HEADER START
   3    3  #
   4    4  # The contents of this file are subject to the terms of the
   5    5  # Common Development and Distribution License (the "License").
   6    6  # You may not use this file except in compliance with the License.
   7    7  #
   8    8  # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9  # or http://www.opensolaris.org/os/licensing.
  10   10  # See the License for the specific language governing permissions
  11   11  # and limitations under the License.
  12   12  #
  13   13  # When distributing Covered Code, include this CDDL HEADER in each
  14   14  # file and include the License file at usr/src/OPENSOLARIS.LICENSE.

↓ open down ↓

14 lines elided

↑ open up ↑

  15   15  # If applicable, add the following below this CDDL HEADER, with the
  16   16  # fields enclosed by brackets "[]" replaced with your own identifying
  17   17  # information: Portions Copyright [yyyy] [name of copyright owner]
  18   18  #
  19   19  # CDDL HEADER END
  20   20  #
  21   21  
  22   22  #
  23   23  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  24   24  # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
       25 +# Copyright 2014 Andrew Stormont.
  25   26  #
  26   27  
  27   28  set name=pkg.fmri value=pkg:/system/file-system/smb@$(PKGVERS)
  28   29  set name=pkg.description value="SMB/CIFS File System client support"
  29   30  set name=pkg.summary value="SMB/CIFS File System client support"
  30   31  set name=info.classification \
  31   32      value="org.opensolaris.category.2008:System/File System"
  32   33  set name=variant.arch value=$(ARCH)
  33   34  dir path=lib
  34   35  dir path=lib/svc

  35   36  dir path=lib/svc/manifest group=sys
  36   37  dir path=lib/svc/manifest/network group=sys
  37   38  dir path=lib/svc/manifest/network/smb group=sys
  38   39  dir path=lib/svc/method

↓ open down ↓

4 lines elided

↑ open up ↑

  39   40  dir path=usr group=sys
  40   41  dir path=usr/bin
  41   42  dir path=usr/kernel group=sys
  42   43  dir path=usr/kernel/drv group=sys
  43   44  dir path=usr/kernel/drv/$(ARCH64) group=sys
  44   45  dir path=usr/kernel/fs group=sys
  45   46  dir path=usr/kernel/fs/$(ARCH64) group=sys
  46   47  dir path=usr/kernel/kmdb group=sys
  47   48  dir path=usr/kernel/kmdb/$(ARCH64) group=sys
  48   49  dir path=usr/lib
  49      -dir path=usr/lib/$(ARCH64)
       50 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  50   51  dir path=usr/lib/fs group=sys
  51   52  dir path=usr/lib/fs/smbfs group=sys
  52      -dir path=usr/lib/fs/smbfs/$(ARCH64) group=sys
       53 +$(BUILD64)dir path=usr/lib/fs/smbfs/$(ARCH64) group=sys
  53   54  dir path=usr/lib/mdb group=sys
  54   55  dir path=usr/lib/mdb/kvm group=sys
  55      -dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
       56 +$(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  56   57  dir path=usr/lib/security
  57      -dir path=usr/lib/security/$(ARCH64)
       58 +$(BUILD64)dir path=usr/lib/security/$(ARCH64)
  58   59  dir path=usr/lib/smbfs
  59   60  dir path=usr/share/man
  60   61  dir path=usr/share/man/man1
  61   62  dir path=usr/share/man/man1m
  62   63  dir path=usr/share/man/man4
  63   64  dir path=usr/share/man/man5
  64   65  dir path=usr/share/man/man7fs
  65   66  driver name=nsmb perms="* 0666 root sys"
  66   67  file path=lib/svc/manifest/network/smb/client.xml group=sys mode=0444
  67   68  file path=lib/svc/method/smb-client mode=0555
  68   69  file path=usr/bin/smbutil mode=0555
  69   70  file path=usr/kernel/drv/$(ARCH64)/nsmb group=sys
  70   71  $(i386_ONLY)file path=usr/kernel/drv/nsmb group=sys
  71   72  file path=usr/kernel/drv/nsmb.conf group=sys
  72   73  file path=usr/kernel/fs/$(ARCH64)/smbfs group=sys mode=0755
  73   74  $(i386_ONLY)file path=usr/kernel/fs/smbfs group=sys mode=0755
  74   75  file path=usr/kernel/kmdb/$(ARCH64)/nsmb group=sys mode=0555
  75   76  file path=usr/kernel/kmdb/$(ARCH64)/smbfs group=sys mode=0555
  76   77  $(i386_ONLY)file path=usr/kernel/kmdb/nsmb group=sys mode=0555
  77   78  $(i386_ONLY)file path=usr/kernel/kmdb/smbfs group=sys mode=0555
  78      -file path=usr/lib/$(ARCH64)/libsmbfs.so.1
  79      -file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
       79 +$(BUILD64)file path=usr/lib/$(ARCH64)/libsmbfs.so.1
       80 +$(BUILD64)file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
  80   81  file path=usr/lib/fs/smbfs/dfshares mode=0555
  81   82  file path=usr/lib/fs/smbfs/libshare_smbfs.so.1
  82   83  file path=usr/lib/fs/smbfs/mount mode=4555
  83   84  file path=usr/lib/fs/smbfs/share mode=0555
  84   85  file path=usr/lib/fs/smbfs/umount mode=4555
  85   86  file path=usr/lib/fs/smbfs/unshare mode=0555
  86   87  file path=usr/lib/libsmbfs.so.1
  87      -file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
  88      -file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555
       88 +$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
       89 +$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555
  89   90  $(i386_ONLY)file path=usr/lib/mdb/kvm/nsmb.so mode=0555
  90   91  $(i386_ONLY)file path=usr/lib/mdb/kvm/smbfs.so mode=0555
  91      -file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1
       92 +$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1
  92   93  file path=usr/lib/security/pam_smbfs_login.so.1
  93   94  file path=usr/lib/smbfs/smbiod mode=0555
  94   95  file path=usr/lib/smbfs/smbiod-svc mode=0555
  95   96  file path=usr/share/man/man1/smbutil.1
  96   97  file path=usr/share/man/man1m/mount_smbfs.1m
  97   98  file path=usr/share/man/man1m/smbiod.1m
  98   99  file path=usr/share/man/man4/nsmbrc.4
  99  100  file path=usr/share/man/man5/pam_smbfs_login.5
 100  101  file path=usr/share/man/man7fs/smbfs.7fs
 101  102  legacy pkg=SUNWsmbfskr desc="SMB/CIFS File System client support (Kernel)" \

 102  103      name="SMB/CIFS File System client support (Kernel)"
 103  104  legacy pkg=SUNWsmbfsr desc="SMB/CIFS File System client support (Root)" \
 104  105      name="SMB/CIFS File System client support (Root)"
 105  106  legacy pkg=SUNWsmbfsu desc="SMB/CIFS File System client support (Usr)" \
 106  107      name="SMB/CIFS File System client support (Usr)"

↓ open down ↓

5 lines elided

↑ open up ↑

 107  108  license cr_Sun license=cr_Sun
 108  109  license lic_CDDL license=lic_CDDL
 109  110  license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple \
 110  111      license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.apple
 111  112  license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov \
 112  113      license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov
 113  114  license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \
 114  115      license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4
 115  116  license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \
 116  117      license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft
 117      -link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \
      118 +$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \
 118  119      target=pam_smbfs_login.so.1
 119  120  link path=usr/lib/security/pam_smbfs_login.so target=pam_smbfs_login.so.1
 120  121  link path=usr/share/man/man1m/umount_smbfs.1m target=mount_smbfs.1m
 121  122  # libsmbfs uses iconv_open() which requires this at run-time.
 122  123  depend fmri=system/library/iconv/utf-8 type=require

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX