summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@nexenta.com>2010-10-22 00:06:29 -0700
committerGarrett D'Amore <garrett@nexenta.com>2010-10-22 00:06:29 -0700
commit849d2db858cbb7eb44d546a03f85bf615603106f (patch)
tree11a29ff0bcd45c0184f6571c09728ed4c69a5838 /usr/src
parent5aec55eb0591d2fcdd38d7dd5408a6ff3456e596 (diff)
downloadillumos-gate-849d2db858cbb7eb44d546a03f85bf615603106f.tar.gz
362 move xpg4 hardlinks to symlinks, and adjust packaging
361 xpg4/sh busted Reviewed by: damian@wojslaw.pl Reviewed by: richlowe@richlowe.net Approved by: richlowe@richlowe.net
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/pkg/manifests/SUNWcs.mf21
-rw-r--r--usr/src/pkg/manifests/system-xopen-xcu4.mf19
2 files changed, 19 insertions, 21 deletions
diff --git a/usr/src/pkg/manifests/SUNWcs.mf b/usr/src/pkg/manifests/SUNWcs.mf
index f0682b869e..f38dc071d7 100644
--- a/usr/src/pkg/manifests/SUNWcs.mf
+++ b/usr/src/pkg/manifests/SUNWcs.mf
@@ -273,8 +273,6 @@ dir path=usr/share/lib/zoneinfo/US
dir path=usr/share/lib/zoneinfo/src
dir path=usr/share/lib/zoneinfo/tab
dir path=usr/share/src group=sys
-dir path=usr/xpg4
-dir path=usr/xpg4/bin
dir path=var group=sys
dir path=var/adm group=sys mode=0775
dir path=var/adm/exacct group=adm owner=adm
@@ -2533,25 +2531,6 @@ hardlink path=usr/share/lib/zoneinfo/W-SU \
target=../../../../usr/share/lib/zoneinfo/Europe/Moscow
hardlink path=usr/share/lib/zoneinfo/Zulu \
target=../../../../usr/share/lib/zoneinfo/Etc/UTC
-hardlink path=usr/xpg4/bin/alias target=../../bin/alias
-hardlink path=usr/xpg4/bin/bg target=../../bin/alias
-hardlink path=usr/xpg4/bin/cd target=../../bin/alias
-hardlink path=usr/xpg4/bin/command target=../../bin/alias
-hardlink path=usr/xpg4/bin/fc target=../../bin/alias
-hardlink path=usr/xpg4/bin/fg target=../../bin/alias
-hardlink path=usr/xpg4/bin/getopts target=../../bin/alias
-hardlink path=usr/xpg4/bin/hash target=../../bin/alias
-hardlink path=usr/xpg4/bin/jobs target=../../bin/alias
-hardlink path=usr/xpg4/bin/kill target=../../bin/alias
-hardlink path=usr/xpg4/bin/pfsh target=../../bin/pfexec
-hardlink path=usr/xpg4/bin/read target=../../bin/alias
-hardlink path=usr/xpg4/bin/sh target=../../bin/ksh93
-hardlink path=usr/xpg4/bin/test target=../../bin/alias
-hardlink path=usr/xpg4/bin/type target=../../bin/alias
-hardlink path=usr/xpg4/bin/ulimit target=../../bin/alias
-hardlink path=usr/xpg4/bin/umask target=../../bin/alias
-hardlink path=usr/xpg4/bin/unalias target=../../bin/alias
-hardlink path=usr/xpg4/bin/wait target=../../bin/alias
legacy pkg=SUNWcsr \
desc="core software for a specific instruction-set architecture" \
name="Core Solaris, (Root)"
diff --git a/usr/src/pkg/manifests/system-xopen-xcu4.mf b/usr/src/pkg/manifests/system-xopen-xcu4.mf
index 3dd3393042..f853c370cb 100644
--- a/usr/src/pkg/manifests/system-xopen-xcu4.mf
+++ b/usr/src/pkg/manifests/system-xopen-xcu4.mf
@@ -85,7 +85,26 @@ license cr_Sun license=cr_Sun
license lic_CDDL license=lic_CDDL
license lic_OSBL license=lic_OSBL
license lic_OSBL_preamble license=lic_OSBL_preamble
+link path=usr/xpg4/bin/alias target=../../bin/alias
+link path=usr/xpg4/bin/bg target=../../bin/alias
+link path=usr/xpg4/bin/cd target=../../bin/alias
+link path=usr/xpg4/bin/command target=../../bin/alias
+link path=usr/xpg4/bin/fc target=../../bin/alias
+link path=usr/xpg4/bin/fg target=../../bin/alias
+link path=usr/xpg4/bin/getopts target=../../bin/alias
+link path=usr/xpg4/bin/hash target=../../bin/alias
link path=usr/xpg4/bin/ipcs target=../../bin/ipcs
+link path=usr/xpg4/bin/jobs target=../../bin/alias
+link path=usr/xpg4/bin/kill target=../../bin/alias
link path=usr/xpg4/bin/od target=../../bin/od
+link path=usr/xpg4/bin/pfsh target=../../bin/pfexec
+link path=usr/xpg4/bin/read target=../../bin/alias
+link path=usr/xpg4/bin/sh target=../../bin/ksh93
link path=usr/xpg4/bin/tail target=../../bin/tail
+link path=usr/xpg4/bin/test target=../../bin/alias
link path=usr/xpg4/bin/tr target=../../bin/tr
+link path=usr/xpg4/bin/type target=../../bin/alias
+link path=usr/xpg4/bin/ulimit target=../../bin/alias
+link path=usr/xpg4/bin/umask target=../../bin/alias
+link path=usr/xpg4/bin/unalias target=../../bin/alias
+link path=usr/xpg4/bin/wait target=../../bin/alias