Print this page
1681 support for BUILD64=# no longer works

Split Close
Expand all
Collapse all
          --- old/usr/src/pkg/manifests/system-file-system-zfs.mf
          +++ new/usr/src/pkg/manifests/system-file-system-zfs.mf
↓ open down ↓ 15 lines elided ↑ open up ↑
  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 (c) 2012 by Delphix. All rights reserved.
  25   25  # Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
       26 +# Copyright 2014 Andrew Stormont.
  26   27  #
  27   28  
  28   29  set name=pkg.fmri value=pkg:/system/file-system/zfs@$(PKGVERS)
  29   30  set name=pkg.description value="ZFS libraries and commands"
  30   31  set name=pkg.summary value=ZFS
  31   32  set name=info.classification \
  32   33      value="org.opensolaris.category.2008:System/File System"
  33   34  
  34   35  #
  35   36  # Skip manifest generation until build 134 can be required on the
↓ open down ↓ 8 lines elided ↑ open up ↑
  44   45  dir path=etc/sysevent/config group=sys
  45   46  dir path=etc/zfs group=sys
  46   47  dir path=kernel group=sys
  47   48  dir path=kernel/drv group=sys
  48   49  dir path=kernel/drv/$(ARCH64) group=sys
  49   50  dir path=kernel/fs group=sys
  50   51  dir path=kernel/fs/$(ARCH64) group=sys
  51   52  dir path=kernel/kmdb group=sys
  52   53  dir path=kernel/kmdb/$(ARCH64) group=sys
  53   54  dir path=lib
  54      -dir path=lib/$(ARCH64)
       55 +$(BUILD64)dir path=lib/$(ARCH64)
  55   56  dir path=sbin group=sys
  56   57  dir path=usr group=sys
  57   58  dir path=usr/lib
  58      -dir path=usr/lib/$(ARCH64)
       59 +$(BUILD64)dir path=usr/lib/$(ARCH64)
  59   60  dir path=usr/lib/devfsadm group=sys
  60   61  dir path=usr/lib/devfsadm/linkmod group=sys
  61   62  dir path=usr/lib/fs group=sys
  62   63  dir path=usr/lib/fs/zfs group=sys
  63   64  dir path=usr/lib/mdb group=sys
  64   65  dir path=usr/lib/mdb/kvm group=sys
  65      -dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
       66 +$(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
  66   67  dir path=usr/lib/mdb/proc group=sys
  67      -$(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
  68      -$(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64)
       68 +$(sparc_BUILD64)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
       69 +$(i386_BUILD64)dir path=usr/lib/mdb/proc/$(ARCH64)
  69   70  dir path=usr/lib/python2.6
  70   71  dir path=usr/lib/python2.6/vendor-packages
  71   72  dir path=usr/lib/python2.6/vendor-packages/zfs
  72   73  dir path=usr/lib/sysevent
  73   74  dir path=usr/lib/sysevent/modules
  74   75  dir path=usr/lib/zfs
  75   76  dir path=usr/sbin
  76   77  $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
  77      -dir path=usr/sbin/$(ARCH64)
       78 +$(BUILD64)dir path=usr/sbin/$(ARCH64)
  78   79  dir path=usr/share/man/man1m
  79   80  driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys"
  80   81  file \
  81   82      path=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \
  82   83      group=sys
  83   84  file path=kernel/drv/$(ARCH64)/zfs group=sys
  84   85  $(i386_ONLY)file path=kernel/drv/zfs group=sys
  85   86  file path=kernel/drv/zfs.conf group=sys
  86   87  file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555
  87   88  $(i386_ONLY)file path=kernel/kmdb/zfs group=sys mode=0555
  88      -file path=lib/$(ARCH64)/libzfs.so.1
  89      -file path=lib/$(ARCH64)/libzfs_core.so.1
  90      -file path=lib/$(ARCH64)/llib-lzfs.ln
  91      -file path=lib/$(ARCH64)/llib-lzfs_core.ln
       89 +$(BUILD64)file path=lib/$(ARCH64)/libzfs.so.1
       90 +$(BUILD64)file path=lib/$(ARCH64)/libzfs_core.so.1
       91 +$(BUILD64)file path=lib/$(ARCH64)/llib-lzfs.ln
       92 +$(BUILD64)file path=lib/$(ARCH64)/llib-lzfs_core.ln
  92   93  file path=lib/libzfs.so.1
  93   94  file path=lib/libzfs_core.so.1
  94   95  file path=lib/llib-lzfs
  95   96  file path=lib/llib-lzfs.ln
  96   97  file path=lib/llib-lzfs_core
  97   98  file path=lib/llib-lzfs_core.ln
  98   99  file path=sbin/zfs mode=0555
  99  100  file path=sbin/zpool mode=0555
 100      -file path=usr/lib/$(ARCH64)/libzfs_jni.so.1
 101      -file path=usr/lib/$(ARCH64)/libzpool.so.1
      101 +$(BUILD64)file path=usr/lib/$(ARCH64)/libzfs_jni.so.1
      102 +$(BUILD64)file path=usr/lib/$(ARCH64)/libzpool.so.1
 102  103  file path=usr/lib/devfsadm/linkmod/SUNW_zfs_link.so group=sys
 103  104  file path=usr/lib/fs/zfs/bootinstall mode=0555
 104  105  file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555
 105  106  file path=usr/lib/libzfs_jni.so.1
 106  107  $(i386_ONLY)file path=usr/lib/libzpool.so.1
 107      -file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
      108 +$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
 108  109  $(i386_ONLY)file path=usr/lib/mdb/kvm/zfs.so group=sys mode=0555
 109      -file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555
      110 +$(BUILD64)file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555
 110  111  file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555
 111  112  file path=usr/lib/python2.6/vendor-packages/zfs/__init__.py
 112  113  file path=usr/lib/python2.6/vendor-packages/zfs/__init__.pyc
 113  114  file path=usr/lib/python2.6/vendor-packages/zfs/allow.py
 114  115  file path=usr/lib/python2.6/vendor-packages/zfs/allow.pyc
 115  116  file path=usr/lib/python2.6/vendor-packages/zfs/dataset.py
 116  117  file path=usr/lib/python2.6/vendor-packages/zfs/dataset.pyc
 117  118  file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.py
 118  119  file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.pyc
 119  120  file path=usr/lib/python2.6/vendor-packages/zfs/holds.py
↓ open down ↓ 5 lines elided ↑ open up ↑
 125  126  file path=usr/lib/python2.6/vendor-packages/zfs/unallow.pyc
 126  127  file path=usr/lib/python2.6/vendor-packages/zfs/userspace.py
 127  128  file path=usr/lib/python2.6/vendor-packages/zfs/userspace.pyc
 128  129  file path=usr/lib/python2.6/vendor-packages/zfs/util.py
 129  130  file path=usr/lib/python2.6/vendor-packages/zfs/util.pyc
 130  131  file path=usr/lib/sysevent/modules/zfs_mod.so group=sys
 131  132  file path=usr/lib/zfs/availdevs mode=0555
 132  133  file path=usr/lib/zfs/pyzfs.py mode=0555
 133  134  file path=usr/lib/zfs/pyzfs.pyc mode=0555
 134  135  $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zdb mode=0555
 135      -file path=usr/sbin/$(ARCH64)/zdb mode=0555
      136 +$(BUILD64)file path=usr/sbin/$(ARCH64)/zdb mode=0555
 136  137  file path=usr/sbin/zstreamdump mode=0555
 137  138  file path=usr/share/man/man1m/zdb.1m
 138  139  file path=usr/share/man/man1m/zfs.1m
 139  140  file path=usr/share/man/man1m/zpool.1m
 140  141  file path=usr/share/man/man1m/zstreamdump.1m
 141  142  file path=usr/share/man/man5/zpool-features.5
 142  143  hardlink path=kernel/fs/$(ARCH64)/zfs target=../../../kernel/drv/$(ARCH64)/zfs
 143  144  $(i386_ONLY)hardlink path=kernel/fs/zfs target=../../kernel/drv/zfs
 144  145  hardlink path=usr/lib/fs/zfs/fstyp target=../../../sbin/fstyp
 145  146  hardlink path=usr/sbin/zdb target=../../usr/lib/isaexec
 146  147  legacy pkg=SUNWzfskr desc="ZFS kernel root components" \
 147  148      name="ZFS Kernel (Root)"
 148  149  legacy pkg=SUNWzfsr desc="ZFS root components" name="ZFS (Root)"
 149  150  legacy pkg=SUNWzfsu desc="ZFS libraries and commands" name="ZFS (Usr)"
 150  151  license cr_Sun license=cr_Sun
 151  152  license lic_CDDL license=lic_CDDL
 152  153  license usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4 \
 153  154      license=usr/src/uts/common/fs/zfs/THIRDPARTYLICENSE.lz4
 154  155  link path=etc/fs/zfs/mount target=../../../sbin/zfs
 155  156  link path=etc/fs/zfs/umount target=../../../sbin/zfs
 156      -link path=lib/$(ARCH64)/libzfs.so target=libzfs.so.1
 157      -link path=lib/$(ARCH64)/libzfs_core.so target=libzfs_core.so.1
      157 +$(BUILD64)link path=lib/$(ARCH64)/libzfs.so target=libzfs.so.1
      158 +$(BUILD64)link path=lib/$(ARCH64)/libzfs_core.so target=libzfs_core.so.1
 158  159  link path=lib/libzfs.so target=libzfs.so.1
 159  160  link path=lib/libzfs_core.so target=libzfs_core.so.1
 160      -link path=usr/lib/$(ARCH64)/libzfs.so \
      161 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzfs.so \
 161  162      target=../../../lib/$(ARCH64)/libzfs.so.1
 162      -link path=usr/lib/$(ARCH64)/libzfs.so.1 \
      163 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzfs.so.1 \
 163  164      target=../../../lib/$(ARCH64)/libzfs.so.1
 164      -link path=usr/lib/$(ARCH64)/libzfs_core.so \
      165 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzfs_core.so \
 165  166      target=../../../lib/$(ARCH64)/libzfs_core.so.1
 166      -link path=usr/lib/$(ARCH64)/libzfs_core.so.1 \
      167 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzfs_core.so.1 \
 167  168      target=../../../lib/$(ARCH64)/libzfs_core.so.1
 168      -link path=usr/lib/$(ARCH64)/libzfs_jni.so target=libzfs_jni.so.1
 169      -link path=usr/lib/$(ARCH64)/libzpool.so target=libzpool.so.1
 170      -link path=usr/lib/$(ARCH64)/llib-lzfs.ln \
      169 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzfs_jni.so target=libzfs_jni.so.1
      170 +$(BUILD64)link path=usr/lib/$(ARCH64)/libzpool.so target=libzpool.so.1
      171 +$(BUILD64)link path=usr/lib/$(ARCH64)/llib-lzfs.ln \
 171  172      target=../../../lib/$(ARCH64)/llib-lzfs.ln
 172      -link path=usr/lib/$(ARCH64)/llib-lzfs_core.ln \
      173 +$(BUILD64)link path=usr/lib/$(ARCH64)/llib-lzfs_core.ln \
 173  174      target=../../../lib/$(ARCH64)/llib-lzfs_core.ln
 174  175  link path=usr/lib/fs/zfs/mount target=../../../../sbin/zfs
 175  176  link path=usr/lib/fs/zfs/umount target=../../../../sbin/zfs
 176  177  link path=usr/lib/libzfs.so target=../../lib/libzfs.so.1
 177  178  link path=usr/lib/libzfs.so.1 target=../../lib/libzfs.so.1
 178  179  link path=usr/lib/libzfs_core.so target=../../lib/libzfs_core.so.1
 179  180  link path=usr/lib/libzfs_core.so.1 target=../../lib/libzfs_core.so.1
 180  181  link path=usr/lib/libzfs_jni.so target=libzfs_jni.so.1
 181  182  $(i386_ONLY)link path=usr/lib/libzpool.so target=libzpool.so.1
 182  183  link path=usr/lib/llib-lzfs target=../../lib/llib-lzfs
 183  184  link path=usr/lib/llib-lzfs.ln target=../../lib/llib-lzfs.ln
 184  185  link path=usr/lib/llib-lzfs_core target=../../lib/llib-lzfs_core
 185  186  link path=usr/lib/llib-lzfs_core.ln target=../../lib/llib-lzfs_core.ln
 186  187  link path=usr/sbin/zfs target=../../sbin/zfs
 187  188  link path=usr/sbin/zpool target=../../sbin/zpool
 188  189  depend fmri=runtime/python-26 type=require
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX