illumos-gate-1681 Udiff usr/src/pkg/manifests/system-extended-system-utilities.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/extended-system-utilities@$(PKGVERS)
 set name=pkg.description \
     value="additional UNIX system utilities, including awk, bc, cal, compress, diff, dos2unix, last, rup, sort, spell, uniq, and uuencode"

@@ -31,22 +32,22 @@
 set name=info.classification value=org.opensolaris.category.2008:System/Core
 set name=variant.arch value=$(ARCH)
 dir path=usr group=sys
 dir path=usr/bin
 $(i386_ONLY)dir path=usr/bin/$(ARCH32)
-dir path=usr/bin/$(ARCH64)
+$(BUILD64)dir path=usr/bin/$(ARCH64)
 dir path=usr/lib
-dir path=usr/lib/$(ARCH64)
+$(BUILD64)dir path=usr/lib/$(ARCH64)
 dir path=usr/lib/adb group=sys
-dir path=usr/lib/adb/$(ARCH64) group=sys
+$(BUILD64)dir path=usr/lib/adb/$(ARCH64) group=sys
 dir path=usr/lib/fs group=sys
 dir path=usr/lib/fs/pcfs group=sys
 dir path=usr/lib/spell
 dir path=usr/proc
 dir path=usr/proc/bin
 dir path=usr/sbin
-dir path=usr/sbin/$(ARCH64)
+$(BUILD64)dir path=usr/sbin/$(ARCH64)
 dir path=usr/share
 dir path=usr/share/lib
 dir path=usr/share/lib/dict
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m

@@ -68,30 +69,30 @@
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ptime mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/ptree mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/pwait mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/pwdx mode=0555
 $(i386_ONLY)file path=usr/bin/$(ARCH32)/sort mode=0555
-file path=usr/bin/$(ARCH64)/pargs mode=0555
-file path=usr/bin/$(ARCH64)/pcred mode=0555
-file path=usr/bin/$(ARCH64)/pfiles mode=0555
-file path=usr/bin/$(ARCH64)/pflags mode=0555
-file path=usr/bin/$(ARCH64)/pldd mode=0555
-file path=usr/bin/$(ARCH64)/plgrp mode=0555
-file path=usr/bin/$(ARCH64)/pmadvise mode=0555
-file path=usr/bin/$(ARCH64)/pmap mode=0555
-file path=usr/bin/$(ARCH64)/ppgsz mode=0555
-file path=usr/bin/$(ARCH64)/ppriv mode=0555
-file path=usr/bin/$(ARCH64)/preap mode=0555
-file path=usr/bin/$(ARCH64)/prun mode=0555
-file path=usr/bin/$(ARCH64)/psig mode=0555
-file path=usr/bin/$(ARCH64)/pstack mode=0555
-file path=usr/bin/$(ARCH64)/pstop mode=0555
-file path=usr/bin/$(ARCH64)/ptime mode=0555
-file path=usr/bin/$(ARCH64)/ptree mode=0555
-file path=usr/bin/$(ARCH64)/pwait mode=0555
-file path=usr/bin/$(ARCH64)/pwdx mode=0555
-file path=usr/bin/$(ARCH64)/sort mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pargs mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pcred mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pfiles mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pflags mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pldd mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/plgrp mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pmadvise mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pmap mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ppgsz mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ppriv mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/preap mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/prun mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/psig mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pstack mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pstop mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ptime mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/ptree mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pwait mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/pwdx mode=0555
+$(BUILD64)file path=usr/bin/$(ARCH64)/sort mode=0555
 file path=usr/bin/asa mode=0555
 file path=usr/bin/awk mode=0555
 file path=usr/bin/banner mode=0555
 file path=usr/bin/batch mode=0555
 file path=usr/bin/bc mode=0555

@@ -131,13 +132,13 @@
 file path=usr/bin/unix2dos mode=0555
 file path=usr/bin/unpack mode=0555
 file path=usr/bin/uudecode group=uucp mode=0555
 file path=usr/bin/uuencode group=uucp mode=0555
 file path=usr/bin/yes mode=0555
-file path=usr/lib/$(ARCH64)/madv.so.1
-file path=usr/lib/$(ARCH64)/mpss.so.1
-file path=usr/lib/adb/$(ARCH64)/adbsub.o group=sys
+$(BUILD64)file path=usr/lib/$(ARCH64)/madv.so.1
+$(BUILD64)file path=usr/lib/$(ARCH64)/mpss.so.1
+$(BUILD64)file path=usr/lib/adb/$(ARCH64)/adbsub.o group=sys
 file path=usr/lib/adb/adbgen group=sys mode=0755
 file path=usr/lib/adb/adbgen1 group=sys mode=0755
 file path=usr/lib/adb/adbgen3 group=sys mode=0755
 file path=usr/lib/adb/adbgen4 group=sys mode=0755
 file path=usr/lib/adb/adbsub.o group=sys