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

Print this page

1681 support for BUILD64=# no longer works

@@ -20,10 +20,11 @@
 #
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2014 Andrew Stormont.
 #
 
 set name=pkg.fmri value=pkg:/system/file-system/smb@$(PKGVERS)
 set name=pkg.description value="SMB/CIFS File System client support"
 set name=pkg.summary value="SMB/CIFS File System client support"

@@ -44,19 +45,19 @@
 dir path=usr/kernel/fs group=sys
 dir path=usr/kernel/fs/$(ARCH64) group=sys
 dir path=usr/kernel/kmdb group=sys
 dir path=usr/kernel/kmdb/$(ARCH64) group=sys
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/fs group=sys
 dir path=usr/lib/fs/smbfs group=sys
-dir path=usr/lib/fs/smbfs/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/fs/smbfs/$(ARCH64) group=sys
 dir path=usr/lib/mdb group=sys
 dir path=usr/lib/mdb/kvm group=sys
-dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
 dir path=usr/lib/security
-dir path=usr/lib/security/$(ARCH64)
+$(BUILD64)dir path=usr/lib/security/$(ARCH64)
 dir path=usr/lib/smbfs
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man4

@@ -73,24 +74,24 @@
 $(i386_ONLY)file path=usr/kernel/fs/smbfs group=sys mode=0755
 file path=usr/kernel/kmdb/$(ARCH64)/nsmb group=sys mode=0555
 file path=usr/kernel/kmdb/$(ARCH64)/smbfs group=sys mode=0555
 $(i386_ONLY)file path=usr/kernel/kmdb/nsmb group=sys mode=0555
 $(i386_ONLY)file path=usr/kernel/kmdb/smbfs group=sys mode=0555
-file path=usr/lib/$(ARCH64)/libsmbfs.so.1
-file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libsmbfs.so.1
+$(BUILD64)file path=usr/lib/fs/smbfs/$(ARCH64)/libshare_smbfs.so.1
 file path=usr/lib/fs/smbfs/dfshares mode=0555
 file path=usr/lib/fs/smbfs/libshare_smbfs.so.1
 file path=usr/lib/fs/smbfs/mount mode=4555
 file path=usr/lib/fs/smbfs/share mode=0555
 file path=usr/lib/fs/smbfs/umount mode=4555
 file path=usr/lib/fs/smbfs/unshare mode=0555
 file path=usr/lib/libsmbfs.so.1
-file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
-file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555
+$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/nsmb.so mode=0555
+$(BUILD64)file path=usr/lib/mdb/kvm/$(ARCH64)/smbfs.so mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/nsmb.so mode=0555
 $(i386_ONLY)file path=usr/lib/mdb/kvm/smbfs.so mode=0555
-file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1
+$(BUILD64)file path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so.1
 file path=usr/lib/security/pam_smbfs_login.so.1
 file path=usr/lib/smbfs/smbiod mode=0555
 file path=usr/lib/smbfs/smbiod-svc mode=0555
 file path=usr/share/man/man1/smbutil.1
 file path=usr/share/man/man1m/mount_smbfs.1m

@@ -112,11 +113,11 @@
     license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.boris_popov
 license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4 \
     license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.bsd4
 license usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft \
     license=usr/src/lib/libsmbfs/smb/THIRDPARTYLICENSE.microsoft
-link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \
+$(BUILD64)link path=usr/lib/security/$(ARCH64)/pam_smbfs_login.so \
     target=pam_smbfs_login.so.1
 link path=usr/lib/security/pam_smbfs_login.so target=pam_smbfs_login.so.1
 link path=usr/share/man/man1m/umount_smbfs.1m target=mount_smbfs.1m
 # libsmbfs uses iconv_open() which requires this at run-time.
 depend fmri=system/library/iconv/utf-8 type=require