Merge remote-tracking branch 'illumos-ml/master' into titanic

Some zev merge conflicts fixed.

Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c

3600 edit(1) is a bad .so reference
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by:

3600 edit(1) is a bad .so reference
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>

show more ...

243 system manual pages should live with the software
Reviewed by: garrett@nexenta.com
Reviewed by: gwr@nexenta.com
Reviewed by: trisk@opensolaris.org
Approved by: gwr@nexenta.com

--HG--
extra : reb

243 system manual pages should live with the software
Reviewed by: garrett@nexenta.com
Reviewed by: gwr@nexenta.com
Reviewed by: trisk@opensolaris.org
Approved by: gwr@nexenta.com

--HG--
extra : rebase_source : 0c599d0bec0dc8865fbba67721a7a6cd6b1feefb

show more ...

merge with onnv_147
Reviewed by: garrett@nexenta.com
Approved by: garrett@nexenta.com

6966711 ON packages need to use the correct VENDOR string

6932709 libc mountpoints shouldn't be tagged with preserve=
6948967 opensolaris.zone= persists in ON manifests, should be expunged
6948970 eval in pkg/Makefile masks pkgmogrify failures
6949340 Fix v

6932709 libc mountpoints shouldn't be tagged with preserve=
6948967 opensolaris.zone= persists in ON manifests, should be expunged
6948970 eval in pkg/Makefile masks pkgmogrify failures
6949340 Fix various zones related packaging oddities
6951274 most variant.opensolaris.zone and reboot-needed attributes could be added by rules
6954463 legacy, renamed SUNWiscsitgt and SUNWmms need to be obsoleted properly
6954897 README.pkg should be more helpful describing need for on-extra

show more ...

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

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

show more ...