PSARC 2010/067 Interim modernization updates

6915312 ON should be able to build IPS packages natively
6281004 docbook.dtd is obsolete and unused
6490919 strange file in onnv-gate
6878498 update tools proto ${ROOT} to include ${MACH} and make nightly.sh copy it into parent repository
6888427 SVM packages should drop legacy objects
6893530 Some header files can be opened up
6903324 sharemgr should either use isaexec or not build 64-bit commands
6920651 mktpl will inadvertently reuse stale license files for empty license lists
6920674 svvs kmods should not be built during an open build
Portions contributed by Rich Lowe <richlowe@richlowe.net>

--HG--
rename : usr/src/cmd/oamuser/user/stdprofile => usr/src/cmd/nsadmin/dot-profile.sh
rename : usr/src/cmd/nsadmin/profile => usr/src/cmd/nsadmin/etc-profile.sh
rename : usr/src/pkgdefs/common_files/i.manifest => usr/src/cmd/svc/common/i.manifest
rename : usr/src/pkgdefs/common_files/r.manifest => usr/src/cmd/svc/common/r.manifest
rename : usr/src/lib/brand/native/Makefile => usr/src/lib/brand/ipkg/Makefile
rename : usr/src/lib/brand/native/zone/Makefile => usr/src/lib/brand/ipkg/zone/Makefile
rename : usr/src/lib/brand/native/zone/SUNWblank.xml => usr/src/lib/brand/ipkg/zone/SUNWblank.xml
rename : usr/src/lib/brand/native/zone/SUNWdefault.xml => usr/src/lib/brand/ipkg/zone/SUNWdefault.xml
rename : usr/src/lib/brand/native/zone/config.xml => usr/src/lib/brand/ipkg/zone/config.xml
rename : usr/src/lib/brand/native/zone/platform.xml => usr/src/lib/brand/ipkg/zone/platform.xml
rename : usr/src/lib/brand/native/Makefile => usr/src/lib/brand/labeled/Makefile
rename : usr/src/lib/brand/native/zone/Makefile => usr/src/lib/brand/labeled/zone/Makefile
rename : usr/src/lib/brand/native/zone/config.xml => usr/src/lib/brand/labeled/zone/config.xml
rename : usr/src/lib/brand/native/zone/platform.xml => usr/src/lib/brand/labeled/zone/platform.xml
rename : usr/src/lib/brand/native/zone/common.ksh => usr/src/lib/brand/shared/common.ksh
rename : usr/src/lib/brand/native/zone/query.ksh => usr/src/lib/brand/shared/query.ksh
rename : usr/src/lib/brand/native/zone/uninstall.ksh => usr/src/lib/brand/shared/uninstall.ksh
rename : usr/src/pkgdefs/common_files/i.rbac => usr/src/lib/libsecdb/common/i.rbac
rename : usr/src/pkgdefs/common_files/r.rbac => usr/src/lib/libsecdb/common/r.rbac
rename : usr/src/pkgdefs/license_files/cr_ATT => usr/src/pkg/license_files/cr_ATT
rename : usr/src/pkgdefs/SUNWfipe/cr_Intel => usr/src/pkg/license_files/cr_Intel.SUNWfipe
rename : usr/src/pkgdefs/SUNWintgige/cr_Intel => usr/src/pkg/license_files/cr_Intel.SUNWintgige
rename : usr/src/pkgdefs/license_files/cr_Sun => usr/src/pkg/license_files/cr_Sun
rename : usr/src/pkgdefs/SUNWgrub/grubcredits => usr/src/pkg/license_files/grubcredits
rename : usr/src/pkgdefs/SUNWcsl/lic_AMD => usr/src/pkg/license_files/lic_AMD
rename : usr/src/pkgdefs/license_files/lic_CDDL => usr/src/pkg/license_files/lic_CDDL
rename : usr/src/pkgdefs/SUNWemlxs/lic_Emulex => usr/src/pkg/license_files/lic_Emulex
rename : usr/src/pkgdefs/license_files/lic_GPLv2 => usr/src/pkg/license_files/lic_GPLv2
rename : usr/src/pkgdefs/CPQary3/lic_HP => usr/src/pkg/license_files/lic_HP
rename : usr/src/tools/opensolaris/BINARYLICENSE.txt => usr/src/pkg/license_files/lic_OSBL
rename : usr/src/pkgdefs/license_files/lic_OSBL_preamble => usr/src/pkg/license_files/lic_OSBL_preamble
rename : usr/src/pkgdefs/SUNWqlc/lic_Qlogic => usr/src/pkg/license_files/lic_Qlogic
rename : usr/src/pkgdefs/SUNWhwdata/LICENSE => usr/src/pkg/license_files/lic_SUNWhwdata
rename : usr/src/pkgdefs/SUNWroute/copyright.in => usr/src/pkg/license_files/lic_SUNWroute
rename : usr/src/pkgdefs/SUNWgss/gss_license => usr/src/pkg/license_files/lic_gss
rename : usr/src/pkgdefs/license_files/license_in_headers => usr/src/pkg/license_files/license_in_headers
rename : usr/src/uts/intel/os/solaris.xpm.gz => usr/src/uts/intel/os/solaris.xpm

2 files changed, 24 insertions, 13 deletions

diff --git a/usr/src/cmd/ksh/Makefile b/usr/src/cmd/ksh/Makefile
index ae658a020c..bc4e80bd43 100644
--- a/usr/src/cmd/ksh/Makefile
+++ b/usr/src/cmd/ksh/Makefile
@@ -20,19 +20,16 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 SHELL=/usr/bin/ksh93
 
-include ../../Makefile.ksh93switch
+PROG= ksh
 
-$(BINKSH_IS_KSH93)PROG= ksh
-$(BINKSH_IS_KSH93)USRKSH_ALIAS_LIST=ksh ksh93 rksh rksh93 pfksh pfksh93 pfrksh pfrksh93
+USRKSH_ALIAS_LIST=ksh ksh93 rksh rksh93 pfksh pfksh93 pfrksh pfrksh93
 
-$(BINKSH_ISNOT_KSH93)PROG= ksh93
-$(BINKSH_ISNOT_KSH93)USRKSH_ALIAS_LIST=ksh93 rksh93
 
 include ../Makefile.cmd
 
@@ -41,6 +38,10 @@ $(BUILD64)SUBDIRS += $(MACH64)
 
 SUBDIRS += builtins
 
+ARCH32_i386= i86
+ARCH32_sparc= sparcv7
+ARCH32= $(ARCH32_$(MACH))
+
 # Serialise the build to avoid that we run the test suite for 32bit
 # and 64bit in parallel
 .NO_PARALLEL: $(SUBDIRS)
@@ -75,6 +76,20 @@ install:	$(ISAEXEC) $(SUBDIRS)
 		ln "$(ROOTBIN)/$(PROG)" "$(ROOTBIN)/$$i" ; \
 	done \
 	)
+	$(RM) $(ROOTSBIN)/sh
+	$(SYMLINK) ../usr/bin/$(ARCH32)/ksh93 $(ROOTSBIN)/sh
+	$(RM) $(ROOTSBIN)/jsh
+	$(SYMLINK) ../usr/bin/ksh93 $(ROOTSBIN)/jsh
+	$(RM) $(ROOTBIN)/jsh
+	$(SYMLINK) ksh93 $(ROOTBIN)/jsh
+	$(RM) $(ROOTSBIN)/pfsh
+	$(SYMLINK) ../usr/bin/ksh93 $(ROOTSBIN)/pfsh
+	$(RM) $(ROOTBIN)/pfsh
+	$(SYMLINK) ksh93 $(ROOTBIN)/pfsh
+	$(RM) $(ROOTBIN)/sh
+	$(SYMLINK) $(ARCH32)/ksh93 $(ROOTBIN)/sh
+	$(RM) $(ROOTLIB)/rsh
+	$(SYMLINK) ../bin/ksh93 $(ROOTLIB)/rsh
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/cmd/ksh/Makefile.com b/usr/src/cmd/ksh/Makefile.com
index ed56ccd85b..519ce850fd 100644
--- a/usr/src/cmd/ksh/Makefile.com
+++ b/usr/src/cmd/ksh/Makefile.com
@@ -20,19 +20,15 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 SHELL=/usr/bin/ksh93
 
-include ../../../Makefile.ksh93switch
+PROG= ksh
 
-$(BINKSH_IS_KSH93)PROG= ksh
-$(BINKSH_IS_KSH93)USRKSH_ALIAS_LIST=ksh ksh93 rksh rksh93 pfksh pfksh93 pfrksh pfrksh93
-
-$(BINKSH_ISNOT_KSH93)PROG= ksh93
-$(BINKSH_ISNOT_KSH93)USRKSH_ALIAS_LIST=ksh93 rksh93
+USRKSH_ALIAS_LIST=ksh ksh93 rksh rksh93 pfksh pfksh93 pfrksh pfrksh93
 
 OBJECTS= \
 	pmain.o