illumos-gate-1681 Udiff usr/src/pkg/manifests/SUNWcs.mf

Print this page

1681 support for BUILD64=# no longer works

@@ -21,10 +21,11 @@
 
 #
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 Nexenta Systems, Inc. All rights reserved.
 # Copyright (c) 2013 Gary Mills
+# Copyright 2014 Andrew Stormont.
 #
 
 <include SUNWcs.man1.inc>
 <include SUNWcs.man1m.inc>
 <include SUNWcs.man4.inc>

@@ -133,11 +134,11 @@
 dir path=system/object group=root mode=0555
 dir path=tmp group=sys mode=1777
 dir path=usr group=sys
 dir path=usr/bin
 dir path=usr/bin/$(ARCH32)
-dir path=usr/bin/$(ARCH64)
+$(BUILD64)dir path=usr/bin/$(ARCH64)
 dir path=usr/ccs
 dir path=usr/ccs/bin
 dir path=usr/demo
 dir path=usr/games
 dir path=usr/has

@@ -160,11 +161,11 @@
 dir path=usr/kernel/strmod/$(ARCH64) group=sys
 dir path=usr/kernel/sys group=sys
 dir path=usr/kernel/sys/$(ARCH64) group=sys
 dir path=usr/kvm
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/audit
 dir path=usr/lib/class
 dir path=usr/lib/class/FX
 dir path=usr/lib/class/IA
 dir path=usr/lib/class/RT

@@ -173,20 +174,20 @@
 dir path=usr/lib/crypto
 dir path=usr/lib/devfsadm group=sys
 dir path=usr/lib/devfsadm/linkmod group=sys
 dir path=usr/lib/fs group=sys
 dir path=usr/lib/fs/autofs group=sys
-dir path=usr/lib/fs/autofs/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/fs/autofs/$(ARCH64) group=sys
 dir path=usr/lib/fs/cachefs group=sys
 dir path=usr/lib/fs/ctfs group=sys
 dir path=usr/lib/fs/dev group=sys
 dir path=usr/lib/fs/fd group=sys
 dir path=usr/lib/fs/hsfs group=sys
 dir path=usr/lib/fs/lofs group=sys
 dir path=usr/lib/fs/mntfs group=sys
 dir path=usr/lib/fs/nfs group=sys
-dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/fs/nfs/$(ARCH64) group=sys
 dir path=usr/lib/fs/objfs group=sys
 dir path=usr/lib/fs/proc group=sys
 dir path=usr/lib/fs/sharefs group=sys
 dir path=usr/lib/fs/tmpfs group=sys
 dir path=usr/lib/fs/ufs group=sys

@@ -198,11 +199,11 @@
 dir path=usr/lib/help/profiles/locale
 dir path=usr/lib/help/profiles/locale/C
 dir path=usr/lib/iconv
 dir path=usr/lib/inet
 dir path=usr/lib/inet/$(ARCH32)
-dir path=usr/lib/inet/$(ARCH64)
+$(BUILD64)dir path=usr/lib/inet/$(ARCH64)
 dir path=usr/lib/inet/dhcp
 dir path=usr/lib/inet/dhcp/nsu
 dir path=usr/lib/inet/dhcp/svc
 dir path=usr/lib/locale
 dir path=usr/lib/locale/C

@@ -218,11 +219,11 @@
 dir path=usr/lib/rcm/modules
 dir path=usr/lib/rcm/scripts
 dir path=usr/lib/reparse
 dir path=usr/lib/saf
 dir path=usr/lib/secure
-dir path=usr/lib/secure/$(ARCH64)
+$(BUILD64)dir path=usr/lib/secure/$(ARCH64)
 dir path=usr/lib/security
 dir path=usr/lib/sysevent
 dir path=usr/lib/sysevent/modules
 dir path=usr/net group=sys
 dir path=usr/net/nls group=sys

@@ -233,11 +234,11 @@
 dir path=usr/sadm/bin
 dir path=usr/sadm/install
 dir path=usr/sadm/install/scripts
 dir path=usr/sbin
 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
-dir path=usr/sbin/$(ARCH64)
+$(BUILD64)dir path=usr/sbin/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/doc group=other
 dir path=usr/share/doc/ksh
 dir path=usr/share/doc/ksh/images
 dir path=usr/share/doc/ksh/images/callouts

@@ -266,11 +267,11 @@
 dir path=var/cron group=sys
 dir path=var/games
 dir path=var/idmap group=daemon owner=daemon
 dir path=var/inet group=sys
 dir path=var/ld
-dir path=var/ld/$(ARCH64)
+$(BUILD64)dir path=var/ld/$(ARCH64)
 dir path=var/log group=sys
 dir path=var/logadm
 dir path=var/mail group=mail mode=1777
 dir path=var/mail/:saved group=mail mode=0775
 dir path=var/news

@@ -679,25 +680,25 @@
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/prstat mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ps mode=0555
 file path=usr/bin/$(ARCH32)/savecore mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/setuname mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/uptime mode=4555
-file path=usr/bin/$(ARCH64)/amt mode=0555
-file path=usr/bin/$(ARCH64)/crle mode=0555
-file path=usr/bin/$(ARCH64)/decrypt mode=0555
-file path=usr/bin/$(ARCH64)/digest mode=0555
-file path=usr/bin/$(ARCH64)/ksh93 mode=0555
-file path=usr/bin/$(ARCH64)/ls mode=0555
-file path=usr/bin/$(ARCH64)/moe mode=0555
-file path=usr/bin/$(ARCH64)/newtask group=sys mode=4555
-file path=usr/bin/$(ARCH64)/nohup mode=0555
-file path=usr/bin/$(ARCH64)/prctl mode=0555
-file path=usr/bin/$(ARCH64)/prstat mode=0555
-file path=usr/bin/$(ARCH64)/ps mode=0555
-file path=usr/bin/$(ARCH64)/savecore mode=0555
-file path=usr/bin/$(ARCH64)/setuname mode=0555
-file path=usr/bin/$(ARCH64)/uptime mode=4555
+$(BUILD64)file path=usr/bin/$(ARCH64)/amt mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/crle mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/decrypt mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/digest mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ksh93 mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ls mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/moe mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/newtask group=sys mode=4555
+$(BUILD64)file path=usr/bin/$(ARCH64)/nohup mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/prctl mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/prstat mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ps mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/savecore mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/setuname mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/uptime mode=4555
 $(i386_ONLY)file path=usr/bin/addbadsec mode=0555
 file path=usr/bin/alias mode=0555
 file path=usr/bin/amt mode=0555
 file path=usr/bin/arch mode=0555
 file path=usr/bin/at group=sys mode=4755

@@ -920,11 +921,11 @@
 file path=usr/kernel/sys/$(ARCH64)/sysacct group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/sys/acctctl group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/sys/exacctsys group=sys mode=0755
 $(i386_ONLY)file path=usr/kernel/sys/sysacct group=sys mode=0755
 file path=usr/kvm/README group=sys
-file path=usr/lib/$(ARCH64)/libshare.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/libshare.so.1
 file path=usr/lib/audit/audit_record_attr mode=0444
 file path=usr/lib/calprog mode=0555
 file path=usr/lib/class/FX/FXdispadmin mode=0555
 file path=usr/lib/class/FX/FXpriocntl mode=0555
 file path=usr/lib/class/IA/IAdispadmin mode=0555

@@ -1214,11 +1215,11 @@
 file path=usr/lib/iconv/8859.646it.t mode=0444
 file path=usr/lib/iconv/8859.646sv.t mode=0444
 file path=usr/lib/iconv/iconv_data mode=0444
 file path=usr/lib/idmapd mode=0555
 file path=usr/lib/inet/$(ARCH32)/in.iked mode=0555
-file path=usr/lib/inet/$(ARCH64)/in.iked mode=0555
+$(BUILD64)file path=usr/lib/inet/$(ARCH64)/in.iked mode=0555
 file path=usr/lib/inet/certdb mode=0555
 file path=usr/lib/inet/certlocal mode=0555
 file path=usr/lib/inet/certrldb mode=0555
 file path=usr/lib/inet/inetd mode=0555
 file path=usr/lib/intrd mode=0555

@@ -1289,22 +1290,22 @@
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/rem_drv group=sys mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/swap group=sys mode=2555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/sysdef group=sys mode=2555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/update_drv group=sys mode=0555
 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/whodo mode=4555
-file path=usr/sbin/$(ARCH64)/add_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modinfo group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modload group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/modunload group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/pbind group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/prtconf group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/psrset group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/rem_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/swap group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/sysdef group=sys mode=2555
-file path=usr/sbin/$(ARCH64)/update_drv group=sys mode=0555
-file path=usr/sbin/$(ARCH64)/whodo mode=4555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/add_drv group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/modinfo group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/modload group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/modunload group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/pbind group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/prtconf group=sys mode=2555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/psrset group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/rem_drv group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/swap group=sys mode=2555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/sysdef group=sys mode=2555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/update_drv group=sys mode=0555
+$(BUILD64)file path=usr/sbin/$(ARCH64)/whodo mode=4555
 file path=usr/sbin/6to4relay mode=0555
 file path=usr/sbin/acctadm mode=0555
 file path=usr/sbin/allocate mode=4555
 file path=usr/sbin/arp mode=0555
 file path=usr/sbin/audit mode=0555

@@ -1493,16 +1494,16 @@
 hardlink path=usr/bin/$(ARCH32)/ksh target=ksh93
 hardlink path=usr/bin/$(ARCH32)/mac target=digest
 hardlink path=usr/bin/$(ARCH32)/rksh target=ksh93
 hardlink path=usr/bin/$(ARCH32)/rksh93 target=ksh93
 $(i386_ONLY)hardlink path=usr/bin/$(ARCH32)/w target=uptime
-hardlink path=usr/bin/$(ARCH64)/encrypt target=decrypt
-hardlink path=usr/bin/$(ARCH64)/ksh target=ksh93
-hardlink path=usr/bin/$(ARCH64)/mac target=digest
-hardlink path=usr/bin/$(ARCH64)/rksh target=ksh93
-hardlink path=usr/bin/$(ARCH64)/rksh93 target=ksh93
-hardlink path=usr/bin/$(ARCH64)/w target=uptime
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/encrypt target=decrypt
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/ksh target=ksh93
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/mac target=digest
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/rksh target=ksh93
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/rksh93 target=ksh93
+$(BUILD64)hardlink path=usr/bin/$(ARCH64)/w target=uptime
 hardlink path=usr/bin/bg target=../../usr/bin/alias
 hardlink path=usr/bin/cd target=../../usr/bin/alias
 hardlink path=usr/bin/cksum target=../../usr/bin/alias
 hardlink path=usr/bin/cmp target=../../usr/bin/alias
 hardlink path=usr/bin/comm target=../../usr/bin/alias

@@ -1803,11 +1804,12 @@
 link path=usr/bin/tar target=../sbin/tar
 link path=usr/bin/uname target=../../sbin/uname
 link path=usr/ccs/bin/m4 target=../../bin/m4
 link path=usr/has/bin/jsh target=sh
 link path=usr/has/lib/rsh target=../bin/sh
-link path=usr/lib/$(ARCH64)/ld.so.1 target=../../../lib/$(ARCH64)/ld.so.1
+$(BUILD64)link path=usr/lib/$(ARCH64)/ld.so.1 \
+    target=../../../lib/$(ARCH64)/ld.so.1
 link path=usr/lib/cron target=../../etc/cron.d
 link path=usr/lib/devfsadm/devfsadmd target=../../sbin/devfsadm
 link path=usr/lib/embedded_su target=../bin/su
 link path=usr/lib/fs/dev/mount target=../../../../etc/fs/dev/mount
 link path=usr/lib/fs/hsfs/mount target=../../../../etc/fs/hsfs/mount

@@ -1815,11 +1817,11 @@
 link path=usr/lib/inet/in.mpathd target=../../../lib/inet/in.mpathd
 link path=usr/lib/ld.so.1 target=../../lib/ld.so.1
 link path=usr/lib/locale/POSIX target=./C
 link path=usr/lib/rsh target=../bin/ksh93
 link path=usr/lib/secure/32 target=.
-link path=usr/lib/secure/64 target=$(ARCH64)
+$(BUILD64)link path=usr/lib/secure/64 target=$(ARCH64)
 link path=usr/lib/wusbd target=../../sbin/wusbadm
 link path=usr/mail target=../var/mail
 link path=usr/net/nls/listen target=../../lib/saf/listen
 link path=usr/net/nls/nlps_server target=../../lib/saf/nlps_server
 link path=usr/news target=../var/news

@@ -1874,11 +1876,11 @@
 link path=usr/sbin/wusbadm target=../../sbin/wusbadm
 link path=usr/spool target=../var/spool
 link path=usr/src target=./share/src
 link path=usr/tmp target=../var/tmp
 link path=var/ld/32 target=.
-link path=var/ld/64 target=$(ARCH64)
+$(BUILD64)link path=var/ld/64 target=$(ARCH64)
 #
 # The bootadm binary needs the etc/release file.
 #
 depend fmri=release/name type=require
 #