summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
Diffstat (limited to 'usr')
-rw-r--r--usr/src/Makefile2
-rw-r--r--usr/src/Makefile.master25
-rw-r--r--usr/src/Makefile.psm4
-rw-r--r--usr/src/Makefile.psm.targ22
-rw-r--r--usr/src/Targetdirs17
-rw-r--r--usr/src/cmd/Adm/Makefile10
-rw-r--r--usr/src/cmd/Adm/sun/Makefile8
-rw-r--r--usr/src/cmd/Makefile.cmd8
-rw-r--r--usr/src/cmd/Makefile.targ6
-rw-r--r--usr/src/cmd/abi/appcert/etc/Makefile13
-rw-r--r--usr/src/cmd/acct/Makefile16
-rw-r--r--usr/src/cmd/acctadm/Makefile2
-rw-r--r--usr/src/cmd/agents/Makefile5
-rw-r--r--usr/src/cmd/agents/snmp/mib/Makefile6
-rw-r--r--usr/src/cmd/agents/snmp/snmprelayd/Makefile1
-rw-r--r--usr/src/cmd/allocate/Makefile6
-rw-r--r--usr/src/cmd/audit_warn/Makefile13
-rw-r--r--usr/src/cmd/avs/dscfg/etc/Makefile4
-rw-r--r--usr/src/cmd/avs/dsw/etc/Makefile2
-rw-r--r--usr/src/cmd/avs/rdc/etc/Makefile2
-rw-r--r--usr/src/cmd/avs/sdbc/etc/Makefile4
-rw-r--r--usr/src/cmd/avs/sv/etc/Makefile2
-rw-r--r--usr/src/cmd/avs/svc/Makefile2
-rw-r--r--usr/src/cmd/backup/Makefile.backup30
-rw-r--r--usr/src/cmd/backup/dump/Makefile9
-rw-r--r--usr/src/cmd/backup/restore/Makefile5
-rw-r--r--usr/src/cmd/bnu/Makefile14
-rw-r--r--usr/src/cmd/boot/Makefile.com8
-rw-r--r--usr/src/cmd/bsmconv/Makefile11
-rw-r--r--usr/src/cmd/bsmunconv/Makefile11
-rw-r--r--usr/src/cmd/cmd-crypto/etc/Makefile13
-rw-r--r--usr/src/cmd/cmd-crypto/kmfcfg/Makefile8
-rw-r--r--usr/src/cmd/cmd-inet/etc/Makefile2
-rw-r--r--usr/src/cmd/cmd-inet/etc/dhcp/Makefile6
-rw-r--r--usr/src/cmd/cmd-inet/etc/ike/Makefile14
-rw-r--r--usr/src/cmd/cmd-inet/etc/init.d/Makefile7
-rw-r--r--usr/src/cmd/cmd-inet/etc/nca/Makefile11
-rw-r--r--usr/src/cmd/cmd-inet/etc/ppp/Makefile3
-rw-r--r--usr/src/cmd/cmd-inet/etc/secret/Makefile14
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/Makefile3
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile3
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile14
-rw-r--r--usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile5
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile1
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile16
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile10
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile6
-rw-r--r--usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile5
-rw-r--r--usr/src/cmd/consadm/Makefile.com12
-rw-r--r--usr/src/cmd/cron/Makefile17
-rw-r--r--usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile11
-rw-r--r--usr/src/cmd/cvcd/sparc/sun4u/starfire/Makefile11
-rw-r--r--usr/src/cmd/dcs/sparc/sun4u/Makefile6
-rw-r--r--usr/src/cmd/devfsadm/Makefile9
-rw-r--r--usr/src/cmd/devfsadm/Makefile.com2
-rw-r--r--usr/src/cmd/device_remap/Makefile3
-rw-r--r--usr/src/cmd/devmgmt/data/Makefile16
-rw-r--r--usr/src/cmd/dispadmin/Makefile6
-rw-r--r--usr/src/cmd/dladm/Makefile5
-rw-r--r--usr/src/cmd/dlmgmtd/Makefile4
-rw-r--r--usr/src/cmd/dodatadm/Makefile4
-rw-r--r--usr/src/cmd/dtrace/Makefile.com5
-rw-r--r--usr/src/cmd/dtrace/demo/Makefile6
-rw-r--r--usr/src/cmd/dumpadm/Makefile5
-rw-r--r--usr/src/cmd/eeprom/Makefile.com8
-rw-r--r--usr/src/cmd/fcoesvc/Makefile2
-rw-r--r--usr/src/cmd/fdformat/Makefile10
-rw-r--r--usr/src/cmd/filesync/Makefile11
-rw-r--r--usr/src/cmd/flowadm/Makefile2
-rw-r--r--usr/src/cmd/fmthard/Makefile12
-rw-r--r--usr/src/cmd/format/Makefile2
-rw-r--r--usr/src/cmd/fruadm/Makefile11
-rw-r--r--usr/src/cmd/fs.d/Makefile7
-rw-r--r--usr/src/cmd/fs.d/Makefile.fstype12
-rw-r--r--usr/src/cmd/fs.d/autofs/Makefile3
-rw-r--r--usr/src/cmd/fs.d/nfs/etc/Makefile15
-rw-r--r--usr/src/cmd/fs.d/nfs/nfsfind/Makefile14
-rw-r--r--usr/src/cmd/fs.d/nfs/nfsstat/Makefile5
-rw-r--r--usr/src/cmd/fs.d/nfs/share/Makefile10
-rw-r--r--usr/src/cmd/fs.d/ufs/quota/Makefile4
-rw-r--r--usr/src/cmd/fs.d/ufs/quotaon/Makefile14
-rw-r--r--usr/src/cmd/getdevpolicy/Makefile11
-rw-r--r--usr/src/cmd/getmajor/Makefile13
-rw-r--r--usr/src/cmd/gss/etc/Makefile15
-rw-r--r--usr/src/cmd/gss/gsscred/Makefile12
-rw-r--r--usr/src/cmd/gss/gsscred_clean/Makefile19
-rw-r--r--usr/src/cmd/gss/gssd/Makefile3
-rw-r--r--usr/src/cmd/hal/Makefile6
-rw-r--r--usr/src/cmd/hal/fdi/Makefile7
-rw-r--r--usr/src/cmd/halt/Makefile1
-rw-r--r--usr/src/cmd/hwdata/Makefile5
-rw-r--r--usr/src/cmd/idmap/idmap/Makefile1
-rw-r--r--usr/src/cmd/idmap/idmapd/Makefile2
-rw-r--r--usr/src/cmd/init/Makefile7
-rw-r--r--usr/src/cmd/initpkg/Makefile13
-rw-r--r--usr/src/cmd/initpkg/init.d/Makefile6
-rw-r--r--usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh7
-rw-r--r--usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh7
-rw-r--r--usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh7
-rw-r--r--usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh6
-rw-r--r--usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh7
-rw-r--r--usr/src/cmd/intrd/Makefile5
-rw-r--r--usr/src/cmd/intrstat/Makefile.com5
-rw-r--r--usr/src/cmd/ipf/etc/Makefile6
-rw-r--r--usr/src/cmd/ipf/examples/Makefile2
-rw-r--r--usr/src/cmd/ipf/tools/Makefile3
-rw-r--r--usr/src/cmd/isalist/Makefile14
-rw-r--r--usr/src/cmd/iscsi/iscsitadm/Makefile5
-rw-r--r--usr/src/cmd/iscsi/iscsitgtd/Makefile6
-rw-r--r--usr/src/cmd/iscsi/iscsitgtd/Makefile.com6
-rw-r--r--usr/src/cmd/iscsiadm/Makefile3
-rw-r--r--usr/src/cmd/iscsid/Makefile2
-rw-r--r--usr/src/cmd/iscsitsvc/Makefile4
-rw-r--r--usr/src/cmd/isns/isnsd/Makefile2
-rw-r--r--usr/src/cmd/java/Makefile11
-rw-r--r--usr/src/cmd/keyserv/Makefile13
-rw-r--r--usr/src/cmd/ksh/Makefile.com3
-rw-r--r--usr/src/cmd/ksh/builtins/Makefile3
-rw-r--r--usr/src/cmd/last/Makefile15
-rw-r--r--usr/src/cmd/lastcomm/Makefile10
-rw-r--r--usr/src/cmd/ldap/Makefile.com6
-rw-r--r--usr/src/cmd/ldapcachemgr/Makefile6
-rw-r--r--usr/src/cmd/lgrpinfo/Makefile7
-rw-r--r--usr/src/cmd/listen/Makefile10
-rw-r--r--usr/src/cmd/lockstat/Makefile.com5
-rw-r--r--usr/src/cmd/logadm/Makefile11
-rw-r--r--usr/src/cmd/login/Makefile6
-rw-r--r--usr/src/cmd/lp/Makefile6
-rw-r--r--usr/src/cmd/lp/Makefile.lp11
-rw-r--r--usr/src/cmd/lp/cmd/Makefile8
-rw-r--r--usr/src/cmd/lp/crontab/Makefile13
-rw-r--r--usr/src/cmd/lp/filter/postscript/font/devpost/charlib/Makefile13
-rw-r--r--usr/src/cmd/lp/model/netpr/Makefile7
-rw-r--r--usr/src/cmd/lp/terminfo/Makefile15
-rw-r--r--usr/src/cmd/lvm/etc/Makefile24
-rw-r--r--usr/src/cmd/lvm/metassist/Makefile.targ8
-rw-r--r--usr/src/cmd/mail/Makefile5
-rw-r--r--usr/src/cmd/mailx/Makefile5
-rw-r--r--usr/src/cmd/man/src/Makefile13
-rw-r--r--usr/src/cmd/man/src/util/Makefile11
-rw-r--r--usr/src/cmd/man/src/util/solbookv2/Makefile7
-rw-r--r--usr/src/cmd/mdb/Makefile.kmdb3
-rw-r--r--usr/src/cmd/mdb/Makefile.module5
-rw-r--r--usr/src/cmd/mdb/demo/Makefile14
-rw-r--r--usr/src/cmd/mkmsgs/Makefile13
-rw-r--r--usr/src/cmd/modload/Makefile11
-rw-r--r--usr/src/cmd/mvdir/Makefile12
-rw-r--r--usr/src/cmd/netadm/Makefile7
-rw-r--r--usr/src/cmd/netadm/etc/Makefile11
-rw-r--r--usr/src/cmd/netfiles/Makefile4
-rw-r--r--usr/src/cmd/newgrp/Makefile12
-rw-r--r--usr/src/cmd/news/Makefile19
-rw-r--r--usr/src/cmd/newtask/Makefile.com10
-rw-r--r--usr/src/cmd/nlsadmin/Makefile13
-rw-r--r--usr/src/cmd/nsadmin/Makefile5
-rw-r--r--usr/src/cmd/nscd/Makefile5
-rw-r--r--usr/src/cmd/oamuser/group/Makefile12
-rw-r--r--usr/src/cmd/oamuser/user/Makefile9
-rw-r--r--usr/src/cmd/oplhpd/Makefile5
-rw-r--r--usr/src/cmd/passmgmt/Makefile12
-rw-r--r--usr/src/cmd/passwd/Makefile11
-rw-r--r--usr/src/cmd/pbind/Makefile.com11
-rw-r--r--usr/src/cmd/pcmciad/Makefile11
-rw-r--r--usr/src/cmd/perl/5.8.4/distrib/Makefile3
-rw-r--r--usr/src/cmd/pgrep/Makefile5
-rw-r--r--usr/src/cmd/picl/picld/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/Makefile.com16
-rw-r--r--usr/src/cmd/picl/plugins/common/piclevent/Makefile20
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/blade/bsc/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/blade/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/blade/fruaccess/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/blade/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/blade/frutree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile10
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile13
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile13
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile10
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile10
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/envmon/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile16
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/frudata/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile16
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile13
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile19
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile13
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/schumacher/frutree/Makefile13
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile8
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile7
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile8
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/conf/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/envmond/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/frutree/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/lib/libctsmc/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/snowbird/watchdog/Makefile6
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile11
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile12
-rw-r--r--usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile14
-rw-r--r--usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile6
-rw-r--r--usr/src/cmd/picl/prtpicl/Makefile11
-rw-r--r--usr/src/cmd/pools/poold/Makefile11
-rw-r--r--usr/src/cmd/power/Makefile6
-rw-r--r--usr/src/cmd/powertop/Makefile.com1
-rw-r--r--usr/src/cmd/print/Makefile.sp21
-rw-r--r--usr/src/cmd/print/bsd-sysv-commands/Makefile1
-rw-r--r--usr/src/cmd/print/conv_fix/Makefile12
-rw-r--r--usr/src/cmd/print/lpget/Makefile12
-rw-r--r--usr/src/cmd/print/lpset/Makefile5
-rw-r--r--usr/src/cmd/print/ppdmgr/Makefile5
-rw-r--r--usr/src/cmd/print/printer-info/Makefile13
-rw-r--r--usr/src/cmd/print/printmgr/Makefile4
-rw-r--r--usr/src/cmd/print/printmgr/bin/Makefile15
-rw-r--r--usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile6
-rw-r--r--usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile6
-rw-r--r--usr/src/cmd/print/scripts/Makefile12
-rw-r--r--usr/src/cmd/print/selector/Makefile1
-rw-r--r--usr/src/cmd/priocntl/Makefile13
-rw-r--r--usr/src/cmd/projadd/Makefile6
-rw-r--r--usr/src/cmd/prstat/Makefile.com5
-rw-r--r--usr/src/cmd/prtconf/Makefile12
-rw-r--r--usr/src/cmd/prtconf/Makefile.com11
-rw-r--r--usr/src/cmd/prtdiag/Makefile.com5
-rw-r--r--usr/src/cmd/prtdscp/sparc/sun4u/Makefile7
-rw-r--r--usr/src/cmd/prtfru/Makefile6
-rw-r--r--usr/src/cmd/prtvtoc/Makefile12
-rw-r--r--usr/src/cmd/psradm/Makefile15
-rw-r--r--usr/src/cmd/psrinfo/Makefile8
-rw-r--r--usr/src/cmd/psrset/Makefile.com11
-rw-r--r--usr/src/cmd/ptools/Makefile.bld3
-rw-r--r--usr/src/cmd/pwconv/Makefile13
-rw-r--r--usr/src/cmd/rcap/rcapd/Makefile11
-rw-r--r--usr/src/cmd/rcm_daemon/Makefile.com2
-rw-r--r--usr/src/cmd/rctladm/Makefile10
-rw-r--r--usr/src/cmd/rpcsvc/Makefile7
-rw-r--r--usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile11
-rw-r--r--usr/src/cmd/rpld/Makefile11
-rw-r--r--usr/src/cmd/sa/Makefile10
-rw-r--r--usr/src/cmd/saf/Makefile6
-rw-r--r--usr/src/cmd/scadm/Makefile10
-rw-r--r--usr/src/cmd/scadm/Makefile.com6
-rw-r--r--usr/src/cmd/sckmd/sparc/sun4u/Makefile7
-rw-r--r--usr/src/cmd/script/Makefile12
-rw-r--r--usr/src/cmd/sdpadm/Makefile2
-rw-r--r--usr/src/cmd/sendmail/Makefile7
-rw-r--r--usr/src/cmd/sendmail/cf/Makefile7
-rw-r--r--usr/src/cmd/sendmail/lib/Makefile1
-rw-r--r--usr/src/cmd/sendmail/src/Makefile2
-rw-r--r--usr/src/cmd/setpgrp/Makefile14
-rw-r--r--usr/src/cmd/sf880drd/Makefile9
-rw-r--r--usr/src/cmd/sgs/librtld_db/rdb_demo/Makefile12
-rw-r--r--usr/src/cmd/sgs/link_audit/Makefile7
-rw-r--r--usr/src/cmd/sgs/link_audit/Makefile.com2
-rw-r--r--usr/src/cmd/sgs/rtld/mdbmod/Makefile.com5
-rw-r--r--usr/src/cmd/sh/Makefile5
-rw-r--r--usr/src/cmd/shcomp/Makefile3
-rw-r--r--usr/src/cmd/smbios/Makefile9
-rw-r--r--usr/src/cmd/srptsvc/Makefile2
-rw-r--r--usr/src/cmd/ssh/etc/Makefile2
-rw-r--r--usr/src/cmd/stat/fsstat/Makefile5
-rw-r--r--usr/src/cmd/stat/iostat/Makefile7
-rw-r--r--usr/src/cmd/stat/mpstat/Makefile7
-rw-r--r--usr/src/cmd/stat/vmstat/Makefile7
-rw-r--r--usr/src/cmd/stmfsvc/Makefile4
-rw-r--r--usr/src/cmd/streams/Makefile14
-rw-r--r--usr/src/cmd/streams/log/Makefile12
-rw-r--r--usr/src/cmd/streams/strcmd/Makefile7
-rw-r--r--usr/src/cmd/su/Makefile6
-rw-r--r--usr/src/cmd/sulogin/Makefile5
-rw-r--r--usr/src/cmd/svc/Makefile2
-rw-r--r--usr/src/cmd/svc/configd/Makefile6
-rw-r--r--usr/src/cmd/svc/milestone/Makefile2
-rw-r--r--usr/src/cmd/svc/profile/Makefile5
-rw-r--r--usr/src/cmd/svc/seed/Makefile4
-rw-r--r--usr/src/cmd/svc/shell/Makefile2
-rw-r--r--usr/src/cmd/svc/startd/Makefile2
-rw-r--r--usr/src/cmd/swap/Makefile.com10
-rw-r--r--usr/src/cmd/sysdef/Makefile12
-rw-r--r--usr/src/cmd/sysdef/Makefile.com11
-rw-r--r--usr/src/cmd/syseventadm/Makefile12
-rw-r--r--usr/src/cmd/syseventd/Makefile.com31
-rw-r--r--usr/src/cmd/syslogd/Makefile.com7
-rw-r--r--usr/src/cmd/tcpd/Makefile6
-rw-r--r--usr/src/cmd/terminfo/Makefile9
-rw-r--r--usr/src/cmd/th_tools/Makefile9
-rw-r--r--usr/src/cmd/tip/Makefile10
-rw-r--r--usr/src/cmd/trapstat/sun4u/Makefile5
-rw-r--r--usr/src/cmd/trapstat/sun4v/Makefile5
-rw-r--r--usr/src/cmd/tsol/Makefile.targ8
-rw-r--r--usr/src/cmd/tsol/demo/Makefile8
-rw-r--r--usr/src/cmd/tsol/tsol-zones/Makefile5
-rw-r--r--usr/src/cmd/tsol/zones/Makefile6
-rw-r--r--usr/src/cmd/ttymon/Makefile6
-rw-r--r--usr/src/cmd/uadmin/Makefile3
-rw-r--r--usr/src/cmd/ucodeadm/Makefile2
-rw-r--r--usr/src/cmd/unlink/Makefile12
-rw-r--r--usr/src/cmd/utmp_update/Makefile13
-rw-r--r--usr/src/cmd/utmpd/Makefile6
-rw-r--r--usr/src/cmd/vi/Makefile15
-rw-r--r--usr/src/cmd/w/amd64/Makefile11
-rw-r--r--usr/src/cmd/w/i386/Makefile12
-rw-r--r--usr/src/cmd/w/sparcv9/Makefile5
-rw-r--r--usr/src/cmd/wall/Makefile12
-rw-r--r--usr/src/cmd/wbem/Makefile.cmd14
-rw-r--r--usr/src/cmd/wbem/Makefile.com13
-rw-r--r--usr/src/cmd/wbem/provider/c/mof/Makefile11
-rw-r--r--usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile14
-rw-r--r--usr/src/cmd/wbem/provider/tools/rds/Makefile.com5
-rw-r--r--usr/src/cmd/who/Makefile14
-rw-r--r--usr/src/cmd/whodo/amd64/Makefile10
-rw-r--r--usr/src/cmd/whodo/i386/Makefile11
-rw-r--r--usr/src/cmd/whodo/sparcv9/Makefile3
-rw-r--r--usr/src/cmd/write/Makefile11
-rw-r--r--usr/src/cmd/ypcmd/Makefile8
-rw-r--r--usr/src/cmd/ypcmd/yp2lscripts/Makefile11
-rw-r--r--usr/src/cmd/ypcmd/yppasswd/Makefile6
-rw-r--r--usr/src/cmd/ypcmd/ypupdated/Makefile5
-rw-r--r--usr/src/cmd/zic/Makefile6
-rw-r--r--usr/src/cmd/zlogin/Makefile4
-rw-r--r--usr/src/common/mapfiles/amd64/Makefile6
-rw-r--r--usr/src/common/mapfiles/common/Makefile6
-rw-r--r--usr/src/common/mapfiles/i386/Makefile6
-rw-r--r--usr/src/common/mapfiles/sparc/Makefile6
-rw-r--r--usr/src/common/mapfiles/sparcv9/Makefile6
-rw-r--r--usr/src/lib/Makefile.lib4
-rw-r--r--usr/src/lib/brand/Makefile.brand14
-rw-r--r--usr/src/lib/brand/lx/zone/distros/Makefile6
-rw-r--r--usr/src/lib/brand/native/zone/Makefile2
-rw-r--r--usr/src/lib/cfgadm_plugins/Makefile.com6
-rw-r--r--usr/src/lib/cfgadm_plugins/ac/Makefile.com6
-rw-r--r--usr/src/lib/cfgadm_plugins/pci/Makefile.com6
-rw-r--r--usr/src/lib/cfgadm_plugins/sbd/Makefile.com6
-rw-r--r--usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com6
-rw-r--r--usr/src/lib/efcode/etc/Makefile15
-rw-r--r--usr/src/lib/gss_mechs/mech_krb5/Makefile.com1
-rw-r--r--usr/src/lib/hbaapi/Makefile.com4
-rw-r--r--usr/src/lib/libbrand/Makefile5
-rw-r--r--usr/src/lib/libbsm/Makefile14
-rw-r--r--usr/src/lib/libc/i386/etc/Makefile20
-rw-r--r--usr/src/lib/libc_psr/etc/Makefile20
-rw-r--r--usr/src/lib/libc_psr/sun4u-opl/Makefile8
-rw-r--r--usr/src/lib/libc_psr/sun4u-us3/Makefile8
-rw-r--r--usr/src/lib/libc_psr/sun4u/sparc/Makefile6
-rw-r--r--usr/src/lib/libc_psr/sun4u/sparcv9/Makefile4
-rw-r--r--usr/src/lib/libdtrace/Makefile6
-rw-r--r--usr/src/lib/libexacct/demo/Makefile13
-rw-r--r--usr/src/lib/libima/Makefile.com2
-rw-r--r--usr/src/lib/libmd/Makefile.com8
-rw-r--r--usr/src/lib/libpam/Makefile5
-rw-r--r--usr/src/lib/libpcp/Makefile.com10
-rw-r--r--usr/src/lib/libpcp/sparc/Makefile5
-rw-r--r--usr/src/lib/libpool/Makefile6
-rw-r--r--usr/src/lib/libprtdiag_psr/sparc/Makefile.com6
-rw-r--r--usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile6
-rw-r--r--usr/src/lib/libresolv2/Makefile4
-rw-r--r--usr/src/lib/librsc/Makefile.com12
-rw-r--r--usr/src/lib/libsecdb/Makefile8
-rw-r--r--usr/src/lib/libsecdb/help/auths/Makefile4
-rw-r--r--usr/src/lib/libsecdb/help/profiles/Makefile2
-rw-r--r--usr/src/lib/libslp/etc/Makefile13
-rw-r--r--usr/src/lib/libslp/javalib/Makefile.conf17
-rw-r--r--usr/src/lib/libtsalarm/Makefile.com10
-rw-r--r--usr/src/lib/libtsalarm/sparc/Makefile6
-rw-r--r--usr/src/lib/libwrap/Makefile.com6
-rw-r--r--usr/src/lib/libzonecfg/Makefile6
-rw-r--r--usr/src/lib/mpapi/libmpapi/Makefile.com4
-rw-r--r--usr/src/lib/pkcs11/libsoftcrypto/Makefile.com5
-rw-r--r--usr/src/lib/print/libpapi-lpd/Makefile.com5
-rw-r--r--usr/src/lib/print/mod_ipp/Makefile8
-rw-r--r--usr/src/pkgdefs/SUNW0on/Makefile22
-rw-r--r--usr/src/psm/stand/boot/Makefile.boot6
-rw-r--r--usr/src/psm/stand/bootblks/Makefile.com2
-rw-r--r--usr/src/psm/stand/bootblks/hsfs/Makefile.hsfs6
-rw-r--r--usr/src/psm/stand/bootblks/ufs/Makefile.ufs5
-rw-r--r--usr/src/psm/stand/bootblks/ufs/sparc/Makefile6
-rw-r--r--usr/src/psm/stand/bootlst/common/Makefile.com7
-rw-r--r--usr/src/psm/stand/cpr/common/Makefile.com2
-rw-r--r--usr/src/tools/bfuld/Makefile12
-rw-r--r--usr/src/tools/codesign/Makefile6
-rw-r--r--usr/src/tools/ctf/dump/Makefile.com11
-rw-r--r--usr/src/tools/ctf/stabs/Makefile.com12
-rw-r--r--usr/src/tools/depcheck/Makefile2
-rw-r--r--usr/src/tools/elfsign/Makefile2
-rw-r--r--usr/src/tools/env/Makefile12
-rw-r--r--usr/src/tools/fastfs/Makefile12
-rw-r--r--usr/src/tools/gk/Makefile10
-rw-r--r--usr/src/tools/install.bin/Makefile12
-rw-r--r--usr/src/tools/ndrgen/Makefile6
-rw-r--r--usr/src/tools/pmodes/Makefile14
-rw-r--r--usr/src/tools/protolist/Makefile12
-rw-r--r--usr/src/tools/scripts/Makefile2
-rw-r--r--usr/src/tools/stabs/sparc/Makefile11
-rw-r--r--usr/src/tools/tokenize/Makefile7
-rw-r--r--usr/src/uts/Makefile.uts27
-rw-r--r--usr/src/uts/common/sys/Makefile1
-rw-r--r--usr/src/uts/i86pc/sys/Makefile7
-rw-r--r--usr/src/uts/i86pc/vm/Makefile7
-rw-r--r--usr/src/uts/i86xpv/sys/Makefile6
-rw-r--r--usr/src/uts/i86xpv/vm/Makefile6
-rw-r--r--usr/src/uts/intel/config/Makefile12
-rw-r--r--usr/src/uts/sparc/config/Makefile12
-rw-r--r--usr/src/uts/sun4u/blade/Makefile12
-rw-r--r--usr/src/uts/sun4u/boston/Makefile.targ10
-rw-r--r--usr/src/uts/sun4u/cheetah/Makefile6
-rw-r--r--usr/src/uts/sun4u/cheetahplus/Makefile6
-rw-r--r--usr/src/uts/sun4u/cherrystone/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/daktari/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/excalibur/sys/Makefile7
-rw-r--r--usr/src/uts/sun4u/hummingbird/Makefile4
-rw-r--r--usr/src/uts/sun4u/jalapeno/Makefile6
-rw-r--r--usr/src/uts/sun4u/lw2plus/Makefile6
-rw-r--r--usr/src/uts/sun4u/lw8/Makefile10
-rw-r--r--usr/src/uts/sun4u/lw8/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/makaha/Makefile8
-rw-r--r--usr/src/uts/sun4u/montecarlo/Makefile9
-rw-r--r--usr/src/uts/sun4u/montecarlo/sys/Makefile5
-rw-r--r--usr/src/uts/sun4u/mpxu/Makefile.targ.shared10
-rw-r--r--usr/src/uts/sun4u/mpxu/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/ngdr/sys/Makefile7
-rw-r--r--usr/src/uts/sun4u/opl/Makefile.targ.shared10
-rw-r--r--usr/src/uts/sun4u/opl/olympus_c/Makefile6
-rw-r--r--usr/src/uts/sun4u/opl/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/schumacher/Makefile.targ10
-rw-r--r--usr/src/uts/sun4u/seattle/Makefile.targ10
-rw-r--r--usr/src/uts/sun4u/serengeti/cheetah/Makefile6
-rw-r--r--usr/src/uts/sun4u/serengeti/cheetahplus/Makefile6
-rw-r--r--usr/src/uts/sun4u/serengeti/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/serrano/Makefile6
-rw-r--r--usr/src/uts/sun4u/snowbird/Makefile.targ10
-rw-r--r--usr/src/uts/sun4u/snowbird/sys/Makefile10
-rw-r--r--usr/src/uts/sun4u/spitfire/Makefile4
-rw-r--r--usr/src/uts/sun4u/starcat/cheetah/Makefile6
-rw-r--r--usr/src/uts/sun4u/starcat/cheetahplus/Makefile6
-rw-r--r--usr/src/uts/sun4u/starcat/sys/Makefile7
-rw-r--r--usr/src/uts/sun4u/starfire/spitfire/Makefile6
-rw-r--r--usr/src/uts/sun4u/starfire/sys/Makefile6
-rw-r--r--usr/src/uts/sun4u/sunfire/sys/Makefile5
-rw-r--r--usr/src/uts/sun4u/sys/Makefile8
-rw-r--r--usr/src/uts/sun4u/vm/Makefile12
-rw-r--r--usr/src/uts/sun4v/generic/Makefile6
-rw-r--r--usr/src/uts/sun4v/montoya/Makefile.targ7
-rw-r--r--usr/src/uts/sun4v/sys/Makefile5
-rw-r--r--usr/src/uts/sun4v/vm/Makefile12
496 files changed, 979 insertions, 3274 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 5a8cb06f22..ad08817337 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -175,8 +175,6 @@ bldtools: closedbins sgs
#
rootdirs: $(ROOTDIRS)
$(INS) -d -m 775 $(ROOT)/var/mail/:saved
- $(CH)$(CHOWN) root $(ROOT)/var/mail/:saved
- $(CH)$(CHGRP) mail $(ROOT)/var/mail/:saved
lint: FRC
$(MAKE) -f Makefile.lint
diff --git a/usr/src/Makefile.master b/usr/src/Makefile.master
index 7dedd59326..58f7f0e1b1 100644
--- a/usr/src/Makefile.master
+++ b/usr/src/Makefile.master
@@ -28,20 +28,9 @@
#
ROOT= /proto
-# Historically, ON builds were always done with root permissions, and the
-# owner/group information was duplicated in the Makefiles and the packaging
-# data and kept in sync by manual intervention. This is no longer true.
-# The only source of this information is packaging. The proto area ($ROOT)
-# does not have definitive onwer/group information, and no Makefile should
-# attempt to set this. CH once toggled operations restricted to root. It
-# is now just set to `#'.
#
-# At some point in the future, CH, CHOWN, CHGRP, OWNER, and GROUP should all
-# be stripped completely from the source base. They are kept for now until
-# on10-based projects can merge and transition away from them.
-#
-# RELEASE_BUILD should be cleared for final release builds. This is completely
-# independent of CH. NOT_RELEASE_BUILD is exactly what the name implies.
+# RELEASE_BUILD should be cleared for final release builds.
+# NOT_RELEASE_BUILD is exactly what the name implies.
#
# INTERNAL_RELEASE_BUILD is a subset of RELEASE_BUILD. It mostly controls
# identification strings. Enabling RELEASE_BUILD automatically enables
@@ -71,7 +60,6 @@ ROOT= /proto
# cause a noticable slowdown in build times.
#
POUND_SIGN:sh= echo \\043
-CH= $(POUND_SIGN)
NOT_RELEASE_BUILD=
INTERNAL_RELEASE_BUILD= $(POUND_SIGN)
@@ -137,8 +125,6 @@ TRUE= true
SYMLINK= /usr/bin/ln -s
LN= /usr/bin/ln
CHMOD= /usr/bin/chmod
-CHOWN= $(TRUE)
-CHGRP= $(TRUE)
MV= /usr/bin/mv -f
RM= /usr/bin/rm -f
CUT= /usr/bin/cut
@@ -187,13 +173,6 @@ UNIQ= /usr/bin/uniq
FILEMODE= 644
DIRMODE= 755
-# Note: owner and group for proto area objects is no longer set by
-# Makefiles at all. These have no real effect and are kept here for
-# transition purposes. They (along with CH, CHOWN, and CHGRP) should be
-# removed early in the s11 development cycle.
-OWNER= root
-GROUP= bin
-
#
# The version of the patch makeup table optimized for build-time use. Used
# during patch builds only.
diff --git a/usr/src/Makefile.psm b/usr/src/Makefile.psm
index 839634463b..81a8cb3c17 100644
--- a/usr/src/Makefile.psm
+++ b/usr/src/Makefile.psm
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# usr/src/Makefile.psm
@@ -31,9 +31,7 @@
# the files in group bin used to be owned by user bin.
#
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) -u root -g bin $@
#
#
diff --git a/usr/src/Makefile.psm.targ b/usr/src/Makefile.psm.targ
index f571d1f6d8..dae5ab3a49 100644
--- a/usr/src/Makefile.psm.targ
+++ b/usr/src/Makefile.psm.targ
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile.psm.targ, global targets for platform specific modules
#
@@ -187,16 +185,16 @@ $(USR_PSM_LIB64_DIR)/%: % $(USR_PSM_LIB64_DIR)
$(INS.file)
$(USR_PSM_LIB_UFS_DIR)/%: % $(USR_PSM_LIB_UFS_DIR)
- $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@
$(USR_PSM_LIB_NFS_DIR)/%: % $(USR_PSM_LIB_NFS_DIR)
$(INS.file)
$(USR_PSM_LIB_HSFS_DIR)/%: % $(USR_PSM_LIB_HSFS_DIR)
- $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@
$(USR_PSM_LIB_ZFS_DIR)/%: % $(USR_PSM_LIB_ZFS_DIR)
- $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@ ; $(SYMLINK) $(BOOTBLK_LINK) $@
$(USR_PSM_MOD_DIR)/%: % $(USR_PSM_MOD_DIR)
$(INS.file)
@@ -244,19 +242,11 @@ $(LINKED_LIB_FS_DIRS): $(LINKED_LIB_DIRS)
-$(INS.slink6)
#
-# Set ownership on links.
-#
-CHOWNLINK=
-$(CH)CHOWNLINK= ; $(CHOWN) $(OWNER) $@
-CHGRPLINK=
-$(CH)CHGRPLINK= ; $(CHGRP) $(GROUP) $@
-
-#
#
#
$(ROOT_PSM_PROG_LINKS) $(USR_PSM_PROG_LINKS):
- $(RM) $@; $(SYMLINK) ../$(PLATFORM)/$(PROG) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) ../$(PLATFORM)/$(PROG) $@
$(ROOT_PSM_SBIN_PROG_LINKS) $(USR_PSM_SBIN_PROG_LINKS):
- $(RM) $@; $(SYMLINK) ../../$(PLATFORM)/sbin/$(PROG) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) ../../$(PLATFORM)/sbin/$(PROG) $@
diff --git a/usr/src/Targetdirs b/usr/src/Targetdirs
index dc9bb81fb0..f1d93c71f5 100644
--- a/usr/src/Targetdirs
+++ b/usr/src/Targetdirs
@@ -1,4 +1,3 @@
-#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
@@ -697,9 +696,7 @@ $(BUILD64) $(ROOT)/usr/ucblib/64:= LINKDEST=$(MACH64)
# a symlink.
#
$(SYMLINKS:%=$(ROOT)%):= \
- INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@; \
- $(CHOWN) $(OWNER) $@; $(CHGRP) $(GROUP) $@
-
+ INS.dir= -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
# Special symlinks to populate usr/ccs/lib, whose objects
# have actually been moved to usr/lib
@@ -867,12 +864,10 @@ SYM.USRCCSLIB64= \
$(SYM.USRCCSLIB:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \
- $(CHOWN) $(OWNER) $@; $(CHGRP) $(GROUP) $@
+ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
$(SYM.USRCCSLIB64:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \
- $(CHOWN) $(OWNER) $@; $(CHGRP) $(GROUP) $@
+ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
# Special symlinks to direct libraries that have been moved
# from /usr/lib to /lib in order to live in the root filesystem.
@@ -1904,10 +1899,8 @@ SYM.USRLIB64= \
/usr/lib/$(MACH64)/nss_user.so.1
$(SYM.USRLIB:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \
- $(CHOWN) $(OWNER) $@; $(CHGRP) $(GROUP) $@
+ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
$(SYM.USRLIB64:%=$(ROOT)%):= \
- INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@; \
- $(CHOWN) $(OWNER) $@; $(CHGRP) $(GROUP) $@
+ INS.dir= -$(RM) $@; $(SYMLINK) $(REALPATH) $@
diff --git a/usr/src/cmd/Adm/Makefile b/usr/src/cmd/Adm/Makefile
index 571fdc960b..ff765ae0c3 100644
--- a/usr/src/cmd/Adm/Makefile
+++ b/usr/src/cmd/Adm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
CRON_ENT= adm root sys
CRON_LIB= .proto at.deny cron.deny queuedefs
@@ -52,7 +49,6 @@ ETCSCRIPTS= $(ETC_SCRIPT:%=$(ROOTETC)/%)
ZISPECIALS= $(ETCZONESD)/index
FILEMODE= 0644
-GROUP= sys
$(CRONLIBD)/.proto := FILEMODE = 0744
$(CRONTABD)/adm := FILEMODE = 0600
diff --git a/usr/src/cmd/Adm/sun/Makefile b/usr/src/cmd/Adm/sun/Makefile
index 817aafbf61..53a093d33a 100644
--- a/usr/src/cmd/Adm/sun/Makefile
+++ b/usr/src/cmd/Adm/sun/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
ETCFILES= ioctl.syscon passwd shadow motd
KVMFILES= README
@@ -36,10 +34,8 @@ ROOTUSRKVMFILES= $(KVMFILES:%=$(ROOTUSRKVM)/%)
ROOTVARSMBFILES= $(SMBFILES:%=$(ROOTVARSMB)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= sys
-$(ROOTETC)/shadow := FILEMODE = 400
+$(ROOTETC)/shadow := FILEMODE = 400
$(ROOTVARSMB)/smbpasswd := FILEMODE = 0400
.KEEP_STATE:
diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index e2a2540997..9c1ca19b4b 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -160,16 +160,10 @@ ROOTUSRSBINPROG32= $(PROG:%=$(ROOTUSRSBIN32)/%)
ROOTUSRSBINPROG64= $(PROG:%=$(ROOTUSRSBIN64)/%)
ROOTMAN1FILES= $(MAN1FILES:%=$(ROOTMAN1)/%)
$(ROOTMAN1FILES) := FILEMODE= 444
-$(ROOTMAN1FILES) := OWNER= root
-$(ROOTMAN1FILES) := GROUP= bin
ROOTMAN1MFILES= $(MAN1MFILES:%=$(ROOTMAN1M)/%)
$(ROOTMAN1MFILES) := FILEMODE= 444
-$(ROOTMAN1MFILES) := OWNER= root
-$(ROOTMAN1MFILES) := GROUP= bin
ROOTMAN3FILES= $(MAN3FILES:%=$(ROOTMAN3)/%)
$(ROOTMAN3FILES) := FILEMODE= 444
-$(ROOTMAN3FILES) := OWNER= root
-$(ROOTMAN3FILES) := GROUP= bin
# Symlink rules for /usr/ccs/bin commands. Note, those commands under
# the rule of the linker area, are controlled by a different set of
@@ -185,8 +179,6 @@ INS.ccsbinlink64= \
ROOTETCDEFAULT= $(ROOTETC)/default
ROOTETCDEFAULTFILES= $(DEFAULTFILES:%.dfl=$(ROOTETCDEFAULT)/%)
-$(ROOTETCDEFAULTFILES) := OWNER = root
-$(ROOTETCDEFAULTFILES) := GROUP = sys
$(ROOTETCDEFAULTFILES) := FILEMODE = 0644
ROOTETCSECFILES= $(ETCSECFILES:%=$(ROOTETCSECURITY)/%)
diff --git a/usr/src/cmd/Makefile.targ b/usr/src/cmd/Makefile.targ
index 9413eee28a..0dcc692c78 100644
--- a/usr/src/cmd/Makefile.targ
+++ b/usr/src/cmd/Makefile.targ
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/Makefile.targ
@@ -30,11 +30,7 @@
# Conditional assignment of default group/owner/permissions for SMF
# manifests and method scripts.
#
-$(ROOTMANIFEST) := OWNER= root
-$(ROOTMANIFEST) := GROUP= sys
$(ROOTMANIFEST) := FILEMODE= 444
-$(ROOTSVCBIN) := OWNER= root
-$(ROOTSVCBIN) := GROUP= bin
$(ROOTSVCBIN) := FILEMODE= 544
clobber: clean
diff --git a/usr/src/cmd/abi/appcert/etc/Makefile b/usr/src/cmd/abi/appcert/etc/Makefile
index 493243180a..596d393b3b 100644
--- a/usr/src/cmd/abi/appcert/etc/Makefile
+++ b/usr/src/cmd/abi/appcert/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/abi/appcert/etc/Makefile
#
@@ -46,8 +43,6 @@ CLEANFILES= $(MESSAGES) $(ETC_FILES)
install := FILEMODE= 0444
install := DIRMODE= 0755
-install := OWNER= root
-install := GROUP= bin
all: $(ETC_FILES)
diff --git a/usr/src/cmd/acct/Makefile b/usr/src/cmd/acct/Makefile
index ca9bb05fdc..5ff39fa0d6 100644
--- a/usr/src/cmd/acct/Makefile
+++ b/usr/src/cmd/acct/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
PROG= acctcms acctcom acctcon acctcon1 acctcon2 \
acctdisk acctdusg acctmerg accton acctprc acctprc1 \
@@ -84,17 +82,9 @@ ETCACCTPROG= $(ETCPROG:%=$(ETCACCTD)/%)
ETCINITPROG= $(INITPROG:%=$(ETCINITD)/%)
$(LIBACCTD) := DIRMODE= 755
-$(ETCACCTD) := OWNER= adm
-$(ETCACCTD) := GROUP= adm
$(ETCACCTD) := DIRMODE= 755
-$(WKDIRS) := OWNER= adm
-$(WKDIRS) := GROUP= adm
$(WKDIRS) := DIRMODE= 775
-$(LIBACCTD)/accton:= OWNER= root
-$(LIBACCTD)/accton:= GROUP= adm
$(LIBACCTD)/accton := FILEMODE= 04755
-$(ETCINITPROG) := OWNER= root
-$(ETCINITPROG) := GROUP= sys
$(ETCINITPROG) := FILEMODE= 0744
$(ETCACCTPROG) := FILEMODE= 0644
diff --git a/usr/src/cmd/acctadm/Makefile b/usr/src/cmd/acctadm/Makefile
index 918c94cf46..be6466cd3f 100644
--- a/usr/src/cmd/acctadm/Makefile
+++ b/usr/src/cmd/acctadm/Makefile
@@ -39,8 +39,6 @@ LDLIBS += -lexacct -lscf -lsecdb -ldladm
POFILE = acctadm.po
XGETFLAGS = -a -x acctadm.xcl
FILEMODE = 0555
-OWNER = root
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/agents/Makefile b/usr/src/cmd/agents/Makefile
index 6bcee508c9..a3142ba1a6 100644
--- a/usr/src/cmd/agents/Makefile
+++ b/usr/src/cmd/agents/Makefile
@@ -20,10 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
# cmd/agents/Makefile
@@ -87,8 +86,6 @@ $(SUBDIRS): FRC
FRC:
DIRMODE= 0755
-OWNER= root
-GROUP= sys
ROOTVAR= $(ROOT)/var
ROOTDIRS= $(ROOTETC)/snmp \
diff --git a/usr/src/cmd/agents/snmp/mib/Makefile b/usr/src/cmd/agents/snmp/mib/Makefile
index 9476e41f29..b6189b1120 100644
--- a/usr/src/cmd/agents/snmp/mib/Makefile
+++ b/usr/src/cmd/agents/snmp/mib/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# snmp/mib/Makefile
#
@@ -36,8 +34,6 @@ MIBDIR = $(ROOT)/var/snmp/mib
ROOTMIBS = $(MIBS:%=$(MIBDIR)/%)
$(ROOTMIBS) := FILEMODE = 644
-$(ROOTMIBS) := OWNER = root
-$(ROOTMIBS) := GROUP = sys
$(MIBDIR)/%: %
diff --git a/usr/src/cmd/agents/snmp/snmprelayd/Makefile b/usr/src/cmd/agents/snmp/snmprelayd/Makefile
index 43d3dd3d0a..aa5accc428 100644
--- a/usr/src/cmd/agents/snmp/snmprelayd/Makefile
+++ b/usr/src/cmd/agents/snmp/snmprelayd/Makefile
@@ -147,7 +147,6 @@ ROOTMANIFESTDIR = $(ROOTSVCAPPLICATIONMANAGEMENT)
$(CONFRULE) := FILEMODE = 0644
$(CONFLOC)/snmpdx.acl := FILEMODE = 0600
-$(CONFRULE) := GROUP = sys
CLOBBERFILES += y.tab.c $(BINPROG)
diff --git a/usr/src/cmd/allocate/Makefile b/usr/src/cmd/allocate/Makefile
index 5691423a21..d448b24d37 100644
--- a/usr/src/cmd/allocate/Makefile
+++ b/usr/src/cmd/allocate/Makefile
@@ -90,14 +90,8 @@ SRCS = $(OBJS:%.o=%.c)
$(ROOTUSRSBIN)/% := FILEMODE = 555
$(ROOTUSRSBIN)/allocate := FILEMODE = 4555
-$(ROOTUSRSBIN)/% := OWNER = root
-$(ROOTUSRSBIN)/% := GROUP = bin
$(ROOTSECDEV)/% := FILEMODE = 0400
-$(ROOTSECDEV)/% := OWNER = root
-$(ROOTSECDEV)/% := GROUP = bin
$(ROOTSECLIB)/% := FILEMODE = 0555
-$(ROOTSECLIB)/% := OWNER = root
-$(ROOTSECLIB)/% := GROUP = sys
lint := LDLIBS += -lbsm -lsec -lsecdb -ldevinfo -ltsol
diff --git a/usr/src/cmd/audit_warn/Makefile b/usr/src/cmd/audit_warn/Makefile
index 49fa4a55b4..9106759763 100644
--- a/usr/src/cmd/audit_warn/Makefile
+++ b/usr/src/cmd/audit_warn/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/audit_warn/Makefile
#
@@ -36,12 +33,8 @@ include ../Makefile.cmd
ETCSECURITYFILES = audit_warn
ROOTETCSECURITY = $(ROOT)/etc/security
$(ROOTETCSECURITY) := DIRMODE = 0755
-$(ROOTETCSECURITY) := OWNER = root
-$(ROOTETCSECURITY) := GROUP = sys
ROOTETCSECURITYFILES = $(ETCSECURITYFILES:%=$(ROOTETCSECURITY)/%)
$(ROOTETCSECURITYFILES) := FILEMODE = 0740
-$(ROOTETCSECURITYFILES) := OWNER = root
-$(ROOTETCSECURITYFILES) := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/avs/dscfg/etc/Makefile b/usr/src/cmd/avs/dscfg/etc/Makefile
index 08554ef9ec..725c36deac 100644
--- a/usr/src/cmd/avs/dscfg/etc/Makefile
+++ b/usr/src/cmd/avs/dscfg/etc/Makefile
@@ -18,15 +18,13 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
include ../../../Makefile.cmd
ETCFILES = dscfg_format
-OWNER = root
-GROUP = sys
FILEMODE = 0744
ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
diff --git a/usr/src/cmd/avs/dsw/etc/Makefile b/usr/src/cmd/avs/dsw/etc/Makefile
index 85cedf294b..c627f1cbb1 100644
--- a/usr/src/cmd/avs/dsw/etc/Makefile
+++ b/usr/src/cmd/avs/dsw/etc/Makefile
@@ -30,8 +30,6 @@ SHFILES = ii ii.cluster
ROOTINIT_D = $(ROOTETC)/init.d
USRTOOL_D = $(ROOTUSRTOOLS)
-OWNER = root
-GROUP = sys
FILEMODE = 0744
ROOTINIT_DPROG = $(ROOTINIT_D)/ii
diff --git a/usr/src/cmd/avs/rdc/etc/Makefile b/usr/src/cmd/avs/rdc/etc/Makefile
index 926bbec7b0..cbe78b12a2 100644
--- a/usr/src/cmd/avs/rdc/etc/Makefile
+++ b/usr/src/cmd/avs/rdc/etc/Makefile
@@ -30,8 +30,6 @@ PROG3 = rdc.cluster
SHFILES = $(PROG1) $(PROG2) $(PROG3)
ROOTINIT_D = $(ROOTETC)/init.d
-OWNER = root
-GROUP = sys
FILEMODE = 0744
ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
diff --git a/usr/src/cmd/avs/sdbc/etc/Makefile b/usr/src/cmd/avs/sdbc/etc/Makefile
index 9e06b50db8..0abbf70293 100644
--- a/usr/src/cmd/avs/sdbc/etc/Makefile
+++ b/usr/src/cmd/avs/sdbc/etc/Makefile
@@ -31,10 +31,6 @@ BINPROGS = dscfg_reconfigure.cluster
SHFILES = $(INITPROGS) $(BINPROGS)
ROOTINIT_D = $(ROOTETC)/init.d
-OWNER = root
-GROUP = sys
-
-
ROOTBINPROGS= $(BINPROGS:%=$(ROOTBIN)/%)
ROOTINITPROGS= $(INITPROGS:%=$(ROOTINIT_D)/%)
diff --git a/usr/src/cmd/avs/sv/etc/Makefile b/usr/src/cmd/avs/sv/etc/Makefile
index 97482f8101..d027aedca9 100644
--- a/usr/src/cmd/avs/sv/etc/Makefile
+++ b/usr/src/cmd/avs/sv/etc/Makefile
@@ -28,8 +28,6 @@ include ../../Makefile.com
SHFILES = sv sv.cluster
ROOTINIT_D = $(ROOTETC)/init.d
-OWNER = root
-GROUP = sys
FILEMODE = 0744
ROOTINIT_DPROG1 = $(ROOTINIT_D)/sv
diff --git a/usr/src/cmd/avs/svc/Makefile b/usr/src/cmd/avs/svc/Makefile
index ad7a76af1a..751aa9e5cc 100644
--- a/usr/src/cmd/avs/svc/Makefile
+++ b/usr/src/cmd/avs/svc/Makefile
@@ -46,8 +46,6 @@ $(SHFILES): $(XML:%=manifest/%)
$(RM) $(@F)
$(CP) $(@F:%=manifest/%) .
-OWNER = root
-GROUP = sys
FILEMODE = 0444
$(ROOTSVCSYSFILES): $(SHFILES)
diff --git a/usr/src/cmd/backup/Makefile.backup b/usr/src/cmd/backup/Makefile.backup
index 2848c8d555..6c6093396f 100644
--- a/usr/src/cmd/backup/Makefile.backup
+++ b/usr/src/cmd/backup/Makefile.backup
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1993,1998 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/backup/Makefile.backup
#
@@ -49,25 +46,6 @@ UFSROOTUSRLIBFS= $(UFSROOTUSRLIB)/fs
UFSROOTUSRLIBFSTYPE= $(UFSROOTUSRLIBFS)/$(FSTYPE)
UFSROOTUSRSBIN= $(UFSROOTUSR)/sbin
-$(CH)$(UFSROOTETC) := DIRMODE = 755
-$(UFSROOTETC) := OWNER = root
-$(UFSROOTETC) := GROUP = sys
-$(CH)$(UFSROOTUSR) := DIRMODE = 755
-$(UFSROOTUSR) := OWNER = root
-$(UFSROOTUSR) := GROUP = bin
-$(CH)$(UFSROOTUSRLIB) := DIRMODE = 755
-$(UFSROOTUSRLIB) := OWNER = root
-$(UFSROOTUSRLIB) := GROUP = bin
-$(CH)$(UFSROOTUSRLIBFS) := DIRMODE = 755
-$(UFSROOTUSRLIBFS) := OWNER = root
-$(UFSROOTUSRLIBFS) := GROUP = sys
-$(CH)$(UFSROOTUSRLIBFSFSTYPE):= DIRMODE = 755
-$(UFSROOTUSRLIBFSFSTYPE):= OWNER = root
-$(UFSROOTUSRLIBFSFSTYPE):= GROUP = sys
-$(CH)$(UFSROOTUSRSBIN) := DIRMODE = 755
-$(UFSROOTUSRSBIN) := OWNER = root
-$(UFSROOTUSRSBIN) := GROUP = bin
-
UFSROOTPKGUSRLIBFSTYPE= $(PROG:%=$(UFSROOTUSRLIBFSTYPE)/%)
UFSROOTPKGETC= $(PROT:%=$(UFSROOTETC)/%)
diff --git a/usr/src/cmd/backup/dump/Makefile b/usr/src/cmd/backup/dump/Makefile
index 378dbfacfb..849fbf4ef7 100644
--- a/usr/src/cmd/backup/dump/Makefile
+++ b/usr/src/cmd/backup/dump/Makefile
@@ -1,9 +1,7 @@
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/backup/dump/Makefile
#
# Copyright (c) 1980 Regents of the University of California.
@@ -79,14 +77,9 @@ UFSROOTLINK= $(UFSROOTUSRSBIN)/$(PROG)
LINKVALUE= ../lib/fs/$(FSTYPE)/$(PROG)
LIBDIR= $(UFSROOTUSRLIBFS)/$(FSTYPE)
$(UFSROOTDUMPDATES):= FILEMODE= 0664
-$(UFSROOTDUMPDATES):= OWNER= root
-$(UFSROOTDUMPDATES):= GROUP= sys
$(LIBDIR):= DIRMODE= 0755
-$(LIBDIR):= OWNER= root
-$(LIBDIR):= GROUP= sys
FILEMODE= 04555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/backup/restore/Makefile b/usr/src/cmd/backup/restore/Makefile
index 9ad73cdb99..53cd027c0b 100644
--- a/usr/src/cmd/backup/restore/Makefile
+++ b/usr/src/cmd/backup/restore/Makefile
@@ -1,9 +1,7 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/backup/restore/Makefile
#
# Copyright (c) 1983 Regents of the University of California.
@@ -52,7 +50,6 @@ UFSROOTLINK= $(UFSROOTUSRSBIN)/$(PROG)
LINKVALUE= ../lib/fs/$(FSTYPE)/$(PROG)
FILEMODE= 04555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/bnu/Makefile b/usr/src/cmd/bnu/Makefile
index 3f87459a60..00c2ed394c 100644
--- a/usr/src/cmd/bnu/Makefile
+++ b/usr/src/cmd/bnu/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/bnu/Makefile
@@ -65,8 +62,6 @@ POFILES = $(PROG:%=%.cat)
CPPFLAGS = -I. $(SMALLFLAG) $(CPPFLAGS.master) # -DSMALL
-OWNER = uucp
-GROUP = uucp
FILEMODE = 4511
# if you change these directories, change them in uucp.h as well
@@ -120,22 +115,15 @@ REMOTESYMDEST = ../../usr/lib/uucp
$(USERPROG1) := CPPFLAGS += -D_FILE_OFFSET_BITS=64
# Mode is assigned in Targetdirs. It shoudn't be re-assigned here
-#$(ROOTSPPUB) := DIRMODE = 1777
$(USERPROG1:%=$(ROOTBIN)/%) := FILEMODE = 0555
-$(USERPROG1:%=$(ROOTBIN)/%) := OWNER = root
$(ROOTSHELLS) := FILEMODE = 0555
-$(ROOTSHELLS) := OWNER = root
$(ROOTLIBSHELLS) := FILEMODE = 0555
-$(ROOTLIBSHELLS) := OWNER = root
$(UUCPPROG1:%=$(ROOTLIBUUCP)/%) := FILEMODE = 0510
$(ROOTCRONTAB) := FILEMODE = 0444
-$(ROOTCRONTAB) := OWNER = root
$(ROOTFILES) := FILEMODE = 0644
$(ROOTETCUUCP)/Permissions := FILEMODE = 0600
$(ROOTETCUUCP)/Systems := FILEMODE = 0600
-$(ROOTBIN)/ct := OWNER = root
$(ROOTSPROG) := FILEMODE = 0555
-$(ROOTSPROG) := OWNER = root
include ./Makefile.inc
diff --git a/usr/src/cmd/boot/Makefile.com b/usr/src/cmd/boot/Makefile.com
index c0a9a0e880..833564208c 100644
--- a/usr/src/cmd/boot/Makefile.com
+++ b/usr/src/cmd/boot/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/cmd/Makefile.cmd
@@ -35,14 +33,10 @@ ROOTBOOTSOLARISBIN= $(ROOTBOOTSOLARIS)/bin
ROOTBOOTSOLARISBINPROG= $(BOOTPROG:%=$(ROOTBOOTSOLARISBIN)/%)
-$(ROOTBOOTSOLARISBINPROG) := OWNER= root
-$(ROOTBOOTSOLARISBINPROG) := GROUP= bin
$(ROOTBOOTSOLARISBINPROG) := FILEMODE= 0555
ROOTBOOTSOLARISDATA= $(DATA:%=$(ROOTBOOTSOLARIS)/%)
-$(ROOTBOOTSOLARISDATA) := OWNER= root
-$(ROOTBOOTSOLARISDATA) := GROUP= sys
$(ROOTBOOTSOLARISDATA) := FILEMODE= 0644
ROOTUSRSBINLINKS= $(SBINLINKS:%=$(ROOTUSRSBIN)/%)
diff --git a/usr/src/cmd/bsmconv/Makefile b/usr/src/cmd/bsmconv/Makefile
index 601c5a28fd..b66775cb16 100644
--- a/usr/src/cmd/bsmconv/Makefile
+++ b/usr/src/cmd/bsmconv/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/bsmconv/Makefile
#
@@ -34,8 +31,6 @@ include ../Makefile.cmd
FILEMODE = 0740
DIRMODE = 0755
-OWNER = root
-GROUP = sys
ROOTETCSECURITY = $(ROOT)/etc/security
ROOTETCSECURITYSPOOL = $(ROOT)/etc/security/spool
diff --git a/usr/src/cmd/bsmunconv/Makefile b/usr/src/cmd/bsmunconv/Makefile
index e4b24335c7..c855c26ff0 100644
--- a/usr/src/cmd/bsmunconv/Makefile
+++ b/usr/src/cmd/bsmunconv/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/bsmunconv/Makefile
#
@@ -34,8 +31,6 @@ include ../Makefile.cmd
FILEMODE = 0740
DIRMODE = 0755
-OWNER = root
-GROUP = sys
ROOTETCSECURITY = $(ROOT)/etc/security
ROOTETCSECURITYSPOOL = $(ROOT)/etc/security/spool
diff --git a/usr/src/cmd/cmd-crypto/etc/Makefile b/usr/src/cmd/cmd-crypto/etc/Makefile
index 14f4b1e541..c0fab473f2 100644
--- a/usr/src/cmd/cmd-crypto/etc/Makefile
+++ b/usr/src/cmd/cmd-crypto/etc/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
RELEASECERTS = SUNW_SunOS_5.10
RELEASECRYPTO = SUNW_SunOS_5.10 \
@@ -54,11 +52,6 @@ ROOTCRYPTOCERTSDIR= $(ROOTCRYPTODIR)/certs
ROOTETCCERTSDIR= $(ROOT)/etc/certs
-$(ROOTCRYPTODIR):= OWNER= root
-$(ROOTCRYPTODIR):= GROUP= sys
-$(ROOTETCCERTSDIR):= OWNER= root
-$(ROOTETCCERTSDIR):= GROUP= sys
-
IETCCRYPTOFILES= $(ETCCRYPTOFILES:%=$(ROOTCRYPTODIR)/%)
IETCCERTSFILES= $(ETCCERTSFILES:%=$(ROOTETCCERTSDIR)/%)
@@ -96,11 +89,7 @@ $(ANNOTATEDFILES:%.annot=%): \
$(@:%=%.annot) > $@
$(IETCCRYPTOFILES):= FILEMODE= 644
-$(IETCCRYPTOFILES):= OWNER= root
-$(IETCCRYPTOFILES):= GROUP= sys
$(IETCCERTSFILES):= FILEMODE= 644
-$(IETCCERTSFILES):= OWNER= root
-$(IETCCERTSFILES):= GROUP= sys
install: $(IETCCRYPTOFILES) $(IETCCERTSFILES)
diff --git a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile
index f476df768f..33d43da3d9 100644
--- a/usr/src/cmd/cmd-crypto/kmfcfg/Makefile
+++ b/usr/src/cmd/cmd-crypto/kmfcfg/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for policy testing code
#
@@ -61,12 +59,8 @@ ROOTDTDS= $(DTDDIR)/kmfpolicy.dtd
ROOTXML= $(XMLDIR)/kmfpolicy.xml
$(ROOTDTDS) := FILEMODE = 444
-$(ROOTDTDS) := OWNER = root
-$(ROOTDTDS) := GROUP = bin
$(ROOTXML) := FILEMODE = 644
-$(ROOTXML) := OWNER = root
-$(ROOTXML) := GROUP = bin
all: $(PROG) $(ROOTDTDS)
diff --git a/usr/src/cmd/cmd-inet/etc/Makefile b/usr/src/cmd/cmd-inet/etc/Makefile
index b58d664eb5..d660772bd7 100644
--- a/usr/src/cmd/cmd-inet/etc/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/Makefile
@@ -47,8 +47,6 @@ SYMETCPROG= $(SYMPROG:%=sym_%)
SYMIPNODES= $(INETETCDIR)/ipnodes
FILEMODE= 0444
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/etc/dhcp/Makefile b/usr/src/cmd/cmd-inet/etc/dhcp/Makefile
index dd540b79c3..3b19a220f5 100644
--- a/usr/src/cmd/cmd-inet/etc/dhcp/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/dhcp/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/cmd-inet/etc/dhcp/Makefile
@@ -35,7 +32,6 @@ ETCDHCPDIR= $(ROOTETC)/dhcp
ETCDHCPFILES= $(DHCPFILES:%=$(ETCDHCPDIR)/%)
FILEMODE= 0644
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/etc/ike/Makefile b/usr/src/cmd/cmd-inet/etc/ike/Makefile
index 71ccb3e006..fed4097d69 100644
--- a/usr/src/cmd/cmd-inet/etc/ike/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/ike/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/cmd-inet/etc/ike/Makefile
#
@@ -41,8 +37,6 @@ ETCINETCRLDIR= $(ROOTETC)/inet/$(IKEDIR)/$(CRLDIR)
ETCINETIKEPROG= $(ETCPROG:%=$(ETCINETIKEDIR)/%)
FILEMODE= 0444
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/etc/init.d/Makefile b/usr/src/cmd/cmd-inet/etc/init.d/Makefile
index f2169abb00..46f744cd3b 100644
--- a/usr/src/cmd/cmd-inet/etc/init.d/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/init.d/Makefile
@@ -18,12 +18,9 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/cmd-inet/etc/init.d/Makefile
PROG4= ncalogd
@@ -43,8 +40,6 @@ INITD= $(ROOTETC)/init.d
DIRS= $(INITD) $(ROOTETC)/rc0.d $(ROOTETC)/rcS.d $(ROOTETC)/rc1.d \
$(ROOTETC)/rc2.d $(ROOTETC)/rc3.d
FILEMODE= 0744
-OWNER= root
-GROUP= sys
ETCINITPROG= $(PROG:%=$(INITD)/%)
diff --git a/usr/src/cmd/cmd-inet/etc/nca/Makefile b/usr/src/cmd/cmd-inet/etc/nca/Makefile
index bbdac868f5..5ca89052ef 100644
--- a/usr/src/cmd/cmd-inet/etc/nca/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/nca/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1999-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/cmd-inet/etc/nca/Makefile
#
@@ -37,8 +34,6 @@ ETCNCADIR= $(ROOTETC)/$(NCADIR)
ETCNCAPROG= $(ETCPROG:%=$(ETCNCADIR)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/etc/ppp/Makefile b/usr/src/cmd/cmd-inet/etc/ppp/Makefile
index 8027f48d2f..d82eb1bb37 100644
--- a/usr/src/cmd/cmd-inet/etc/ppp/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/ppp/Makefile
@@ -38,9 +38,6 @@ ETCPEERSDIR= $(ETCPPPDIR)/peers
ETCPPPPROG= $(ETCPROG:%=$(ETCPPPDIR)/%) $(ETCPEERS:%=$(ETCPEERSDIR)/%)
ETCPPPPROGROOT= $(ETCPROGROOT:%=$(ETCPPPDIR)/%)
-OWNER= root
-GROUP= sys
-
# This is here to allow the make command to override this value;
# setting it to 0644 simplifies packaging.
SECRETSMODE= 0600
diff --git a/usr/src/cmd/cmd-inet/etc/secret/Makefile b/usr/src/cmd/cmd-inet/etc/secret/Makefile
index 0ef73a4fd5..543ad9bd4d 100644
--- a/usr/src/cmd/cmd-inet/etc/secret/Makefile
+++ b/usr/src/cmd/cmd-inet/etc/secret/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/cmd-inet/etc/secret/Makefile
#
@@ -44,8 +40,6 @@ $(ETCINETPRIVATEKEYDIR):= DIRMODE= 700
DIRMODE= 700
FILEMODE= 600
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.bin/Makefile b/usr/src/cmd/cmd-inet/usr.bin/Makefile
index d1a9009914..c56b56e724 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -63,7 +63,6 @@ _msg:= TARGET= _msg
ROOTSUIDPROG= $(SUIDPROG:%=$(ROOTBIN)/%)
$(ROOTSUIDPROG) := FILEMODE= 04555
-$(ROOTSUIDPROG) := OWNER= root
CPPFLAGS += -DSYSV -DSTRNET -DBSD_COMP -I$(CMDINETCOMMONDIR)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
index 19502f8b10..57b30cf3b5 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/Makefile
@@ -87,11 +87,8 @@ $(PROG): $(OBJS)
$(POST_PROCESS)
$(ROOTPROG):= FILEMODE = 04555
-$(ROOTPROG):= OWNER = root
ASPPP2PPPD= $(ROOTUSRSBIN)/asppp2pppd
-$(ASPPP2PPPD):= OWNER=root
-$(ASPPP2PPPD):= GROUP=bin
$(ASPPP2PPPD):= FILEMODE = 0550
install: $(PROG) .WAIT $(SUBDIRS) $(ROOTPROG) $(ETCPPPDIR) $(ASPPP2PPPD)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
index 02b5c1b923..7be17b13aa 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
MINCONN = minconn.so
PASSPROMPT = passprompt.so
@@ -67,25 +65,15 @@ CLOBBERFILES += $(LIBRARIES)
LIBPPPPLUGIN= $(LIBRARIES:%=$(LIBPPPPLUGINDIR)/%)
$(LIBPPPPLUGIN):= FILEMODE = 0544
-$(LIBPPPPLUGIN):= OWNER = root
-$(LIBPPPPLUGIN):= GROUP = bin
$(LIBPPPPLUGINDIR):= FILEMODE = 0755
-$(LIBPPPPLUGINDIR):= OWNER = root
-$(LIBPPPPLUGINDIR):= GROUP = bin
# This is needed because install doesn't handle -g well.
UTILDIR= $(ROOT)/usr/share/src/ppputil
-$(UTILDIR):= OWNER = root
-$(UTILDIR):= GROUP = bin
ROOTSRC= $(UTILDIR)/plugins
SRCFILES= Makefile minconn.c passprompt.c pppd.h
ROOTSRCFILES= $(SRCFILES:%=$(ROOTSRC)/%)
-$(ROOTSRC):= OWNER = root
-$(ROOTSRC):= GROUP = bin
$(ROOTSRCFILES):= FILEMODE= 0444
-$(ROOTSRCFILES):= OWNER = root
-$(ROOTSRCFILES):= GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
index 4f33b95eca..54381cfe6d 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/rdist/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/cmd-inet/usr.bin/rdist/Makefile
PROG= rdist
@@ -53,7 +51,6 @@ ROOTSYMLINK= $(ROOT)/usr/ucb/$(PROG)
# conditional assignments
$(ROOTPROG) := FILEMODE= 04555
-$(ROOTPROG) := OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile
index 6a6a563497..010d42c6b9 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/in.ftpd/Makefile
@@ -29,7 +29,6 @@ CONFIGFILES= ftpaccess ftpconversions ftpgroups ftphosts ftpservers ftpusers
ETCFTPDDIR= $(ROOTETC)/ftpd
ETCFTPDFILES= $(CONFIGFILES:%=$(ETCFTPDDIR)/%)
$(ETCFTPDFILES):= FILEMODE= 0644
-$(ETCFTPDFILES):= GROUP= sys
ROOTUSRSBINSCRIPTS= $(SCRIPTS:%=$(ROOTUSRSBIN)/%)
ROOTFTPCOUNT= $(ROOTUSRSBIN)/ftpcount
ROOTFTPWHO= $(ROOTUSRSBIN)/ftpwho
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
index d348b7aeaf..605ef68f99 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-
#
# cmd/cmd-inet/usr.sbin/ipqosconf/Makefile
@@ -49,13 +46,8 @@ ROOTLIBIPQOSCONFTYPES = $(TYPES:%=$(ROOTLIBIPQOSCONF)/%)
include ../../../Makefile.cmd
include ../../Makefile.cmd-inet
-$(ROOTUSRSBIN)/$(PROG) := FILEMODE= 0755
-$(ROOTUSRSBIN)/$(PROG) := OWNER= root
-$(ROOTUSRSBIN)/$(PROG) := GROUP= bin
-
+$(ROOTUSRSBIN)/$(PROG) := FILEMODE= 0755
$(ROOTLIBIPQOSCONFTYPES) := FILEMODE= 0444
-$(ROOTLIBIPQOSCONFTYPES) := OWNER= root
-$(ROOTLIBIPQOSCONFTYPES) := GROUP= bin
#pull in prototype for strtok_r
CPPFLAGS += -D__EXTENSIONS__
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
index 9a737a6f25..0d5c086124 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= ping
OBJS= ping.o ping_aux.o ping_aux6.o
@@ -33,7 +30,6 @@ SRCS= $(OBJS:.o=.c)
include ../../../Makefile.cmd
$(ROOTUSRSBIN)/ping := FILEMODE= 04555
-$(ROOTUSRSBIN)/ping := OWNER= root
# Ping uses the ancillary data feature which is available only through
# UNIX 98 standards version of Socket interface. This interface is supposed to
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
index 638712d811..a00091db50 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/routeadm/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
SVCMETHOD= svc-legacy-routing svc-forwarding
@@ -46,8 +44,6 @@ ROOTSVCMANIFEST= $(ROOTSVCNETWORKROUTING)/legacy-routing.xml \
include ../../Makefile.cmd-inet
-$(ROOTSVCMANIFEST) := OWNER= root
-$(ROOTSVCMANIFEST) := GROUP= sys
$(ROOTSVCMANIFEST) := FILEMODE= 444
ROOTUSRSBINLINKS= $(PROG:%=$(ROOTUSRSBIN)/%)
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
index c98dae83b0..f2913a2ed4 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sbin/traceroute/Makefile
@@ -1,9 +1,7 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Copyright (c) 1988, 1989, 1990, 1991, 1992, 1995, 1996, 1997
# The Regents of the University of California. All rights reserved.
@@ -33,7 +31,6 @@ SRCS= $(OBJS:.o=.c)
include ../../../Makefile.cmd
$(ROOTUSRSBIN)/traceroute := FILEMODE= 04555
-$(ROOTUSRSBIN)/traceroute := OWNER= root
# Traceroute uses the ancillary data feature which is available only through
# UNIX 98 standards version of Socket interface. This interface is supposed to
diff --git a/usr/src/cmd/consadm/Makefile.com b/usr/src/cmd/consadm/Makefile.com
index d32aa95416..9eb1226b74 100644
--- a/usr/src/cmd/consadm/Makefile.com
+++ b/usr/src/cmd/consadm/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/consadm/Makefile.com
@@ -40,8 +36,6 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS +=
FILEMODE = 0555
-OWNER = root
-GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/cron/Makefile b/usr/src/cmd/cron/Makefile
index d0ee885f58..561b44dc40 100644
--- a/usr/src/cmd/cron/Makefile
+++ b/usr/src/cmd/cron/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -106,7 +106,7 @@ NOBJS= $(CRONOBJS) $(ATOBJS) $(ATRMOBJS1) $(ATQOBJS) $(CRONTABOBJS1) \
$(COMMONOBJS)
OBJS = $(NOBJS) $(XPG4COMMONOBJS) $(XPG4ATOBJS) $(XPG4CTOBJS) \
$(XPG6COMMONOBJS) $(XPG6CTOBJS) $(GETRESPOBJ)
-
+
SRCS = $(NOBJS:%.o=%.c) $(GETRESPSRC)
CLOBBERFILES += $(SCRIPT) $(XPG4SCRIPT)
@@ -115,26 +115,13 @@ $(ROOTLIBCRON) := SYMLNKDEST = ../../etc/cron.d
$(ROOTETC)/cron := SYMLNKDEST = ../usr/sbin/cron
$(ROOTBIN)/at := FILEMODE = 04755
-$(ROOTBIN)/at := OWNER = root
-$(ROOTBIN)/at := GROUP = sys
$(ROOTXPG4BIN)/at := FILEMODE = 04755
-$(ROOTXPG4BIN)/at := OWNER = root
-$(ROOTXPG4BIN)/at := GROUP = sys
$(ROOTBIN)/atrm := FILEMODE = 04755
-$(ROOTBIN)/atrm := OWNER = root
-$(ROOTBIN)/atrm := GROUP = sys
$(ROOTBIN)/atq := FILEMODE = 04755
-$(ROOTBIN)/atq := OWNER = root
-$(ROOTBIN)/atq := GROUP = sys
$(ROOTBIN)/crontab := FILEMODE = 04555
-$(ROOTBIN)/crontab := OWNER = root
$(ROOTXPG6BIN)/crontab := FILEMODE = 04555
-$(ROOTXPG6BIN)/crontab := OWNER = root
$(ROOTXPG4BIN)/crontab := FILEMODE = 04555
-$(ROOTXPG4BIN)/crontab := OWNER = root
$(ROOTUSRSBIN)/cron := FILEMODE = 0555
-$(ROOTUSRSBIN)/cron := OWNER = root
-$(ROOTUSRSBIN)/cron := GROUP = sys
LDLIBS += -lbsm
diff --git a/usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile b/usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile
index 9a8e30c9ff..69d5697a4e 100644
--- a/usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile
+++ b/usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/cvcd/sparc/sun4u/starcat/cvcd
#
PROG= cvcd
@@ -41,8 +38,6 @@ include ../../../../Makefile.cmd
include ../../../../../Makefile.psm
FILEMODE= 0755
-OWNER= root
-GROUP= sys
ROOTPSMPROG = $(ROOT_PSM_LIB_DIR)/$(PROG)
diff --git a/usr/src/cmd/cvcd/sparc/sun4u/starfire/Makefile b/usr/src/cmd/cvcd/sparc/sun4u/starfire/Makefile
index 57a8c6a2f0..2e383ae249 100644
--- a/usr/src/cmd/cvcd/sparc/sun4u/starfire/Makefile
+++ b/usr/src/cmd/cvcd/sparc/sun4u/starfire/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1999-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/cvcd/sparc/sun4u/starfire/cvcd
#
PROG= cvcd
@@ -41,8 +38,6 @@ include ../../../../Makefile.cmd
include ../../../../../Makefile.psm
FILEMODE= 0700
-OWNER= root
-GROUP= sys
ROOTPSMPROG = $(ROOT_PSM_LIB_DIR)/$(PROG)
diff --git a/usr/src/cmd/dcs/sparc/sun4u/Makefile b/usr/src/cmd/dcs/sparc/sun4u/Makefile
index 3025c763c9..76ff6c0a22 100644
--- a/usr/src/cmd/dcs/sparc/sun4u/Makefile
+++ b/usr/src/cmd/dcs/sparc/sun4u/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile definitions for Domain Configuration Server (DCS)
#
@@ -74,8 +72,6 @@ LINT_FILES= $(LINT_SRCS:%.c=%.ln)
POFILES= dcs_msg.po
$(ROOTLIBPROG) := FILEMODE= 0755
-$(ROOTLIBPROG) := OWNER= root
-$(ROOTLIBPROG) := GROUP= bin
ROOTMANIFESTDIR= $(ROOTSVCPLATFORMSUN4U)
diff --git a/usr/src/cmd/devfsadm/Makefile b/usr/src/cmd/devfsadm/Makefile
index e8531dcf9c..e008e8fffb 100644
--- a/usr/src/cmd/devfsadm/Makefile
+++ b/usr/src/cmd/devfsadm/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/devfsadm/Makefile
@@ -48,10 +45,6 @@ lint := TARGET= lint
ROOTETCDEV= $(ROOTETC)/dev
ROOTETCDEVFILES=$(ETCDEVFILES:%=$(ROOTETCDEV)/%)
$(ROOTETCDEV) := DIRMODE= 755
-$(ROOTETCDEV) := OWNER= root
-$(ROOTETCDEV) := GROUP= sys
-$(ROOTETCDEVFILES) := OWNER = root
-$(ROOTETCDEVFILES) := GROUP = sys
$(ROOTETCDEVFILES) := FILEMODE = 0644
.KEEP_STATE:
diff --git a/usr/src/cmd/devfsadm/Makefile.com b/usr/src/cmd/devfsadm/Makefile.com
index 13114e60ce..8948513136 100644
--- a/usr/src/cmd/devfsadm/Makefile.com
+++ b/usr/src/cmd/devfsadm/Makefile.com
@@ -117,8 +117,6 @@ ROOTLIB_DEVFSADM_DAEMON = $(ROOTLIB_DEVFSADM)/$(DEVFSADM_DAEMON)
ROOTETC_DEVLINKTAB = $(DEVLINKTAB:%=$(ROOTETC)/%)
-OWNER= root
-GROUP= sys
FILEMODE= 755
$(ROOTETC_DEVLINKTAB) := FILEMODE = 644
diff --git a/usr/src/cmd/device_remap/Makefile b/usr/src/cmd/device_remap/Makefile
index 78d2416b0b..dc34ef0312 100644
--- a/usr/src/cmd/device_remap/Makefile
+++ b/usr/src/cmd/device_remap/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/device_remap/Makefile
@@ -34,7 +34,6 @@ include ../../Makefile.psm
PROG= device_remap
FILEMODE= 0544
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/devmgmt/data/Makefile b/usr/src/cmd/devmgmt/data/Makefile
index c2ab635ac6..d90279100d 100644
--- a/usr/src/cmd/devmgmt/data/Makefile
+++ b/usr/src/cmd/devmgmt/data/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1990 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/devmgmt/data/Makefile
#
@@ -33,11 +30,6 @@ ROOTETCFILES= $(FILES:%=$(ROOTETC)/%)
include ../../Makefile.cmd
FILEMODE= 444
-OWNER= root
-
-# conditional assignments
-$(ROOTETC)/device.tab := GROUP= root
-$(ROOTETC)/dgroup.tab := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/dispadmin/Makefile b/usr/src/cmd/dispadmin/Makefile
index 883e8c94dc..51c3fbbba7 100644
--- a/usr/src/cmd/dispadmin/Makefile
+++ b/usr/src/cmd/dispadmin/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/dispadmin/Makefile
#
@@ -56,8 +54,6 @@ ROOTFSS= $(FSS:%=$(ROOTDIR)/FSS/%)
ROOTFX= $(FX:%=$(ROOTDIR)/FX/%)
ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)
-GROUP = bin
-
# this would be simpler if we renamed rtdispadmin.c and tsdispadmin.c
OBJECTS= $(PROG).o rt$(PROG).o ts$(PROG).o ia$(PROG).o \
fss$(PROG).o fx$(PROG).o subr.o
diff --git a/usr/src/cmd/dladm/Makefile b/usr/src/cmd/dladm/Makefile
index 6757c63d89..230e856861 100644
--- a/usr/src/cmd/dladm/Makefile
+++ b/usr/src/cmd/dladm/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -37,9 +37,6 @@ XGETFLAGS += -a -x $(PROG).xcl
LDLIBS += -L$(ROOT)/lib -lsocket
LDLIBS += -ldladm -ldlpi -lkstat -lsecdb -lbsm -linetutil -ldevinfo
-$(ROOTCFGFILES) := OWNER= dladm
-$(ROOTCFGFILES) := GROUP= sys
-
$(ROOTCFGDIR)/secobj.conf := FILEMODE= 600
.KEEP_STATE:
diff --git a/usr/src/cmd/dlmgmtd/Makefile b/usr/src/cmd/dlmgmtd/Makefile
index baef35c3f8..2df2508f80 100644
--- a/usr/src/cmd/dlmgmtd/Makefile
+++ b/usr/src/cmd/dlmgmtd/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -36,8 +36,6 @@ ROOTMANIFESTDIR= $(ROOTSVCNETWORK)
ROOTCFGDIR= $(ROOTETC)/dladm
ROOTCFGFILES= $(CFGFILES:%=$(ROOTCFGDIR)/%)
-$(ROOTCFGFILES) := OWNER= dladm
-$(ROOTCFGFILES) := GROUP= sys
$(ROOTCFGDIR)/datalink.conf := FILEMODE= 644
LDLIBS += -ldladm -ldlpi -lavl -lnvpair -lsysevent
diff --git a/usr/src/cmd/dodatadm/Makefile b/usr/src/cmd/dodatadm/Makefile
index a04d4a0657..b4782f6dde 100644
--- a/usr/src/cmd/dodatadm/Makefile
+++ b/usr/src/cmd/dodatadm/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/dodatadm/Makefile
@@ -35,8 +35,6 @@ RC2D= $(ROOTETC)/rc2.d
DIRS= $(INITD) $(RC2D)
FILEMODE= 0744
-OWNER= root
-GROUP= sys
ETCINITPROG= $(SCRIPT:%=$(INITD)/%)
diff --git a/usr/src/cmd/dtrace/Makefile.com b/usr/src/cmd/dtrace/Makefile.com
index 86cac039cc..2f69e31be5 100644
--- a/usr/src/cmd/dtrace/Makefile.com
+++ b/usr/src/cmd/dtrace/Makefile.com
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = dtrace
OBJS = dtrace.o
@@ -37,7 +35,6 @@ CFLAGS64 += $(CCVERBOSE)
LDLIBS += -ldtrace -lproc -lctf -lelf
FILEMODE = 0555
-GROUP = bin
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/dtrace/demo/Makefile b/usr/src/cmd/dtrace/demo/Makefile
index c308271668..caa35d2395 100644
--- a/usr/src/cmd/dtrace/demo/Makefile
+++ b/usr/src/cmd/dtrace/demo/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -146,10 +146,6 @@ $(DFILES): $(MKDEMO)
$(ROOTDEMOFILES): $(ROOTDEMODIR)
-$(ROOTDEMODIR) := OWNER = root
-$(ROOTDEMODIR) := GROUP = bin
$(ROOTDEMODIR) := DIRMODE = 755
-$(ROOTDEMOFILES) := OWNER = root
-$(ROOTDEMOFILES) := GROUP = bin
$(ROOTDEMOFILES) := FILEMODE = 644
diff --git a/usr/src/cmd/dumpadm/Makefile b/usr/src/cmd/dumpadm/Makefile
index fac14347df..9ecbf2ed27 100644
--- a/usr/src/cmd/dumpadm/Makefile
+++ b/usr/src/cmd/dumpadm/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
PROG = dumpadm
MANIFEST = dumpadm.xml
@@ -39,8 +38,6 @@ include ../Makefile.cmd
CFLAGS += $(CCVERBOSE)
FILEMODE = 0555
-OWNER = root
-GROUP = bin
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
diff --git a/usr/src/cmd/eeprom/Makefile.com b/usr/src/cmd/eeprom/Makefile.com
index 0cc0be6f29..2c2399bb89 100644
--- a/usr/src/cmd/eeprom/Makefile.com
+++ b/usr/src/cmd/eeprom/Makefile.com
@@ -18,13 +18,10 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-
+
#
# Create default so empty rules don't
# confuse make
@@ -37,7 +34,6 @@ PROG = eeprom
FILEMODE = 02555
DIRMODE = 755
-GROUP = sys
OBJS = error.o
diff --git a/usr/src/cmd/fcoesvc/Makefile b/usr/src/cmd/fcoesvc/Makefile
index 1dc31822fb..ab4bd84e4b 100644
--- a/usr/src/cmd/fcoesvc/Makefile
+++ b/usr/src/cmd/fcoesvc/Makefile
@@ -41,8 +41,6 @@ MANIFEST = fcoe_target.xml
SVCMETHOD = svc-fcoet
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
-$(ROOTSVCSYSTEM)/fcoe_target.xml := OWNER = root
-$(ROOTSVCSYSTEM)/fcoe_target.xml := GROUP = bin
$(ROOTSVCSYSTEM)/fcoe_target.xml := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/fdformat/Makefile b/usr/src/cmd/fdformat/Makefile
index 69525617c3..8a04df934e 100644
--- a/usr/src/cmd/fdformat/Makefile
+++ b/usr/src/cmd/fdformat/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1991-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/fdformat/Makefile
#
@@ -41,7 +38,6 @@ LINTFLAGS += -um
# set-uid root program.
#
$(ROOTPROG) := FILEMODE = 04555
-$(ROOTPROG) := OWNER = root
all: $(PROG)
diff --git a/usr/src/cmd/filesync/Makefile b/usr/src/cmd/filesync/Makefile
index d2e128b11c..2e8e0fbc36 100644
--- a/usr/src/cmd/filesync/Makefile
+++ b/usr/src/cmd/filesync/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -37,7 +33,6 @@ include ../Makefile.cmd
LDLIBS += -lgen
FILEMODE= 0555
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/flowadm/Makefile b/usr/src/cmd/flowadm/Makefile
index 2230ed1623..aa057c1f2b 100644
--- a/usr/src/cmd/flowadm/Makefile
+++ b/usr/src/cmd/flowadm/Makefile
@@ -40,8 +40,6 @@ ROOTCFGDIR= $(ROOTETC)/dladm
ROOTCFGFILES= $(CONFIGFILES:%=$(ROOTCFGDIR)/%)
$(ROOTCFGFILES):= FILEMODE= 644
-$(ROOTCFGFILES):= OWNER= dladm
-$(ROOTCFGFILES):= GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/fmthard/Makefile b/usr/src/cmd/fmthard/Makefile
index 2b077b99f4..4f1205de7a 100644
--- a/usr/src/cmd/fmthard/Makefile
+++ b/usr/src/cmd/fmthard/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/fmthard/Makefile
@@ -34,8 +30,6 @@ include ../Makefile.cmd
RELUSRSBIN= ../usr/sbin
ROOTSYMLINK= $(ROOTETC)/$(PROG)
-OWNER= root
-GROUP= sys
LDLIBS += -ladm -lefi
lint := LINTFLAGS = -u -erroff=E_BAD_FORMAT_ARG_TYPE2
diff --git a/usr/src/cmd/format/Makefile b/usr/src/cmd/format/Makefile
index 8e475661c1..f96a6bb61e 100644
--- a/usr/src/cmd/format/Makefile
+++ b/usr/src/cmd/format/Makefile
@@ -50,8 +50,6 @@ ROOTSYMLINK= $(ROOTETCPROG)
ROOTETCDATA= $(ROOTETC)/$(DATA)
$(ROOTETCDATA) := FILEMODE = 0644
-$(ROOTETCDATA) := OWNER = root
-$(ROOTETCDATA) := GROUP = sys
LDLIBS_i386= -lfdisk
LDLIBS_sparc=
diff --git a/usr/src/cmd/fruadm/Makefile b/usr/src/cmd/fruadm/Makefile
index c41aab5218..ed48cfc06b 100644
--- a/usr/src/cmd/fruadm/Makefile
+++ b/usr/src/cmd/fruadm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = fruadm
PLATFORM = sun4u
@@ -43,8 +40,6 @@ LDLIBS += $(FRULIBS) -lm
lint := FRULIBS =
FILEMODE = 755
-OWNER = root
-GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/fs.d/Makefile b/usr/src/cmd/fs.d/Makefile
index 811bcfdbf0..20ffc9f17c 100644
--- a/usr/src/cmd/fs.d/Makefile
+++ b/usr/src/cmd/fs.d/Makefile
@@ -18,12 +18,9 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/fs.d/Makefile
# The filesystem independent utilities clri, fsdb, dcopy, labelit, and mkfs
@@ -89,8 +86,6 @@ CPPFLAGS += -D_LARGEFILE64_SOURCE
$(SPPROG) := LDLIBS += -lkstat
$(ROOTETCMNTTAB) := FILEMODE = 444
-$(ROOTETCMNTTAB) := OWNER = root
-$(ROOTETCMNTTAB) := GROUP = root
# for messaging catalog
#
diff --git a/usr/src/cmd/fs.d/Makefile.fstype b/usr/src/cmd/fs.d/Makefile.fstype
index f57eb5935f..2233045727 100644
--- a/usr/src/cmd/fs.d/Makefile.fstype
+++ b/usr/src/cmd/fs.d/Makefile.fstype
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/fs.d/Makefile.fstype
# Definitions and targets common to "simple" file system types.
#
@@ -62,9 +59,6 @@ ROOTTYPEPROG= $(TYPEPROG:%=$(ROOTLIBTYPE)/%)
FSTYPEDIRS= $(FSDIRS:%=%/$(FSTYPE)) $(ROOTETCTYPE) $(ROOTLIBTYPE)
FSTYPEPROG= $(ROOTETCFSPROG) $(ROOTLIBFSPROG) $(ROOTTYPEPROG)
-$(FSTYPEDIRS) := OWNER = root
-$(FSTYPEDIRS) := GROUP = sys
-
CLOBBERFILES += $(ETCPROG) $(LIBPROG) $(TYPEPROG)
.KEEP_STATE:
diff --git a/usr/src/cmd/fs.d/autofs/Makefile b/usr/src/cmd/fs.d/autofs/Makefile
index c4d1760d07..ab938ead53 100644
--- a/usr/src/cmd/fs.d/autofs/Makefile
+++ b/usr/src/cmd/fs.d/autofs/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/fs.d/autofs/Makefile
@@ -55,7 +55,6 @@ SVCMETHOD= svc-autofs
include ../Makefile.fstype
-$(MAPINSTALL) := OWNER= root
$(MAPINSTALL) := FILEMODE= 0644
$(MFSTINSTALL) := FILEMODE = 0444
diff --git a/usr/src/cmd/fs.d/nfs/etc/Makefile b/usr/src/cmd/fs.d/nfs/etc/Makefile
index a07bd86b81..72b7d3ce99 100644
--- a/usr/src/cmd/fs.d/nfs/etc/Makefile
+++ b/usr/src/cmd/fs.d/nfs/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,9 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -39,13 +36,7 @@ V4SSDIR= $(VARNFS)/v4_state $(VARNFS)/v4_oldstate
IETCFILES= $(TXTS:%=$(ROOTETC)/%)
INFSETCFILES= $(NFSTXTS:%=$(ROOTETC)/nfs/%)
-$(VARNFS) := GROUP = bin
FILEMODE= 0644
-OWNER= root
-GROUP= sys
-
-$(V4SSDIR) := GROUP = daemon
-$(V4SSDIR) := OWNER = daemon
all: $(TXTS) $(NFSTXTS)
diff --git a/usr/src/cmd/fs.d/nfs/nfsfind/Makefile b/usr/src/cmd/fs.d/nfs/nfsfind/Makefile
index 06bbe63d0b..646e72c3a9 100644
--- a/usr/src/cmd/fs.d/nfs/nfsfind/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsfind/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1993 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/fs.d/nfs/nfsfind/Makefile
@@ -31,6 +28,3 @@ LIBPROG= nfsfind
SRCS= nfsfind.sh
include ../../Makefile.fstype
-
-OWNER= root
-GROUP= sys
diff --git a/usr/src/cmd/fs.d/nfs/nfsstat/Makefile b/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
index 1b3ed73df6..8e3103e3c8 100644
--- a/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
+++ b/usr/src/cmd/fs.d/nfs/nfsstat/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/fs.d/nfs/nfsstat/Makefile
PROG= nfsstat
@@ -42,7 +40,6 @@ $(PROG): $(OBJS)
$(POST_PROCESS)
FILEMODE= 0555
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/fs.d/nfs/share/Makefile b/usr/src/cmd/fs.d/nfs/share/Makefile
index 7c3b1e9aab..a04638bcd3 100644
--- a/usr/src/cmd/fs.d/nfs/share/Makefile
+++ b/usr/src/cmd/fs.d/nfs/share/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -33,12 +30,7 @@ SHARETAB= sharetab
include ../../Makefile.fstype
$(ROOTETC)/dfs/fstypes := FILEMODE= 644
-$(ROOTETC)/dfs/fstypes := OWNER= root
-$(ROOTETC)/dfs/fstypes := GROUP= root
-
$(ROOTETC)/dfs/sharetab := FILEMODE= 444
-$(ROOTETC)/dfs/sharetab := OWNER= root
-$(ROOTETC)/dfs/sharetab := GROUP= root
$(SHARETAB):
touch $(SHARETAB)
diff --git a/usr/src/cmd/fs.d/ufs/quota/Makefile b/usr/src/cmd/fs.d/ufs/quota/Makefile
index 25181e8e56..3f0fb8544c 100644
--- a/usr/src/cmd/fs.d/ufs/quota/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quota/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/fs.d/ufs/quota/Makefile
@@ -40,8 +40,6 @@ CPPFLAGS += -I $(ROOT)/usr/include/sys -D_LARGEFILE64_SOURCE
LDLIBS += -lnsl
FILEMODE= 04555
-OWNER= root
-GROUP= bin
$(LIBPROG): $(OBJS)
$(LINK.c) -o $@ $(OBJS) $(LDLIBS)
diff --git a/usr/src/cmd/fs.d/ufs/quotaon/Makefile b/usr/src/cmd/fs.d/ufs/quotaon/Makefile
index 2d6e7bc617..25a59643b9 100644
--- a/usr/src/cmd/fs.d/ufs/quotaon/Makefile
+++ b/usr/src/cmd/fs.d/ufs/quotaon/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989,1996 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/fs.d/ufs/quotaon/Makefile
@@ -50,8 +46,6 @@ LINKVALUEOFF= ../lib/fs/$(FSTYPE)/$(QUOTAOFF)
include ../../Makefile.fstype
-$(ROOTINIT_SCRIPT) := OWNER = root
-$(ROOTINIT_SCRIPT) := GROUP = sys
$(ROOTINIT_SCRIPT) := FILEMODE = 0744
CPPFLAGS += -D_LARGEFILE64_SOURCE
diff --git a/usr/src/cmd/getdevpolicy/Makefile b/usr/src/cmd/getdevpolicy/Makefile
index 947450458a..2c0f477ad7 100644
--- a/usr/src/cmd/getdevpolicy/Makefile
+++ b/usr/src/cmd/getdevpolicy/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -31,7 +27,6 @@ PROG= getdevpolicy
include ../Makefile.cmd
FILEMODE = 0555
-OWNER = root
.KEEP_STATE:
diff --git a/usr/src/cmd/getmajor/Makefile b/usr/src/cmd/getmajor/Makefile
index 0b5a7aec2d..e64187f3a6 100644
--- a/usr/src/cmd/getmajor/Makefile
+++ b/usr/src/cmd/getmajor/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1991 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
SHFILES= getmajor
@@ -33,8 +30,6 @@ include ../Makefile.cmd
USRSBINF= getmajor
-OWNER= root
-GROUP= sys
FILEMODE= 0755
ROOTUSRSBINF= $(USRSBINF:%=$(ROOTUSRSBIN)/%)
diff --git a/usr/src/cmd/gss/etc/Makefile b/usr/src/cmd/gss/etc/Makefile
index 5acf736148..bacbb0f8e9 100644
--- a/usr/src/cmd/gss/etc/Makefile
+++ b/usr/src/cmd/gss/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1996-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
include ../../Makefile.cmd
@@ -39,9 +35,6 @@ GSSDIR= $(ROOTETC)/gss
KRB5DIR= $(ROOTETC)/krb5
FILEMODE= 0644
-OWNER= root
-GROUP= sys
-
.KEEP_STATE:
diff --git a/usr/src/cmd/gss/gsscred/Makefile b/usr/src/cmd/gss/gsscred/Makefile
index 5d3de70fbd..84b70d0d32 100644
--- a/usr/src/cmd/gss/gsscred/Makefile
+++ b/usr/src/cmd/gss/gsscred/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
SBINPROG = gsscred
@@ -47,9 +44,6 @@ POFILES = generic.po
ROOTBINPROG= $(BINPROG:%=$(ROOTBIN)/%)
-$(ROOTUSRSBIN)/gsscred := OWNER= root
-$(ROOTUSRSBIN)/gsscred := GROUP= sys
-
COPTFLAG += $(XESS) $(INCDIRS) $(LIBPATH)
LDLIBS += -lgss
diff --git a/usr/src/cmd/gss/gsscred_clean/Makefile b/usr/src/cmd/gss/gsscred_clean/Makefile
index 24e0ef7084..832afbcbb2 100644
--- a/usr/src/cmd/gss/gsscred_clean/Makefile
+++ b/usr/src/cmd/gss/gsscred_clean/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/gss/gsscred_clean/Makefile
#
@@ -48,14 +45,6 @@ DIRS= $(ROOTLIB)
#
FILEMODE=744
-
-#
-# Set owner to root since it is executed out of crontab by root
-#
-OWNER=root
-GROUP=sys
-
-
.KEEP_STATE:
#
diff --git a/usr/src/cmd/gss/gssd/Makefile b/usr/src/cmd/gss/gssd/Makefile
index 1bb54488f5..18b4bcdfca 100644
--- a/usr/src/cmd/gss/gssd/Makefile
+++ b/usr/src/cmd/gss/gssd/Makefile
@@ -67,9 +67,6 @@ ROOTLIB= $(ROOT)/usr/lib/gss
DIRS= $(ROOTLIB)
-$(ROOTLIB)/gssd := OWNER= root
-$(ROOTLIB)/gssd := GROUP= bin
-
CPPFLAGS += -I$(SRC)/uts/common/gssapi/include
COPTFLAG += $(XESS) #-I$(KINCDIR)
diff --git a/usr/src/cmd/hal/Makefile b/usr/src/cmd/hal/Makefile
index af8979f020..c97b46b9c0 100644
--- a/usr/src/cmd/hal/Makefile
+++ b/usr/src/cmd/hal/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.cmd
include Makefile.hal
@@ -44,8 +42,6 @@ clean := TARGET= clean
clobber := TARGET= clobber
$(ROOT_HAL_CONF) := FILEMODE = 644
-$(ROOT_HAL_CONF) := OWNER = root
-$(ROOT_HAL_CONF) := GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/hal/fdi/Makefile b/usr/src/cmd/hal/fdi/Makefile
index 7e3553d585..2d80789610 100644
--- a/usr/src/cmd/hal/fdi/Makefile
+++ b/usr/src/cmd/hal/fdi/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
include ../../Makefile.cmd
include ../Makefile.hal
@@ -32,8 +31,6 @@ XMLDIR = $(ROOT)/usr/share/lib/xml/dtd
ROOTDTDS = $(DTDS:%=$(XMLDIR)/%)
$(ROOTDTDS) := FILEMODE = 444
-$(ROOTDTDS) := OWNER = root
-$(ROOTDTDS) := GROUP = bin
FDIS = information/10freedesktop/10-camera-ptp.fdi \
information/10freedesktop/10-cd-dvd-burner.fdi \
@@ -57,8 +54,6 @@ FDIDIR = $(ROOT_HAL_FDI)
ROOTFDIS = $(FDIS:%=$(FDIDIR)/%)
$(ROOTFDIS) := FILEMODE = 444
-$(ROOTFDIS) := OWNER = root
-$(ROOTFDIS) := GROUP = bin
all:
diff --git a/usr/src/cmd/halt/Makefile b/usr/src/cmd/halt/Makefile
index 9860d1f67a..f5c49c642e 100644
--- a/usr/src/cmd/halt/Makefile
+++ b/usr/src/cmd/halt/Makefile
@@ -40,7 +40,6 @@ ROOTLINKS = $(ROOTUSRSBIN)/poweroff $(ROOTUSRSBIN)/reboot
ROOTSYMLINKS= $(ROOTETC)/halt $(ROOTETC)/reboot
FILEMODE = 0755
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/hwdata/Makefile b/usr/src/cmd/hwdata/Makefile
index a40d65e6a1..a7a39eda9b 100644
--- a/usr/src/cmd/hwdata/Makefile
+++ b/usr/src/cmd/hwdata/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
include ../Makefile.cmd
@@ -31,8 +30,6 @@ HWDATADIR = $(ROOT)/usr/share/hwdata
ROOTHWDATA = $(HWDATA:%=$(HWDATADIR)/%)
$(ROOTHWDATA) := FILEMODE = 444
-$(ROOTHWDATA) := OWNER = root
-$(ROOTHWDATA) := GROUP = bin
all:
diff --git a/usr/src/cmd/idmap/idmap/Makefile b/usr/src/cmd/idmap/idmap/Makefile
index 9853236a44..44c2cf7dc7 100644
--- a/usr/src/cmd/idmap/idmap/Makefile
+++ b/usr/src/cmd/idmap/idmap/Makefile
@@ -37,7 +37,6 @@ include ../../Makefile.cmd
POFILE = $(PROG)_all.po
LDLIBS += -lidmap
FILEMODE = 0555
-GROUP = bin
INCS += -I. -I../../../lib/libidmap/common -I$(IDMAP_PROT_DIR)
diff --git a/usr/src/cmd/idmap/idmapd/Makefile b/usr/src/cmd/idmap/idmapd/Makefile
index f9e9fd867d..04bee240ae 100644
--- a/usr/src/cmd/idmap/idmapd/Makefile
+++ b/usr/src/cmd/idmap/idmapd/Makefile
@@ -95,8 +95,6 @@ $(PROG) := LDFLAGS += $(MAPFILES:%=-M%)
DIRMODE = 0755
FILEMODE = 0555
-OWNER = root
-GROUP = sys
lint_SRCS := CPPFLAGS += $(INCS) -D_REENTRANT $(RPC_MSGOUT_OPT)
lint := LDLIBS += $(SQLITELINT)
diff --git a/usr/src/cmd/init/Makefile b/usr/src/cmd/init/Makefile
index a916b702cc..1a4d7c7bb8 100644
--- a/usr/src/cmd/init/Makefile
+++ b/usr/src/cmd/init/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= init
ROOTFS_PROG= $(PROG)
@@ -33,9 +31,6 @@ DEFAULTFILES= init.dfl
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
LDLIBS += -lpam -lbsm -lcontract -lscf
LINTFLAGS += -erroff=E_NAME_USED_NOT_DEF2
CLOBBERFILES= $(STATIC)
diff --git a/usr/src/cmd/initpkg/Makefile b/usr/src/cmd/initpkg/Makefile
index f8a685681c..4cdb5673fa 100644
--- a/usr/src/cmd/initpkg/Makefile
+++ b/usr/src/cmd/initpkg/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
SHFILES= dfstab vfstab
CPFILES= rcS rc0 rc1 rc2 rc3 mountall shutdown swapadd umountall
@@ -52,8 +49,6 @@ DFSTAB= dfstab
SBINETC= rcS mountall rc0 rc1 rc2 rc3 rc5 rc6 swapadd umountall
USRSBINETC= shutdown
-OWNER= root
-GROUP= sys
FILEMODE= 0744
ROOTSBINF= $(SBINF:%=$(ROOTSBIN)/%)
@@ -111,7 +106,7 @@ ins_all : $(ROOTSBINF) $(ROOTSBINL) $(ROOTUSRSBINF) $(ROOTETCTABS) \
# $(INS.dir)
$(SUBDIRS): FRC
- @cd $@; pwd; ROOT=$(ROOT) CH=$(CH) sh mk.$@.sh
+ @cd $@; pwd; ROOT=$(ROOT) sh mk.$@.sh
FRC:
diff --git a/usr/src/cmd/initpkg/init.d/Makefile b/usr/src/cmd/initpkg/init.d/Makefile
index a992132bc0..a7bde6f836 100644
--- a/usr/src/cmd/initpkg/init.d/Makefile
+++ b/usr/src/cmd/initpkg/init.d/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../../Makefile.cmd
@@ -76,8 +74,6 @@ $(ROOTETCINITD)/README := FILEMODE = 0644
$(ROOTETCRCSD)/README := FILEMODE = 0644
$(ROOTETCRC2D)/README := FILEMODE = 0644
$(ROOTETCRC3D)/README := FILEMODE = 0644
-OWNER = root
-GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh b/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
index fda0fd5559..48bd1bd5a7 100644
--- a/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
+++ b/usr/src/cmd/initpkg/rc0.d/mk.rc0.d.sh
@@ -22,11 +22,9 @@
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
# All Rights Reserved
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
COMMON_STOPLST="27boot.server"
@@ -35,9 +33,6 @@ INSDIR=${ROOT}/etc/rc0.d
if [ ! -d ${INSDIR} ]
then
mkdir ${INSDIR}
- eval ${CH}chmod 755 ${INSDIR}
- eval ${CH}chgrp sys ${INSDIR}
- eval ${CH}chown root ${INSDIR}
fi
for f in ${COMMON_STOPLST}
do
diff --git a/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh b/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
index 19119df66c..e89ddaed93 100644
--- a/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
+++ b/usr/src/cmd/initpkg/rc1.d/mk.rc1.d.sh
@@ -22,11 +22,9 @@
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
# All rights reserved
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
COMMON_STOPLST="27boot.server"
@@ -35,9 +33,6 @@ INSDIR=${ROOT}/etc/rc1.d
if [ ! -d ${INSDIR} ]
then
mkdir ${INSDIR}
- eval ${CH}chmod 755 ${INSDIR}
- eval ${CH}chgrp sys ${INSDIR}
- eval ${CH}chown root ${INSDIR}
fi
for f in ${COMMON_STOPLST}
do
diff --git a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
index 9f76efdd90..72d0f138c1 100644
--- a/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
+++ b/usr/src/cmd/initpkg/rc2.d/mk.rc2.d.sh
@@ -22,11 +22,9 @@
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
# All Rights Reserved
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
COMMON_STARTLST="\
20sysetup \
@@ -42,9 +40,6 @@ INSDIR=${ROOT}/etc/rc2.d
if [ ! -d ${INSDIR} ]
then
mkdir ${INSDIR}
- eval ${CH}chmod 755 ${INSDIR}
- eval ${CH}chgrp sys ${INSDIR}
- eval ${CH}chown root ${INSDIR}
fi
for f in ${STOPLST}
do
diff --git a/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh b/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
index 0510e25c2f..9566069421 100644
--- a/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
+++ b/usr/src/cmd/initpkg/rc3.d/mk.rc3.d.sh
@@ -22,10 +22,9 @@
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
# All Rights Reserved
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
STARTLST="16boot.server"
@@ -34,9 +33,6 @@ INSDIR=${ROOT}/etc/rc3.d
if [ ! -d ${INSDIR} ]
then
mkdir ${INSDIR}
- eval ${CH}chmod 755 ${INSDIR}
- eval ${CH}chgrp sys ${INSDIR}
- eval ${CH}chown root ${INSDIR}
fi
for f in ${STARTLST}
do
diff --git a/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh b/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
index 0787bbf60e..72256e8f5b 100644
--- a/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
+++ b/usr/src/cmd/initpkg/rcS.d/mk.rcS.d.sh
@@ -19,13 +19,11 @@
#
# CDDL HEADER END
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T
# All rights reserved.
-#
-# ident "%Z%%M% %I% %E% SMI"
COMMON_STOPLST="\
27boot.server"
@@ -35,9 +33,6 @@ INSDIR=${ROOT}/etc/rcS.d
if [ ! -d ${INSDIR} ]
then
mkdir ${INSDIR}
- eval ${CH}chmod 755 ${INSDIR}
- eval ${CH}chgrp sys ${INSDIR}
- eval ${CH}chown root ${INSDIR}
fi
for f in ${COMMON_STOPLST}
do
diff --git a/usr/src/cmd/intrd/Makefile b/usr/src/cmd/intrd/Makefile
index 45e914fa57..ff31927be3 100644
--- a/usr/src/cmd/intrd/Makefile
+++ b/usr/src/cmd/intrd/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for interrupt distribution daemon
#
@@ -40,7 +38,6 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)
# install macros and rule
#
-GROUP= bin
ROOTPROG= $(ROOTLIB)/$(PROG)
$(ROOTPROG) := FILEMODE= 555
diff --git a/usr/src/cmd/intrstat/Makefile.com b/usr/src/cmd/intrstat/Makefile.com
index 7aeddc3caf..199da08a00 100644
--- a/usr/src/cmd/intrstat/Makefile.com
+++ b/usr/src/cmd/intrstat/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = intrstat
OBJS = intrstat.o
@@ -36,7 +34,6 @@ CFLAGS64 += $(CCVERBOSE)
LDLIBS += -ldtrace
FILEMODE = 0555
-GROUP = bin
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/ipf/etc/Makefile b/usr/src/cmd/ipf/etc/Makefile
index afe39fa704..3e06187ae9 100644
--- a/usr/src/cmd/ipf/etc/Makefile
+++ b/usr/src/cmd/ipf/etc/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
#cmd/ipf/etc/Makefile
#
@@ -40,8 +38,6 @@ DIRS= $(ETCIPF)
ETCIPFPROG= $(IPFPROG:%=$(ETCIPF)/%)
$(ETCIPFPROG):= FILEMODE= 0644
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/ipf/examples/Makefile b/usr/src/cmd/ipf/examples/Makefile
index 962cd675e2..aba12bbffc 100644
--- a/usr/src/cmd/ipf/examples/Makefile
+++ b/usr/src/cmd/ipf/examples/Makefile
@@ -45,8 +45,6 @@ IPFEXAMPLES= $(EXAMPLES:%=$(SHAREIPFX)/%)
IPFEXSHPROG= $(SHPROG:%=$(SHAREIPFX)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= bin
$(IPFEXSHPROG):=FILEMODE= 0755
diff --git a/usr/src/cmd/ipf/tools/Makefile b/usr/src/cmd/ipf/tools/Makefile
index ca3774fc29..0562aca48e 100644
--- a/usr/src/cmd/ipf/tools/Makefile
+++ b/usr/src/cmd/ipf/tools/Makefile
@@ -37,11 +37,8 @@ USRLIBIPF= $(ROOTLIB)/ipf
USRLIBIPFLICENCE= $(LICENCE:%=$(USRLIBIPF)/%)
FILEMODE= 0755
-OWNER= root
-GROUP= sys
$(USRLIBIPFLICENCE):=FILEMODE= 0644
-$(USRLIBIPFLICENCE):=GROUP= bin
all:= TARGET= all
install:= TARGET= install
diff --git a/usr/src/cmd/isalist/Makefile b/usr/src/cmd/isalist/Makefile
index a07c99b754..7ece4027f8 100644
--- a/usr/src/cmd/isalist/Makefile
+++ b/usr/src/cmd/isalist/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1996,1998 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= isalist
@@ -33,7 +30,6 @@ OBJS= isalist.o
include ../Makefile.cmd
FILEMODE= 0555
-GROUP= bin
.KEEP_STATE:
@@ -48,7 +44,7 @@ install: all $(ROOTPROG) $(ROOTSHFILES)
$(PROG): $(OBJS)
$(LINK.c) -o $(PROG) $(OBJS) $(LDLIBS)
$(POST_PROCESS)
-
+
clean:
-$(RM) $(OBJS)
diff --git a/usr/src/cmd/iscsi/iscsitadm/Makefile b/usr/src/cmd/iscsi/iscsitadm/Makefile
index 5761bbcb95..f8d91cd936 100644
--- a/usr/src/cmd/iscsi/iscsitadm/Makefile
+++ b/usr/src/cmd/iscsi/iscsitadm/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
PROG = iscsitadm
OBJS = main.o helper.o cmdparse.o
@@ -37,7 +35,6 @@ LDLIBS += -liscsitgt
XMLLIB = -lxml2
CFLAGS += $(CCVERBOSE) -I${ISCSICOMMONDIR}
FILEMODE= 0555
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/iscsi/iscsitgtd/Makefile b/usr/src/cmd/iscsi/iscsitgtd/Makefile
index 7c773d13b3..1c8e5c7ed5 100644
--- a/usr/src/cmd/iscsi/iscsitgtd/Makefile
+++ b/usr/src/cmd/iscsi/iscsitgtd/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= iscsitgtd
OBJS = main.o mgmt.o mgmt_create.o mgmt_list.o mgmt_modify.o mgmt_remove.o
@@ -46,8 +44,6 @@ MANIFEST = iscsi_target.xml
SVCMETHOD = svc-iscsitgt
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
-$(ROOTSVCSYSTEM)/iscsi_target.xml := OWNER = root
-$(ROOTSVCSYSTEM)/iscsi_target.xml := GROUP = bin
$(ROOTSVCSYSTEM)/iscsi_target.xml := FILEMODE = 0444
DLIBSRCS = iscsi.d
diff --git a/usr/src/cmd/iscsi/iscsitgtd/Makefile.com b/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
index d6b53baf3d..213cd89990 100644
--- a/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
+++ b/usr/src/cmd/iscsi/iscsitgtd/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = iscsitgtd
@@ -52,8 +50,6 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_LARGEFILE64_SOURCE=1 -I/usr/include/libxml2
CFLAGS64 += $(CCVERBOSE)
-GROUP = sys
-
CLEANFILES += $(OBJS) ../$(DTRACE_HEADER)
.KEEP_STATE:
diff --git a/usr/src/cmd/iscsiadm/Makefile b/usr/src/cmd/iscsiadm/Makefile
index 297be0612d..c9585b3190 100644
--- a/usr/src/cmd/iscsiadm/Makefile
+++ b/usr/src/cmd/iscsiadm/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -38,7 +38,6 @@ CPPFLAGS += -DSOLARIS
CPPFLAGS += -I.
FILEMODE= 0555
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/iscsid/Makefile b/usr/src/cmd/iscsid/Makefile
index fb52a4d686..acd166d9a5 100644
--- a/usr/src/cmd/iscsid/Makefile
+++ b/usr/src/cmd/iscsid/Makefile
@@ -43,8 +43,6 @@ CCVERBOSE =
LDLIBS += -ldoor -lnsl
ROOTMANIFESTDIR= $(ROOTSVCNETWORKISCSI)
-$(ROOTSVCNETWORKISCSI)/iscsi-initiator.xml := OWNER = root
-$(ROOTSVCNETWORKISCSI)/iscsi-initiator.xml := GROUP = bin
$(ROOTSVCNETWORKISCSI)/iscsi-initiator.xml := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/iscsitsvc/Makefile b/usr/src/cmd/iscsitsvc/Makefile
index 953ff80c77..cd254649f0 100644
--- a/usr/src/cmd/iscsitsvc/Makefile
+++ b/usr/src/cmd/iscsitsvc/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -43,8 +43,6 @@ MANIFEST = iscsi-target.xml
SVCMETHOD = iscsi-target
ROOTMANIFESTDIR = $(ROOTSVCNETWORKISCSI)
-$(ROOTSVCNETWORKISCSI)/iscsi-target.xml := OWNER = root
-$(ROOTSVCNETWORKISCSI)/iscsi-target.xml := GROUP = bin
$(ROOTSVCNETWORKISCSI)/iscsi-target.xml := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/isns/isnsd/Makefile b/usr/src/cmd/isns/isnsd/Makefile
index 1fb763d371..48e642284a 100644
--- a/usr/src/cmd/isns/isnsd/Makefile
+++ b/usr/src/cmd/isns/isnsd/Makefile
@@ -44,8 +44,6 @@ ISNS_SVC = $(XML_DIR)/isns_server.xml
MANIFEST = isns_server.xml
ROOTMANIFESTDIR = $(ROOTSVCNETWORK)
-$(ROOTSVCNETWORK)/isns_server.xml := OWNER = root
-$(ROOTSVCNETWORK)/isns_server.xml := GROUP = bin
$(ROOTSVCNETWORK)/isns_server.xml := FILEMODE = 0444
CFLAGS += $(CCVERBOSE)
diff --git a/usr/src/cmd/java/Makefile b/usr/src/cmd/java/Makefile
index 450501b103..ead561c3d4 100644
--- a/usr/src/cmd/java/Makefile
+++ b/usr/src/cmd/java/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# Despite the name, this directory doesn't contain the Java Virtual Machine.
# It only contains base OS/Solaris files for improved integration of a
# Java Virtual Machine.
@@ -36,8 +33,6 @@ ADMINFILES= default_java
DIRMODE= 755
FILEMODE= 444
-OWNER= root
-GROUP= sys
SADM_DIR= $(ROOT)/var/sadm
SYSTEM_DIR= $(SADM_DIR)/system
diff --git a/usr/src/cmd/keyserv/Makefile b/usr/src/cmd/keyserv/Makefile
index f207a96db1..a02e26fcbb 100644
--- a/usr/src/cmd/keyserv/Makefile
+++ b/usr/src/cmd/keyserv/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
SBINPROG = keyserv newkey
BINPROG = keylogout keylogin domainname chkey
@@ -62,17 +60,8 @@ ISBINPROG= $(SBINPROG:%=$(ROOTUSRSBIN)/%)
ROOTMANIFESTDIR= $(ROOTSVCNETWORKRPC)
-$(ROOTUSRSBIN)/keyserv \
-$(ROOTUSRSBIN)/newkey := OWNER= root
-$(ROOTUSRSBIN)/keyserv \
-$(ROOTUSRSBIN)/newkey := GROUP= sys
-
-$(ROOTBIN)/chkey := OWNER= root
-$(ROOTBIN)/chkey := GROUP= sys
$(ROOTBIN)/chkey := FILEMODE= 4555
-$(ROOTKEYSERVDFLT) := OWNER= root
-$(ROOTKEYSERVDFLT) := GROUP= sys
$(ROOTKEYSERVDFLT) := FILEMODE= 444
CPPFLAGS += -I. -I$(SRC)/lib/libnsl/include -I$(SRC)/lib/libsldap/common \
diff --git a/usr/src/cmd/ksh/Makefile.com b/usr/src/cmd/ksh/Makefile.com
index 1bfb543ba5..ed56ccd85b 100644
--- a/usr/src/cmd/ksh/Makefile.com
+++ b/usr/src/cmd/ksh/Makefile.com
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -42,7 +42,6 @@ LIBSHELLSRC=$(LIBSHELLBASE)/common/sh
SRCS= $(OBJECTS:%.o=$(LIBSHELLSRC)/%.c)
-GROUP= bin
LDLIBS += -lshell
# Set common AST build flags (e.g., needed to support the math stuff).
diff --git a/usr/src/cmd/ksh/builtins/Makefile b/usr/src/cmd/ksh/builtins/Makefile
index d697d90fd1..fcc92f323e 100644
--- a/usr/src/cmd/ksh/builtins/Makefile
+++ b/usr/src/cmd/ksh/builtins/Makefile
@@ -53,8 +53,6 @@ include ../../Makefile.cmd
ROOTALIASPROG= $(ALIASPROG:%=$(ROOTBIN)/%)
FILEMODE= 555
-OWNER= root
-GROUP= bin
.KEEP_STATE:
@@ -75,7 +73,6 @@ OBJECTS= \
SRCS= $(OBJECTS:%.o=%.c)
-GROUP= bin
LDLIBS += -lshell -last
CPPFLAGS = \
diff --git a/usr/src/cmd/last/Makefile b/usr/src/cmd/last/Makefile
index 3df181266f..82cbb69386 100644
--- a/usr/src/cmd/last/Makefile
+++ b/usr/src/cmd/last/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/last/Makefile
#
@@ -38,8 +34,6 @@ ETCTOVARADM= ../var/adm
include ../Makefile.cmd
$(ROOTUTMPS):= FILEMODE= 644
-$(ROOTUTMPS):= OWNER= adm
-$(ROOTUTMPS):= GROUP= adm
$(ROOTADM)/%: %
$(INS.file)
@@ -49,7 +43,6 @@ $(UTMPS):
symlinks_% : %
-$(RM) $(ROOTETC)/$< ; $(SYMLINK) $(ETCTOVARADM)/$< $(ROOTETC)/$<
- $(CH)@-$(CHOWN) adm $(ROOTETC)/$< ; $(CHGRP) adm $(ROOTETC)/$<
.KEEP_STATE:
diff --git a/usr/src/cmd/lastcomm/Makefile b/usr/src/cmd/lastcomm/Makefile
index 79d8b9e419..8d875b71ac 100644
--- a/usr/src/cmd/lastcomm/Makefile
+++ b/usr/src/cmd/lastcomm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# cmd/lastcomm/Makefile
#
@@ -42,7 +39,6 @@ LDLIBS += -lexacct
CFLAGS += $(CCVERBOSE)
FILEMODE = 0555
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/ldap/Makefile.com b/usr/src/cmd/ldap/Makefile.com
index 66d30ddf8c..dde56eadc2 100644
--- a/usr/src/cmd/ldap/Makefile.com
+++ b/usr/src/cmd/ldap/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/ldap/Makefile.com
# Native LDAP II commands (makestyle clean).
#
@@ -84,8 +82,6 @@ CLOBBERFILES += $(OBJS) $(PROG) $(LDAPCLIENTPROG) $(LDAPADDENTPROG) \
# creating /var/ldap directory
ROOTVAR_LDAP= $(ROOT)/var/ldap
-$(ROOTVAR_LDAP) := OWNER= root
-$(ROOTVAR_LDAP) := GROUP= sys
all:= TARGET= all
install:= TARGET= install
diff --git a/usr/src/cmd/ldapcachemgr/Makefile b/usr/src/cmd/ldapcachemgr/Makefile
index 5e8724bedd..46f61f28b8 100644
--- a/usr/src/cmd/ldapcachemgr/Makefile
+++ b/usr/src/cmd/ldapcachemgr/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= ldap_cachemgr
@@ -67,8 +65,6 @@ LDLIBS += -lumem -lsldap
# install macros and rule
#
-GROUP= bin
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/lgrpinfo/Makefile b/usr/src/cmd/lgrpinfo/Makefile
index e3669c5562..cc227edfea 100644
--- a/usr/src/cmd/lgrpinfo/Makefile
+++ b/usr/src/cmd/lgrpinfo/Makefile
@@ -20,19 +20,14 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= lgrpinfo
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
TARGET= all
.KEEP_STATE:
diff --git a/usr/src/cmd/listen/Makefile b/usr/src/cmd/listen/Makefile
index 97f5c541cb..5fa1bfe3c2 100644
--- a/usr/src/cmd/listen/Makefile
+++ b/usr/src/cmd/listen/Makefile
@@ -20,18 +20,16 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= listen nlps_server
DBGOBJ = doprnt.o
DBGSRC = doprnt.c
-
+
LSOBJS = listen.o lslog.o lsdbf.o lsdata.o nstoa.o nlsaddr.o
-
+
NLPSOBJS = nlps_serv.o lsdbf.o lssmb.o nstoa.o lslog.o lsdata.o
OBJS= $(LSOBJS) $(NLPSOBJS)
@@ -57,8 +55,6 @@ ROOTSAFPROG= $(PROG:%=$(LIBSAFD)/%)
LDLIBS += -lnsl
LDFLAGS += $(MAPFILE.NGB:%=-M%)
LINTFLAGS = -b -x
-OWNER= root
-GROUP= sys
FILEMODE= 0755
$(LIBSAFD)/% : %
diff --git a/usr/src/cmd/lockstat/Makefile.com b/usr/src/cmd/lockstat/Makefile.com
index fe4c39adbe..ce70c62218 100644
--- a/usr/src/cmd/lockstat/Makefile.com
+++ b/usr/src/cmd/lockstat/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= lockstat
OBJS= lockstat.o sym.o
@@ -38,7 +36,6 @@ LINTFLAGS += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
LINTFLAGS64 += -xerroff=E_SEC_SPRINTF_UNBOUNDED_COPY
FILEMODE= 0555
-GROUP= bin
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/logadm/Makefile b/usr/src/cmd/logadm/Makefile
index f13741a819..572fa41ba0 100644
--- a/usr/src/cmd/logadm/Makefile
+++ b/usr/src/cmd/logadm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= logadm
TESTS= conftest globtest kwtest luttest optstest
@@ -40,8 +37,6 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64
XGETFLAGS += -a -x logadm.xcl
$(ROOTETC)/$(CONFIGFILE):= FILEMODE= 644
-$(ROOTETC)/$(CONFIGFILE):= OWNER= root
-$(ROOTETC)/$(CONFIGFILE):= GROUP= sys
CLOBBERFILES += $(TESTS)
diff --git a/usr/src/cmd/login/Makefile b/usr/src/cmd/login/Makefile
index a56995a813..d4962f4fd1 100644
--- a/usr/src/cmd/login/Makefile
+++ b/usr/src/cmd/login/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= login
OBJS= login.o login_audit.o
@@ -39,9 +37,7 @@ LOGINDEVPERMSRC= $(LOGINDEVPERM).sh
ROOTLOGINDEVPERM= $(LOGINDEVPERM:%=$(ROOTETC)/%)
$(ROOTLOGINDEVPERM) := FILEMODE = 644
-$(ROOTLOGINDEVPERM) := GROUP = sys
FILEMODE= 4555
-OWNER= root
CLOBBERFILES += $(LOGINDEVPERM) $(ONC_SRCS)
diff --git a/usr/src/cmd/lp/Makefile b/usr/src/cmd/lp/Makefile
index 0ebfa7228d..51baf75bc2 100644
--- a/usr/src/cmd/lp/Makefile
+++ b/usr/src/cmd/lp/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ./Makefile.lp
@@ -81,8 +79,6 @@ $(ROOTVARSP)/lp := DIRMODE = 775
$(ROOTVARSP)/lp/admins := DIRMODE = 775
$(ROOTVARSP)/lp/requests := DIRMODE = 775
$(ROOTVARSP)/lp/system := DIRMODE = 775
-$(LPOWNSDIRS) := OWNER = lp
-$(LPOWNSDIRS) := GROUP = lp
$(ROOTLIB)/print := DIRMODE = 0755
POFILE= lp.po
diff --git a/usr/src/cmd/lp/Makefile.lp b/usr/src/cmd/lp/Makefile.lp
index 4a9d4d09cd..927414b9b9 100644
--- a/usr/src/cmd/lp/Makefile.lp
+++ b/usr/src/cmd/lp/Makefile.lp
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# cmd/lp/Makefile.lp
@@ -45,13 +43,6 @@ ROOTLIBLPLOCL = $(ROOTLIBLP)/local
ROOTUSRUCB= $(ROOT)/usr/ucb
-#
-# Typical owner and group for LP things. These can be overridden
-# in the individual makefiles.
-#
-OWNER = root
-GROUP = lp
-SUPER = root
#
# $(EMODES): Modes for executables
diff --git a/usr/src/cmd/lp/cmd/Makefile b/usr/src/cmd/lp/cmd/Makefile
index 9a2e08d07f..54b6369a00 100644
--- a/usr/src/cmd/lp/cmd/Makefile
+++ b/usr/src/cmd/lp/cmd/Makefile
@@ -20,18 +20,12 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
include ../Makefile.lp
-OWNER = root
-
SUBDIRS = lptest lpadmin lpsched scripts
LOCALPROG = lpshut
diff --git a/usr/src/cmd/lp/crontab/Makefile b/usr/src/cmd/lp/crontab/Makefile
index b24b4de67d..8dab8c1ab5 100644
--- a/usr/src/cmd/lp/crontab/Makefile
+++ b/usr/src/cmd/lp/crontab/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/crontab/Makefile
#
@@ -35,8 +32,6 @@ PROG = lp
ROOTCRONTABPROG = $(PROG:%=$(ROOTCRONTABS)/%)
-OWNER = root
-GROUP = root
FILEMODE = 400
.KEEP_STATE:
diff --git a/usr/src/cmd/lp/filter/postscript/font/devpost/charlib/Makefile b/usr/src/cmd/lp/filter/postscript/font/devpost/charlib/Makefile
index 1c3ccb908d..0aeba80dd2 100644
--- a/usr/src/cmd/lp/filter/postscript/font/devpost/charlib/Makefile
+++ b/usr/src/cmd/lp/filter/postscript/font/devpost/charlib/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/filter/postscript/font/devpost/charlib/Makefile
#
@@ -51,8 +48,6 @@ all: $(FILES)
install: all $(ROOTCHARLIB) $(ROOTFILES)
$(RM) $(ROOTCHARLIB)/~=
$(INS) -m $(FILEMODE) -f $(ROOTCHARLIB) ~=
- $(CH)$(CHOWN) $(OWNER) $(ROOTCHARLIB)/~=
- $(CH)$(CHGRP) $(GROUP) $(ROOTCHARLIB)/~=
$(ROOTCHARLIB):
$(INS.dir)
diff --git a/usr/src/cmd/lp/model/netpr/Makefile b/usr/src/cmd/lp/model/netpr/Makefile
index e5e1c1394d..f447336bc3 100644
--- a/usr/src/cmd/lp/model/netpr/Makefile
+++ b/usr/src/cmd/lp/model/netpr/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/lp/model/netpr
@@ -73,8 +70,6 @@ ROOTLIBLPBIN = $(ROOTLIBLP)/bin
ROOTNETPRPROG = $(PROG:%=$(ROOTLIBLPBIN)/%)
FILEMODE= 04511
-OWNER= root
-GROUP= bin
POFILE= lp_model_netpr.po
diff --git a/usr/src/cmd/lp/terminfo/Makefile b/usr/src/cmd/lp/terminfo/Makefile
index 825173cb25..b94f821b6b 100644
--- a/usr/src/cmd/lp/terminfo/Makefile
+++ b/usr/src/cmd/lp/terminfo/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989,1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/terminfo/Makefile
#
@@ -43,7 +39,6 @@ TMPSRC = terminfo.src
DIRMODE= 755
FILEMODE= 644
-GROUP= bin
.KEEP_STATE:
@@ -62,8 +57,6 @@ install : all $(ROOTTERMINFO) $(ROOTTERMINFO)/P/PS
$(ROOTTERMINFO)/P/PS: $(TMPSRC)
TERMINFO=$(ROOTTERMINFO) 2>&1 $(TIC) -v $(TMPSRC) > errs
- $(CHOWN) -R $(OWNER) $(ROOTTERMINFO)
- $(CHGRP) -R $(GROUP) $(ROOTTERMINFO)
@$(ECHO) "\n`2>/dev/null cat errs|wc -l` entries have been compiled\n"
@-( 2>/dev/null cat errs|grep -iv "^mkdir"|grep -iv "^create"|grep -iv "^link"|grep -vi $(TMPSRC)|grep -vi touch|grep -vi "working"; \
if [ $$? -ne 0 ] ; \
diff --git a/usr/src/cmd/lvm/etc/Makefile b/usr/src/cmd/lvm/etc/Makefile
index 6abf453f21..ec076d7635 100644
--- a/usr/src/cmd/lvm/etc/Makefile
+++ b/usr/src/cmd/lvm/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile for logical volume management
@@ -60,26 +56,12 @@ ETCFLASHPREPROG= $(FLASHPREPROG:%=$(ETCFLASHPRED)/%)
ETCFLASHPOSTPROG= $(FLASHPOSTPROG:%=$(ETCFLASHPOSTD)/%)
$(ETCLVMD) := DIRMODE= 755
-$(ETCLVMD) := OWNER= root
-$(ETCLVMD) := GROUP= sys
$(ETCFLASHD) := DIRMODE= 755
-$(ETCFLASHD) := OWNER= root
-$(ETCFLASHD) := GROUP= sys
$(ETCFLASHPRED) := DIRMODE= 755
-$(ETCFLASHPRED) := OWNER= root
-$(ETCFLASHPRED) := GROUP= sys
$(ETCFLASHPOSTD) := DIRMODE= 755
-$(ETCFLASHPOSTD) := OWNER= root
-$(ETCFLASHPOSTD) := GROUP= sys
$(ETCLVMINITPROG) := FILEMODE= 0644
-$(ETCLVMINITPROG) := OWNER= root
-$(ETCLVMINITPROG) := GROUP= sys
$(ETCFLASHPREPROG) := FILEMODE= 0744
-$(ETCFLASHPREPROG) := OWNER= root
-$(ETCFLASHPREPROG) := GROUP= sys
$(ETCFLASHPOSTPROG) := FILEMODE= 0744
-$(ETCFLASHPOSTPROG) := OWNER= root
-$(ETCFLASHPOSTPROG) := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/lvm/metassist/Makefile.targ b/usr/src/cmd/lvm/metassist/Makefile.targ
index 8d6c40ea9e..e818705bfe 100644
--- a/usr/src/cmd/lvm/metassist/Makefile.targ
+++ b/usr/src/cmd/lvm/metassist/Makefile.targ
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Suffixes for files that flag a particular check
SUFFIX_LINT = .lint
@@ -56,8 +54,6 @@ ROOTXML= $(ROOTSHLIB)/xml
# Rule/definitions for DTDs
ROOTXMLDTD= $(ROOTXML)/dtd
ROOTXMLDTDFILES= $(DTDFILES:%=$(ROOTXMLDTD)/%)
-$(ROOTXMLDTDFILES) := OWNER = root
-$(ROOTXMLDTDFILES) := GROUP = sys
$(ROOTXMLDTDFILES) := FILEMODE = 0444
$(ROOTXMLDTD)/%: %
@@ -66,8 +62,6 @@ $(ROOTXMLDTD)/%: %
# Rule/definitions for XSL style sheets
ROOTXMLSTYLE= $(ROOTXML)/style
ROOTXMLSTYLEFILES= $(STYLEFILES:%=$(ROOTXMLSTYLE)/%)
-$(ROOTXMLSTYLEFILES) := OWNER = root
-$(ROOTXMLSTYLEFILES) := GROUP = sys
$(ROOTXMLSTYLEFILES) := FILEMODE = 0444
$(ROOTXMLSTYLE)/%: %
diff --git a/usr/src/cmd/mail/Makefile b/usr/src/cmd/mail/Makefile
index 60b75264fe..1767d857be 100644
--- a/usr/src/cmd/mail/Makefile
+++ b/usr/src/cmd/mail/Makefile
@@ -20,11 +20,9 @@
#
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
BINPROG= mail
@@ -92,7 +90,6 @@ lint:= TARGET= lint
$(ROOTBIN)/mail := FILEMODE = 02511
-$(ROOTBIN)/mail := GROUP = mail
# install rules
diff --git a/usr/src/cmd/mailx/Makefile b/usr/src/cmd/mailx/Makefile
index c88a69da70..ef3be971b6 100644
--- a/usr/src/cmd/mailx/Makefile
+++ b/usr/src/cmd/mailx/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/mailx/Makefile
PROG= mailx
@@ -59,7 +57,6 @@ ROOTUCBMAIL= $(ROOT)/usr/ucb/mail
ROOTUCBCAPMAIL= $(ROOT)/usr/ucb/Mail
$(ROOTPROG) := FILEMODE = 02511
-$(ROOTPROG) := GROUP = mail
$(ROOTMAILXHELP) := FILEMODE = 0644
$(ROOTMAILXRC) := FILEMODE = 0644
$(ROOTUCBMAILRC) := FILEMODE = 0644
diff --git a/usr/src/cmd/man/src/Makefile b/usr/src/cmd/man/src/Makefile
index b6f803559c..84bda2fdee 100644
--- a/usr/src/cmd/man/src/Makefile
+++ b/usr/src/cmd/man/src/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989,2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# Makefile for cmd/man/src
#
@@ -52,7 +48,6 @@ ROOTLIBPROG = $(LIBPROG:%=$(ROOTLIB)/%)
ROOTLIBSHELL = $(LIBSHELL:%=$(ROOTLIB)/%)
ROOTLNKPROG = $(LNKPROG:%=$(ROOTBIN)/%)
-OWNER = root
# for messaging catalog files
POFILE= src.po
POFILES= $(SRCS:%.c=%.po)
diff --git a/usr/src/cmd/man/src/util/Makefile b/usr/src/cmd/man/src/util/Makefile
index 8ba3fcd163..b483b11f08 100644
--- a/usr/src/cmd/man/src/util/Makefile
+++ b/usr/src/cmd/man/src/util/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -107,7 +104,6 @@ ROOTTPT = $(TPTFILES:%=$(TPTDIR)/%)
CLOBBERFILES += $(LIBSHELL)
-GROUP = bin
FILEMODE = 0644
$(ROOTPROG) := FILEMODE = 0755
$(ROOTLIBSHELL) := FILEMODE = 0755
@@ -116,7 +112,10 @@ $(ROOTLIBSHELL) := FILEMODE = 0755
all : $(PROG) $(LIBSHELL)
-install : all $(PROGDIR) $(SGMLSHLIB) $(SGMLSHLIBLOCALE) $(SGMLSHLIBLOCALEC) $(SGMLDTDDIR) $(SGMLENTSDIR) $(ROOTPROG) $(ROOTLIBSHELL) $(TPTDIR) $(ROOTENTS) $(ROOTCATALOG) $(ROOTTPT) $(ROOTDOCBOOK) $(ROOTSOLBOOKV1) $(ROOTSOLBOOKV2)
+install : all $(PROGDIR) $(SGMLSHLIB) $(SGMLSHLIBLOCALE) \
+ $(SGMLSHLIBLOCALEC) $(SGMLDTDDIR) $(SGMLENTSDIR) $(ROOTPROG) \
+ $(ROOTLIBSHELL) $(TPTDIR) $(ROOTENTS) $(ROOTCATALOG) $(ROOTTPT) \
+ $(ROOTDOCBOOK) $(ROOTSOLBOOKV1) $(ROOTSOLBOOKV2)
$(PROGDIR) :
$(INS.dir)
diff --git a/usr/src/cmd/man/src/util/solbookv2/Makefile b/usr/src/cmd/man/src/util/solbookv2/Makefile
index 35b2092064..471f919a69 100644
--- a/usr/src/cmd/man/src/util/solbookv2/Makefile
+++ b/usr/src/cmd/man/src/util/solbookv2/Makefile
@@ -20,13 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Makefile for cmd/man/src
-#
include ../../../../Makefile.cmd
@@ -41,7 +37,6 @@ SOLBOOKV2DIR = $(SGMLDTDDIR)/solbookv2
ROOTSOLBOOKV2 = $(SOLBOOKV2:%=$(SOLBOOKV2DIR)/%)
-GROUP = bin
FILEMODE = 0644
.KEEP_STATE :
diff --git a/usr/src/cmd/mdb/Makefile.kmdb b/usr/src/cmd/mdb/Makefile.kmdb
index 63d3a2f888..73a92663f8 100644
--- a/usr/src/cmd/mdb/Makefile.kmdb
+++ b/usr/src/cmd/mdb/Makefile.kmdb
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -121,7 +121,6 @@ $(KCTLTGTS) := ASFLAGS += -D_KERNEL
ffs.o ffs.ln := CPPFLAGS += -Dffs=mdb_ffs
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
$(ROOTMISC) $(ROOTMISC64) := FILEMODE = 0755
diff --git a/usr/src/cmd/mdb/Makefile.module b/usr/src/cmd/mdb/Makefile.module
index f81732dbc7..c7d0fd23db 100644
--- a/usr/src/cmd/mdb/Makefile.module
+++ b/usr/src/cmd/mdb/Makefile.module
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
.KEEP_STATE:
.SUFFIXES:
@@ -124,8 +123,6 @@ $(KMODOBJS) := CFLAGS64 += $(STAND_FLAGS_64)
#
MODSRCS_DIR = ../../../common/modules/genunix
-GROUP = sys
-
all: $$(TARGETS)
install: all $$(ROOTTGTS)
diff --git a/usr/src/cmd/mdb/demo/Makefile b/usr/src/cmd/mdb/demo/Makefile
index 1985cb2cfa..ed3acaf5cb 100644
--- a/usr/src/cmd/mdb/demo/Makefile
+++ b/usr/src/cmd/mdb/demo/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
#
# Note that this Makefile is *not* the Makefile that is installed in the proto
@@ -70,14 +68,8 @@ $(ROOTDEMOFILES): $(ROOTDEMOSUBDIRS)
$(ROOTDEMOSUBDIRS): $(ROOTDEMODIR)
-$(ROOTDEMODIR) := OWNER = root
-$(ROOTDEMODIR) := GROUP = bin
$(ROOTDEMODIR) := DIRMODE = 755
-$(ROOTDEMOSUBDIRS) := OWNER = root
-$(ROOTDEMOSUBDIRS) := GROUP = bin
$(ROOTDEMOSUBDIRS) := DIRMODE = 755
-$(ROOTDEMOFILES) := OWNER = root
-$(ROOTDEMOFILES) := GROUP = bin
$(ROOTDEMOFILES) := FILEMODE = 644
diff --git a/usr/src/cmd/mkmsgs/Makefile b/usr/src/cmd/mkmsgs/Makefile
index cf9c57c9dd..e9b08e6c01 100644
--- a/usr/src/cmd/mkmsgs/Makefile
+++ b/usr/src/cmd/mkmsgs/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= mkmsgs
@@ -30,8 +27,6 @@ PROG= mkmsgs
include ../Makefile.cmd
LDLIBS += -lgen
-OWNER = root
-GROUP = root
.KEEP_STATE:
diff --git a/usr/src/cmd/modload/Makefile b/usr/src/cmd/modload/Makefile
index 94717f6673..b76e58e6aa 100644
--- a/usr/src/cmd/modload/Makefile
+++ b/usr/src/cmd/modload/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/modload/Makefile
@@ -41,7 +37,6 @@ ETCSEC = $(ROOTETC)/security
XPRIV = $(ETCSEC)/extra_privs
$(XPRIV) := FILEMODE = 644
-$(XPRIV) := GROUP = sys
$(64ONLY)SUBDIRS= $(MACH)
$(BUILD64)SUBDIRS += $(MACH64)
diff --git a/usr/src/cmd/mvdir/Makefile b/usr/src/cmd/mvdir/Makefile
index d8920cc05f..1b5c3f15dd 100644
--- a/usr/src/cmd/mvdir/Makefile
+++ b/usr/src/cmd/mvdir/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= mvdir
@@ -32,7 +29,6 @@ SRCS= $(PROG:%=%.sh)
include ../Makefile.cmd
FILEMODE= 0555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/netadm/Makefile b/usr/src/cmd/netadm/Makefile
index 93cf1be771..47288bb4dd 100644
--- a/usr/src/cmd/netadm/Makefile
+++ b/usr/src/cmd/netadm/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -54,8 +51,6 @@ ROOTETCPM = $(ETCPM:%=$(ETCPMD)/%)
ROOTVARPM = $(PMLOG:%=$(VARPMD)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= sys
$(ETCSAFD)/% : %
$(INS.file)
diff --git a/usr/src/cmd/netadm/etc/Makefile b/usr/src/cmd/netadm/etc/Makefile
index 556d4a93ca..a0dc5b492f 100644
--- a/usr/src/cmd/netadm/etc/Makefile
+++ b/usr/src/cmd/netadm/etc/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile for /etc/flash/
@@ -42,14 +39,8 @@ DIRS= $(ETCFLASHD) $(ETCFLASHPOSTD)
ETCFLASHPOSTPROG= $(FLASHPOSTPROG:%=$(ETCFLASHPOSTD)/%)
$(ETCFLASHD) := DIRMODE= 755
-$(ETCFLASHD) := OWNER= root
-$(ETCFLASHD) := GROUP= sys
$(ETCFLASHPOSTD) := DIRMODE= 755
-$(ETCFLASHPOSTD) := OWNER= root
-$(ETCFLASHPOSTD) := GROUP= sys
$(ETCFLASHPOSTPROG) := FILEMODE= 0744
-$(ETCFLASHPOSTPROG) := OWNER= root
-$(ETCFLASHPOSTPROG) := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/netfiles/Makefile b/usr/src/cmd/netfiles/Makefile
index 4f21e795c8..d00e9dac16 100644
--- a/usr/src/cmd/netfiles/Makefile
+++ b/usr/src/cmd/netfiles/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -48,8 +48,6 @@ ITICOTSORDFILES= $(FILES:%=$(TICOTSORD)/%)
IETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= sys
$(TICLTS)/% $(TICOTS)/% $(TICOTSORD)/% $(ROOTETC)/%: %
$(INS.file)
diff --git a/usr/src/cmd/newgrp/Makefile b/usr/src/cmd/newgrp/Makefile
index 6648a3c4c8..a1a845dd7e 100644
--- a/usr/src/cmd/newgrp/Makefile
+++ b/usr/src/cmd/newgrp/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 1989,2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,8 +28,6 @@ include ../Makefile.cmd
LDLIBS += -lbsm
FILEMODE = 04755
-OWNER = root
-GROUP = sys
XGETFLAGS += -a -x newgrp.xcl
.KEEP_STATE:
diff --git a/usr/src/cmd/news/Makefile b/usr/src/cmd/news/Makefile
index 820d39ba52..9649f6b17c 100644
--- a/usr/src/cmd/news/Makefile
+++ b/usr/src/cmd/news/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= news
@@ -32,20 +29,12 @@ include ../Makefile.cmd
VARNEWSD= $(ROOT)/var/news
DIRS= $(VARNEWSD)
-# owner and group set in Targetdirs
-#DIRS := OWNER = root
-#DIRS := GROUP = sys
-
.KEEP_STATE:
all: $(PROG)
install: all $(ROOTPROG)
-# Don't re-install dirs already installed by Targetdirs
-#$(DIRS):
-# $(INS.dir)
-
clean:
lint: lint_PROG
diff --git a/usr/src/cmd/newtask/Makefile.com b/usr/src/cmd/newtask/Makefile.com
index cf3fefaff4..a358d0d56e 100644
--- a/usr/src/cmd/newtask/Makefile.com
+++ b/usr/src/cmd/newtask/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/newtask/Makefile.com
PROG= newtask
@@ -32,7 +29,6 @@ OBJS= newtask.o utils.o
SRCS= $(OBJS:%.o=../%.c)
FILEMODE= 4555
-GROUP= sys
LDLIBS += -lproc -lproject -lsecdb
CFLAGS += $(CCVERBOSE)
diff --git a/usr/src/cmd/nlsadmin/Makefile b/usr/src/cmd/nlsadmin/Makefile
index cee25ee83b..c80378fa23 100644
--- a/usr/src/cmd/nlsadmin/Makefile
+++ b/usr/src/cmd/nlsadmin/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,18 +18,14 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= nlsadmin
include ../Makefile.cmd
-OWNER= root
-GROUP= adm
FILEMODE= 0755
.KEEP_STATE:
diff --git a/usr/src/cmd/nsadmin/Makefile b/usr/src/cmd/nsadmin/Makefile
index 601d2dd963..c9008fc47a 100644
--- a/usr/src/cmd/nsadmin/Makefile
+++ b/usr/src/cmd/nsadmin/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
PROG= profile .login ksh.kshrc system
PROGSKEL= local.login local.profile local.cshrc
@@ -32,8 +31,6 @@ include ../Makefile.cmd
ROOTETCSKEL= $(ROOTETC)/skel
ROOTETCSKELPROG= $(PROGSKEL:%=$(ROOTETCSKEL)/%)
FILEMODE= 0644
-OWNER= root
-GROUP= sys
.login: login.csh
$(RM) .login; $(CP) login.csh .login
diff --git a/usr/src/cmd/nscd/Makefile b/usr/src/cmd/nscd/Makefile
index bfaab29b71..222b306943 100644
--- a/usr/src/cmd/nscd/Makefile
+++ b/usr/src/cmd/nscd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for name service cache daemon
#
@@ -80,7 +78,6 @@ NISPROGLIBS= $(LDLIBS) -lnsl
# install macros and rule
#
-GROUP= bin
ROOTPROG= ${ROOTUSRSBIN}/nscd
ROOTNISPROG= ${ROOTLIB}/nscd_nischeck
diff --git a/usr/src/cmd/oamuser/group/Makefile b/usr/src/cmd/oamuser/group/Makefile
index bc7fb66d87..c4c39b56f4 100644
--- a/usr/src/cmd/oamuser/group/Makefile
+++ b/usr/src/cmd/oamuser/group/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/oamuser/group/Makefile
@@ -55,8 +51,6 @@ INSSBINPROG= $(SBINPROG:%=$(ROOTUSRSBIN)/%)
CPPFLAGS= -I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
FILEMODE= 0555
-OWNER= root
-GROUP= sys
$(GROUPADD) := OBJS = $(ADD_OBJ)
$(GROUPADD) := LDLIBS += $(LIBUSRGRP)
diff --git a/usr/src/cmd/oamuser/user/Makefile b/usr/src/cmd/oamuser/user/Makefile
index 5db7d34c18..c5c66de0ca 100644
--- a/usr/src/cmd/oamuser/user/Makefile
+++ b/usr/src/cmd/oamuser/user/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/oamuser/user/Makefile
#
@@ -77,15 +75,10 @@ INSSBINPROG= $(SBINPROG:%=$(ROOTUSRSBIN)/%)
INSSKELFILE= $(SKELFILE:%=$(ROOTSKEL)/%)
CPPFLAGS= -I$(HERE) -I$(LOCAL) $(CPPFLAGS.master)
-OWNER= root
-GROUP= sys
$(INSSBINPROG) := FILEMODE = 0555
$(INSSYSADMPROG):= FILEMODE = 0500
$(INSSKELFILE) := FILEMODE = 0644
-$(INSSKELFILE) := GROUP = other
-$(ROOTSKEL) := OWNER = root
-$(ROOTSKEL) := GROUP = sys
$(USERADD) := OBJS = $(ADD_OBJ)
$(USERADD) := LIBS = $(LIBUSRGRP)
diff --git a/usr/src/cmd/oplhpd/Makefile b/usr/src/cmd/oplhpd/Makefile
index c654d8c19f..2619136962 100644
--- a/usr/src/cmd/oplhpd/Makefile
+++ b/usr/src/cmd/oplhpd/Makefile
@@ -19,11 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
#
# cmd/oplhpd/Makefile
#
@@ -49,8 +48,6 @@ LDLIBS64 += -lsysevent -lnvpair -lcfgadm -ldevinfo
PSMPROG = $(USR_PSM_LIB64_DIR)/$(PROG)
$(PSMPROG) := FILEMODE = 0755
-$(PSMPROG) := OWNER = root
-$(PSMPROG) := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/passmgmt/Makefile b/usr/src/cmd/passmgmt/Makefile
index dde1b841a9..2c1391c2e9 100644
--- a/usr/src/cmd/passmgmt/Makefile
+++ b/usr/src/cmd/passmgmt/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 1990, 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
+
PROG= passmgmt
FILE= datemsk
@@ -33,8 +31,6 @@ TXTS= $(FILE)
include ../Makefile.cmd
FILEMODE= 0555
-OWNER= root
-GROUP= sys
RELSBIN= ../sbin
ROOTFILE= $(ROOTETC)/$(FILE)
ROOTSYMLINK= $(ROOTBIN)/$(PROG)
diff --git a/usr/src/cmd/passwd/Makefile b/usr/src/cmd/passwd/Makefile
index e3e178e8bd..7fb10be60d 100644
--- a/usr/src/cmd/passwd/Makefile
+++ b/usr/src/cmd/passwd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= passwd
DEFAULTFILES= passwd.dfl
@@ -36,8 +33,6 @@ lint := LDLIBS += -lpasswdutil
LDLIBS += -lbsm -lpam -lnsl
FILEMODE = 06555
-OWNER = root
-GROUP = sys
XGETFLAGS += -a -x $(PROG).xcl
.KEEP_STATE:
diff --git a/usr/src/cmd/pbind/Makefile.com b/usr/src/cmd/pbind/Makefile.com
index 7a18fa8c69..34d8d9d4ad 100644
--- a/usr/src/cmd/pbind/Makefile.com
+++ b/usr/src/cmd/pbind/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/pbind/Makefile.com
#
@@ -34,8 +31,6 @@ SRCS= $(OBJS:%.o=../%.c)
include ../../Makefile.cmd
-OWNER = root
-GROUP = sys
LDLIBS += -lproc
.KEEP_STATE:
diff --git a/usr/src/cmd/pcmciad/Makefile b/usr/src/cmd/pcmciad/Makefile
index 97509021af..ce2f5920f4 100644
--- a/usr/src/cmd/pcmciad/Makefile
+++ b/usr/src/cmd/pcmciad/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/pcmciad/Makefile
#
@@ -50,8 +47,6 @@ $(SOFILES) := LDFLAGS += $(ZTEXT)
ROOTLIBPROG= $(PROG:%=$(ROOTLIB)/%)
-OWNER= root
-GROUP= bin
FILEMODE= 555
all := TARGET= all
diff --git a/usr/src/cmd/perl/5.8.4/distrib/Makefile b/usr/src/cmd/perl/5.8.4/distrib/Makefile
index 861334a0f4..6d65441296 100644
--- a/usr/src/cmd/perl/5.8.4/distrib/Makefile
+++ b/usr/src/cmd/perl/5.8.4/distrib/Makefile
@@ -252,15 +252,12 @@ install_files:
$(RM) $(ROOTPROG)
$(LN) -s ../perl5/$(PERL_VERSION)/bin/perl $(ROOTPROG)
- @ $(CHOWN) $(OWNER):$(GROUP) $(ROOTPROG)
$(RM) $(PERL_ARCHLIB_DIR)/Config.pm
$(SED) $(SED_UN_CC) $(SED_UN_CC_E) $(PERL_CONFIG_PM) \
> $(PERL_ARCHLIB_DIR)/Config.pm
$(CHMOD) 444 $(PERL_ARCHLIB_DIR)/Config.pm
- @ $(CHOWN) -R $(OWNER):$(GROUP) $(PERL_ROOT_STEM)
-
install: all .WAIT install_files
#
diff --git a/usr/src/cmd/pgrep/Makefile b/usr/src/cmd/pgrep/Makefile
index a2450e500e..e97990cdbb 100644
--- a/usr/src/cmd/pgrep/Makefile
+++ b/usr/src/cmd/pgrep/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = pgrep
PKILLFILE = pkill
@@ -45,7 +43,6 @@ POFILE = ppgrep.po
XGETFLAGS = -a -x pgrep.xcl
FILEMODE = 0555
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/picld/Makefile b/usr/src/cmd/picl/picld/Makefile
index 8790db44e2..f555a18c92 100644
--- a/usr/src/cmd/picl/picld/Makefile
+++ b/usr/src/cmd/picl/picld/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= picld
@@ -36,8 +34,6 @@ ROOTMANIFESTDIR= $(ROOTSVCSYSTEM)
ROOTLIBPICLD= $(ROOTLIB)/picl
ROOTLIBPICLDDAEMON= $(PROG:%=$(ROOTLIBPICLD)/%)
-$(ROOTLIBPICLD) := OWNER= root
-$(ROOTLIBPICLD) := GROUP= sys
$(ROOTLIBPICLD) := FILEMODE= 755
CPPFLAGS += -I../../../lib/libpicltree -I../../../lib/libpicl
diff --git a/usr/src/cmd/picl/plugins/Makefile.com b/usr/src/cmd/picl/plugins/Makefile.com
index f692976b7e..a44481ed52 100644
--- a/usr/src/cmd/picl/plugins/Makefile.com
+++ b/usr/src/cmd/picl/plugins/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# There should be a mapfile here
MAPFILES =
@@ -39,32 +37,20 @@ CFLAGS += $(CCVERBOSE)
DYNFLAGS += $(ZNOLAZYLOAD)
ROOTLIBDIR := DIRMODE= 0755
-ROOTLIBDIR := OWNER= root
-ROOTLIBDIR := GROUP= sys
FILEMODE= 0755
DIRMODE= 0755
-OWNER= root
-GROUP= sys
ROOT_PLATFORM := DIRMODE= 0755
-ROOT_PLATFORM := OWNER= root
-ROOT_PLATFORM := GROUP= sys
ROOT_PLAT_LIBDIR = $(ROOT_PLATFORM)/lib
ROOT_PLAT_LIBDIR := DIRMODE= 0755
-ROOT_PLAT_LIBDIR := OWNER= root
-ROOT_PLAT_LIBDIR := GROUP= bin
ROOT_PLAT_PICLDIR = $(ROOT_PLAT_LIBDIR)/picl
ROOT_PLAT_PICLDIR := DIRMODE= 0755
-ROOT_PLAT_PICLDIR := OWNER= root
-ROOT_PLAT_PICLDIR := GROUP= sys
ROOT_PLAT_PLUGINDIR = $(ROOT_PLAT_PICLDIR)/plugins
ROOT_PLAT_PLUGINDIR := DIRMODE= 0755
-ROOT_PLAT_PLUGINDIR := OWNER= root
-ROOT_PLAT_PLUGINDIR := GROUP= sys
USR_LIB_PICLDIR = $(ROOT)/usr/lib/picl
USR_LIB_PLUGINDIR = $(USR_LIB_PICLDIR)/plugins
diff --git a/usr/src/cmd/picl/plugins/common/piclevent/Makefile b/usr/src/cmd/picl/plugins/common/piclevent/Makefile
index 16ca0e7419..c1ba0e2398 100644
--- a/usr/src/cmd/picl/plugins/common/piclevent/Makefile
+++ b/usr/src/cmd/picl/plugins/common/piclevent/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libpiclevent.a
VERS= .1
@@ -70,17 +67,6 @@ LDLIBS += -lc -lpicltree -lnvpair
LINTFLAGS += -L$(SRC)/lib/libpicltree/$(MACH) -lpicltree
-
-$(ROOTLIBSYSEVENTDIR) := OWNER= root
-$(ROOTLIBSYSEVENTDIR) := GROUP= bin
-
-$(ROOTLIBSYSEVENTMODDIR) := OWNER= root
-$(ROOTLIBSYSEVENTMODDIR) := GROUP= bin
-
-$(ROOTLIBSYSEVENTMODULES) := OWNER= root
-$(ROOTLIBSYSEVENTMODULES) := GROUP= bin
-
-
.KEEP_STATE:
SUBDIRS=
diff --git a/usr/src/cmd/picl/plugins/sun4u/blade/bsc/Makefile b/usr/src/cmd/picl/plugins/sun4u/blade/bsc/Makefile
index ca68a8e414..7274aede33 100644
--- a/usr/src/cmd/picl/plugins/sun4u/blade/bsc/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/bsc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/picl/plugins/sun4u/blade/bsc/Makefile
#
include $(SRC)/Makefile.psm
@@ -46,8 +43,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picllom.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/blade/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/blade/devtree/Makefile
index 308af6340c..22648acd00 100644
--- a/usr/src/cmd/picl/plugins/sun4u/blade/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/blade/devtree/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Serverblade1
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/blade/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/blade/fruaccess/Makefile
index 141465ac3a..c75189a6e4 100644
--- a/usr/src/cmd/picl/plugins/sun4u/blade/fruaccess/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/fruaccess/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/blade/fruaccess/Makefile
@@ -47,8 +43,6 @@ SRCDIR= ../../lib/fruaccess/.
LIBS= $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLATFORM)/lib
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF = fru_container.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/blade/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/blade/frudata/Makefile
index 4d327a34d2..0e76092544 100644
--- a/usr/src/cmd/picl/plugins/sun4u/blade/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/blade/frudata/Makefile
@@ -38,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Serverblade1
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/blade/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/blade/frutree/Makefile
index 06f40482cb..c71fdb90df 100644
--- a/usr/src/cmd/picl/plugins/sun4u/blade/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/blade/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/blade/frutree/Makefile
@@ -39,8 +35,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Serverblade1
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile
index 0c74720581..391bc77645 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/devtree/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/boston/devtree/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +35,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V445
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf picl_asr.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile
index 038f5a99a1..1d09484472 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/envmon/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/boston/frutree/Makefile
#
@@ -38,8 +36,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V445
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = piclenvmon.conf
ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile
index b4cf29a9b3..01da1eba92 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/frudata/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/boston/frudata/Makefile
#
@@ -38,8 +36,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V445
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile
index d1a309353d..a7d32c8460 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/boston/frudr/Makefile
#
include $(SRC)/Makefile.psm
@@ -38,8 +36,6 @@ FRUDR_LINKTO_PLATFORM = SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = fru_PS0.conf fru_PS1.conf fru_PS2.conf fru_PS3.conf
CONFS += fru_HDD0.conf fru_HDD1.conf fru_HDD2.conf
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile
index d310eb2d5d..cb4272fbe3 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/Makefile
@@ -20,13 +20,11 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/boston/frutree/Makefile
#
@@ -40,8 +38,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V445
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
INCDIR1 = .
INCDIR2 = ../frudr
diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile
index befb3a9b09..ce6525bcdd 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/chalupa/devtree/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile
index 7a8fa4491e..f6aa7e7964 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/envmon/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/chalupa/frutree/Makefile
@@ -37,8 +35,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = piclenvmon.conf
ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile
index eac3eda2b1..36eebd137e 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/chalupa/frudata/Makefile
@@ -38,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile
index 8916b76226..eae448ec55 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frudr/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/chalupa/frudr/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = fru_PS0.conf fru_PS1.conf
CONFS += fru_PSU0.conf fru_PSU1.conf fru_PSU2.conf fru_PSU3.conf
diff --git a/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile
index 55297778ad..a8bab74a81 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chalupa/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/chalupa/frutree/Makefile
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
INCDIR1 = .
INCDIR2 = ../frudr
diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile
index c06533b113..1532dd3343 100644
--- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/cherrystone/devtree/Makefile
#
@@ -37,8 +33,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com
ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-480R
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
install := FILEMODE = 0444
diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile
index bea5ec659a..f53806da57 100644
--- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/cherrystone/frudata/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-480R
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile
index b7624e4e85..f8cdfe960c 100644
--- a/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/cherrystone/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -50,8 +47,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile
index 0b5b429e47..b7f00d4e1d 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chicago/envd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/chicago/envd/Makefile
#
include $(SRC)/Makefile.psm
@@ -51,8 +48,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= envmodel.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile
index 68c861afe2..7c880814c8 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chicago/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/chicago/frudata/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,A70
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile
index 95bf367dc9..d968a8f8da 100644
--- a/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/chicago/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/chicago/frutree/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,A70
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -60,7 +55,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile
index 42e04d1420..e8ac4501da 100644
--- a/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/daktari/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# lib/picl/plugins/daktari/devtree/Makefile
#
@@ -37,8 +33,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com
ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-880
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
install := FILEMODE = 0444
diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile
index dd590e50d0..e0bb53d26e 100644
--- a/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/daktari/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/daktari/frudata/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-880
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile
index cc57a32152..fe246c15c3 100644
--- a/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/daktari/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -51,8 +48,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile
index aed1074e5a..8a82b9ee5a 100644
--- a/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/envd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/enchilada/envd/Makefile
#
include $(SRC)/Makefile.psm
@@ -51,8 +48,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= envmodel.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile
index 2fa84d9c94..742a6e15ea 100644
--- a/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/enchilada/frudata/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-2500
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile
index cd36e5dcd7..fb9ff5bce6 100644
--- a/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/enchilada/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/enchilada/frutree/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-2500
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -60,7 +55,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile
index c300e36daf..4ac6eea388 100644
--- a/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/ents/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/ents/devtree/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V250
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf picl_asr.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile
index 29ec2efe62..c187457c0b 100644
--- a/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/ents/envmon/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/ents/frutree/Makefile
@@ -37,8 +35,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V250
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = piclenvmon.conf
ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile
index 3596581b2a..03a1424c95 100644
--- a/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/ents/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/ents/frudata/Makefile
@@ -38,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V250
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile
index 7b6eb3aea0..ff0ac687ba 100644
--- a/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/ents/frudr/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,12 +18,9 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/ents/frudr/Makefile
#
@@ -41,8 +37,6 @@ FRUDR_LINKTO_PLATFORM = SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = fru_PS0.conf fru_PS1.conf
CONFS += fru_HDD0.conf fru_HDD1.conf fru_HDD2.conf
diff --git a/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile
index fc85c439ce..7a6132b8ef 100644
--- a/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/ents/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/ents/frutree/Makefile
@@ -37,8 +35,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V250
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
INCDIR1 = .
INCDIR2 = ../frudr
diff --git a/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile
index e8d724f802..8d1f065dee 100644
--- a/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/envmon/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/envmon/Makefile
#
include $(SRC)/Makefile.psm
@@ -46,8 +43,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile
index 388bca79a3..afe5362311 100644
--- a/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/envd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -50,8 +47,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= envmodel.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile
index f48f40d95b..00fda41e12 100644
--- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# lib/picl/plugins/sun4u/excalibur/frudata/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-1000
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile
index 52a6ce0e66..799e66fc55 100644
--- a/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/excalibur/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# lib/picl/plugins/sun4u/excalibur/frutree/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-1000
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -60,7 +54,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile
index fd2d2da169..988aa07611 100644
--- a/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libpiclfrudata.a
VERS= .1
@@ -45,8 +42,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CLEANFILES= $(LINTOUT) $(LINTLIB)
CLOBBERFILES += $(LIBLINKS)
diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile
index db1575873f..6002d0c4d9 100644
--- a/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/grover/envd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -48,8 +45,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= envmodel.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile
index 8525570ca5..c6f93ba6b4 100644
--- a/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/grover/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# lib/picl/plugins/sun4u/grover/frutree/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-100
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -60,7 +54,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile b/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile
index d9359605f3..05a2a87f81 100644
--- a/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/grover/memcfg/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -45,8 +42,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
index 036aec84d4..ab16c18b3f 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,9 +19,7 @@
# CDDL HEADER END
#
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/lib/fruaccess/Makefile
@@ -44,8 +41,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS= $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLATFORM)/lib
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF = fru_container.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
index 7b5da2e170..730e4518f3 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# lib/picl/plugins/littleneck/devtree/Makefile
#
@@ -37,8 +33,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com
ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-280R
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
install := FILEMODE = 0444
diff --git a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
index a11a3ccd17..b740b5f92f 100644
--- a/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2000-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/littleneck/frudata/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-280R
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile
index 2080ff143f..b063122f37 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/lw2plus/devtree/Makefile
#
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-T4
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile
index 85c99855e1..b133401eee 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/fcal_leds/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -45,8 +42,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= fcal_leds.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile
index d29695a8f2..fb21e574fc 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/lw2p/frudata/Makefile
#
@@ -38,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-T4
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile
index 353bd376ca..edc856be27 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/lw2plus/frutree/Makefile
#
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-T4
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile
index e9dbf188ff..29a68aec18 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw8/fruaccess/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -48,8 +46,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_LIBDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
index b38583029a..2819caf8bd 100644
--- a/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/lw8/frutree/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -51,8 +49,6 @@ SRCS = $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile
index aedb9c9971..5353fc53e9 100644
--- a/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/mpxu/devtree/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf picl_asr.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile
index 9146b1b5c7..5f2229f5ff 100644
--- a/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/envmon/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/mpxu/frutree/Makefile
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = piclenvmon.conf
ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile
index ad13413b2a..ff1bf2e376 100644
--- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/mpxu/frudata/Makefile
@@ -38,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile
index 4d02c1fe0c..7624c2cf55 100644
--- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frudr/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -45,24 +42,14 @@ SRCS = $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
PLAT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V440
-PLAT_PLATFORM := OWNER= root
-PLAT_PLATFORM := GROUP= sys
PLAT_LIB_DIR = $(PLAT_PLATFORM:%=%/lib)
-PLAT_LIB_DIR := OWNER= root
-PLAT_LIB_DIR := GROUP= bin
PLAT_PICL_DIR = $(PLAT_LIB_DIR:%=%/picl)
-PLAT_PICL_DIR := OWNER= root
-PLAT_PICL_DIR := GROUP= sys
PLAT_PLUGINS_DIRS = $(PLAT_PICL_DIR:%=%/plugins)
-PLAT_PLUGINS_DIRS := OWNER= root
-PLAT_PLUGINS_DIRS := GROUP= sys
USR_PLAT_PLUGINS_DYNLIBS = $(PLAT_PLUGINS_DIRS:%=%/$(DYNLIB))
USR_PLAT_PLUGINS_LIBLINKS = $(PLAT_PLUGINS_DIRS:%=%/$(LIBLINKS))
diff --git a/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile
index 1eca0b1777..1574d19255 100644
--- a/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/mpxu/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/mpxu/frutree/Makefile
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
INCDIR1 = .
INCDIR2 = ../frudr
diff --git a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
index dd0a15440a..8beda734ab 100644
--- a/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/psvc/psvcplugin/Makefile
#
LIBRARY= libpsvcplugin.a
@@ -50,20 +48,11 @@ PLAT_PLATFORM += $(USR_PLAT_DIR)/SUNW,Sun-Fire-480R
PLAT_PLATFORM += $(USR_PLAT_DIR)/SUNW,Sun-Fire-V490
PLAT_PLATFORM += $(USR_PLAT_DIR)/SUNW,Sun-Fire-V890
-PLAT_PLATFORM := OWNER= root
-PLAT_PLATFORM := GROUP= sys
-
PLAT_LIB_DIR = $(PLAT_PLATFORM:%=%/lib)
-PLAT_LIB_DIR := OWNER= root
-PLAT_LIB_DIR := GROUP= bin
PLAT_PICL_DIR = $(PLAT_LIB_DIR:%=%/picl)
-PLAT_PICL_DIR := OWNER= root
-PLAT_PICL_DIR := GROUP= sys
PLAT_PLUGINS_DIRS = $(PLAT_PICL_DIR:%=%/plugins)
-PLAT_PLUGINS_DIRS := OWNER= root
-PLAT_PLUGINS_DIRS := GROUP= sys
USR_PLAT_PLUGINS_DYNLIBS = $(PLAT_PLUGINS_DIRS:%=%/$(DYNLIB))
USR_PLAT_PLUGINS_LIBLINKS = $(PLAT_PLUGINS_DIRS:%=%/$(LIBLINKS))
diff --git a/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile
index 94c099ae34..ec90cb5ba8 100644
--- a/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/schumacher/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/schumacher/frudata/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-CP3010
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/schumacher/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/schumacher/frutree/Makefile
index 0377ae650e..23db727bca 100644
--- a/usr/src/cmd/picl/plugins/sun4u/schumacher/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/schumacher/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# lib/picl/plugins/sun4u/schumacher/frutree/Makefile
#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-CP3010
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -58,7 +53,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile
index b196fcb2cd..9e294214f3 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/devtree/Makefile
@@ -20,12 +20,10 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-
-#
-# ident "%Z%%M% %I% %E% SMI"
+
#
# cmd/picl/plugins/sun4u/seattle/devtree/Makefile
#
@@ -40,8 +38,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V215
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= picldevtree.conf picl_asr.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile
index 6ae8fb84cd..dc6765fb41 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/envmon/Makefile
@@ -20,12 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-
-#
-# ident "%Z%%M% %I% %E% SMI"
#
# cmd/picl/plugins/sun4u/seattle/envmon/Makefile
#
@@ -40,8 +37,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V215
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = piclenvmon.conf
ROOTCONF= $(CONFS:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile
index f359cd05dd..b4fc38d7f9 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frudata/Makefile
@@ -20,12 +20,10 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-
-#
-# ident "%Z%%M% %I% %E% SMI"
+
#
# cmd/picl/plugins/sun4u/seattle/frudata/Makefile
#
@@ -40,8 +38,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V215
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile
index 393d26ff26..85e2ca34bc 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/Makefile
@@ -20,13 +20,11 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/seattle/frudr/Makefile
#
@@ -43,8 +41,6 @@ FRUDR_LINKTO_PLATFORM = SUNW,Sun-Fire-V240
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONFS = fru_PS0.conf fru_PS1.conf
CONFS += fru_HDD0.conf fru_HDD1.conf
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile
index 3540ddbfb7..0f5ebf300d 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/seattle/frutree/Makefile
#
@@ -38,8 +36,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V215
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
INCDIR1 = .
INCDIR2 = ../frudr
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile
index 536e9a91ba..ae962edb0f 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/conf/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/sebring/conf/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V490
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLATFORM)/lib
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= platsvcd.conf psvcobj.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile
index 0fe753f446..2e010a0c3f 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/sebring/devtree/Makefile
@@ -37,8 +33,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com
ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V490
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
install := FILEMODE = 0444
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile
index ad6d3b91cd..048cdf3ad0 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/sebring/frudata/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V490
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile
index 37db6ab0e7..abc38b7b30 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ CHERRY_LINKTO_PLATFORM = SUNW,Sun-Fire-480R
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile
index ff8cc944f1..2a2326f7af 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcplugin/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ CHERRY_LINKTO_PLATFORM = SUNW,Sun-Fire-480R
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile
index 36c0a64fd7..a06b320262 100644
--- a/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/sebring/psvcpolicy/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ CHERRY_LINKTO_PLATFORM = SUNW,Sun-Fire-480R
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile
index a2f90a6b2e..44416ec824 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/conf/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/silverstone/conf/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V890
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLATFORM)/lib
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= platsvcd.conf psvcobj.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile
index 473689a906..6698e9cf65 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/devtree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/picl/plugins/silverstone/devtree/Makefile
@@ -37,8 +33,6 @@ include $(SRC)/cmd/picl/plugins/Makefile.com
ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V890
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
install := FILEMODE = 0444
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile
index 81202852f1..d2d6771e79 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/picl/plugins/sun4u/silverstone/frudata/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Fire-V890
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile
index d7911af092..68e6811ce5 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ DAK_LINKTO_PLATFORM = SUNW,Sun-Fire-880
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile
index dbb958a35a..51d467dff5 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcplugin/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ DAK_LINKTO_PLATFORM = SUNW,Sun-Fire-880
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile
index 3174431637..c33d9c3490 100644
--- a/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/silverstone/psvcpolicy/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -37,8 +34,6 @@ DAK_LINKTO_PLATFORM = SUNW,Sun-Fire-880
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/Makefile
index ee285ea8e9..6b83a0cd5c 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-
# include library definitions
include $(SRC)/lib/Makefile.lib
include $(SRC)/Makefile.psm
@@ -33,8 +30,6 @@ include $(SRC)/Makefile.psm
PLATFORM = SUNW,Netra-CP2300
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
SUBDIRS= lib conf frutree envmond watchdog .WAIT
MSGSUBDIRS= frutree envmond watchdog
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/conf/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/conf/Makefile
index d62aa4495d..d2bf411ca6 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/conf/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/conf/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-
include $(SRC)/Makefile.psm
# include library definitions
@@ -37,8 +34,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/$(PLATFORM)
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF_2300 = SUNW,Netra-CP2300.conf SUNW,Netra-CP2300.RTM.conf envmond.conf
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/envmond/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/envmond/Makefile
index 1179ebfdcf..c2a2d7e3e7 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/envmond/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/envmond/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.psm
@@ -52,8 +50,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CLEANFILES = $(LINTOUT) $(LINTLIB)
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/frutree/Makefile
index fc4f4a4c8d..26585d2071 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/snowbird/frutree/Makefile
#
@@ -51,8 +48,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS= $(DYNLIB)
ROOTLIBDIR= $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR:= OWNER = root
-ROOTLIBDIR:= GROUP = sys
CLEANFILES= $(LINTOUT) $(LINTLIB)
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile
index 59a7351935..d0ae930dca 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/snowbird/lib/fruaccess/Makefile
#
@@ -52,8 +49,6 @@ LIBS = $(DYNLIB)
CLEANFILES= $(LINTOUT) $(LINTLIB)
ROOTLIBDIR = $(ROOT_PLAT_LIBDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/libctsmc/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/libctsmc/Makefile
index b594cdc990..f6531cd3d7 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/libctsmc/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/lib/libctsmc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/snowbird/lib/smc_util/Makefile
#
@@ -48,8 +45,6 @@ LIBS = $(DYNLIB)
CLEANFILES= $(LINTOUT) $(LINTLIB)
ROOTLIBDIR = $(ROOT_PLAT_LIBDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
LINTSRC = $(LINTLIB:%.ln=%)
ROOTLINTDIR = $(ROOTLIBDIR)
diff --git a/usr/src/cmd/picl/plugins/sun4u/snowbird/watchdog/Makefile b/usr/src/cmd/picl/plugins/sun4u/snowbird/watchdog/Makefile
index 9961bdd915..d24e64f171 100644
--- a/usr/src/cmd/picl/plugins/sun4u/snowbird/watchdog/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/snowbird/watchdog/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libpiclwd.a
VERS= .1
@@ -44,8 +42,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Netra-CP2300
CLEANFILES= $(LINTOUT) $(LINTLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I$(SRC)/uts/sun4u/sys -I$(SRC)/uts/common
diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile
index 1cfb70a44b..1918094ff2 100644
--- a/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/taco/envd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/picl/plugins/sun4u/taco/envd/Makefile
#
include $(SRC)/Makefile.psm
@@ -51,8 +48,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS = $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= envmodel.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile
index 4060191f47..f4c3b3b419 100644
--- a/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/taco/frudata/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/picl/plugins/sun4u/taco/frudata/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-1500
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= libpiclfrudata.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
diff --git a/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile b/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile
index 180e3de1ce..e011f2af22 100644
--- a/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4u/taco/frutree/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/picl/plugins/sun4u/taco/frutree/Makefile
@@ -37,8 +33,6 @@ ROOT_PLATFORM = $(USR_PLAT_DIR)/SUNW,Sun-Blade-1500
include $(SRC)/cmd/picl/plugins/Makefile.com
ROOTLIBDIR = $(ROOT_PLAT_PLUGINDIR)
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CONF= piclfrutree.conf
ROOTCONF= $(CONF:%=$(ROOTLIBDIR)/%)
@@ -60,7 +54,7 @@ lint := TARGET= lint
all: $(CONF)
install: $(ROOTLIBDIR) $(ROOTCONF)
-
+
$(CONF): $(INFOS)
$(RM) $@
$(CPP) piclfrutree.info > $@
diff --git a/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile b/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile
index c73aad48cc..5f57855e9b 100644
--- a/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile
+++ b/usr/src/cmd/picl/plugins/sun4v/lib/snmp/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
#
# cmd/picl/plugins/sun4v/lib/snmp/Makefile
@@ -47,8 +45,6 @@ SRCS= $(OBJECTS:%.o=%.c)
LIBS= $(DYNLIB)
ROOTLIBDIR = $(ROOT_PLATFORM)/lib
-ROOTLIBDIR := OWNER = root
-ROOTLIBDIR := GROUP = sys
CLEANFILES= $(LINTOUT) $(LINTLIB)
CLOBBERFILES += $(LIBLINKS)
diff --git a/usr/src/cmd/picl/prtpicl/Makefile b/usr/src/cmd/picl/prtpicl/Makefile
index 0b8383e1f8..248bcf55ad 100644
--- a/usr/src/cmd/picl/prtpicl/Makefile
+++ b/usr/src/cmd/picl/prtpicl/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= prtpicl
@@ -37,8 +34,6 @@ CPPFLAGS += -I$(SRC)/lib/libpicl
LDLIBS += -L$(SRC)/lib/libpicl/$(MACH) -lpicl
FILEMODE= 755
-OWNER= root
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/pools/poold/Makefile b/usr/src/cmd/pools/poold/Makefile
index bc8335c7ae..12e5c63023 100644
--- a/usr/src/cmd/pools/poold/Makefile
+++ b/usr/src/cmd/pools/poold/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/pools/poold/Makefile
PROG = poold
@@ -99,8 +96,6 @@ JFILES = poold.properties $(JARFILE)
ROOTJAVA = $(JFILES:%=$(ROOTUSRLIBDRP)/%)
$(ROOTJAVA) := FILEMODE = 444
-$(ROOTJAVA) := OWNER = root
-$(ROOTJAVA) := GROUP = bin
all: $(PROG) $(JAVA_SUBDIRS) $(JARFILE) \
.WAIT $(SUBDIRS)
diff --git a/usr/src/cmd/power/Makefile b/usr/src/cmd/power/Makefile
index 4c297c9979..5451dc8a27 100644
--- a/usr/src/cmd/power/Makefile
+++ b/usr/src/cmd/power/Makefile
@@ -70,20 +70,14 @@ DAEMON_LDLIBS = $(LDLIBS.cmd) -lkstat $(LDEVINFO)
PMCFG_LDLIBS = $(LDLIBS.cmd) -lcmd -lsmbios -lkstat $($(MACH)_LDEVINFO)
SUSPEND_LDLIBS = $(LDLIBS.cmd) -lbsm -lpam -lsecdb
-OWNER= root
ROOTUSRSBINPMCFG= $(PMCFG:%=$(ROOTUSRSBIN)/%)
-$(ROOTUSRSBINPMCFG) := GROUP= bin
$(ROOTUSRSBINPMCFG) := FILEMODE= 4555
ROOTUSRBINSUSPEND= $(SUSPEND:%=$(ROOTBIN)/%)
-$(ROOTUSRBINSUSPEND) := GROUP= bin
$(ROOTUSRBINSUSPEND) := FILEMODE= 4555
-GROUP= sys
ROOTLIBPOWER= $(ROOTLIB)/power
ROOTLIBPOWERDAEMON= $(DAEMON:%=$(ROOTLIBPOWER)/%)
-$(ROOTLIBPOWER) := GROUP= sys
$(ROOTLIBPOWER) := FILEMODE= 755
-$(ROOTLIBPOWERDAEMON) := GROUP= bin
$(ROOTLIBPOWERDAEMON) := FILEMODE= 555
ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
diff --git a/usr/src/cmd/powertop/Makefile.com b/usr/src/cmd/powertop/Makefile.com
index 980212e38d..6c88a6cd03 100644
--- a/usr/src/cmd/powertop/Makefile.com
+++ b/usr/src/cmd/powertop/Makefile.com
@@ -44,7 +44,6 @@ CFLAGS64 += $(CCVERBOSE)
LDLIBS += -lcurses -ldtrace -lkstat
FILEMODE = 0555
-GROUP = bin
CLEANFILES += $(COMMON_OBJS)
diff --git a/usr/src/cmd/print/Makefile.sp b/usr/src/cmd/print/Makefile.sp
index af1d87d236..ebf97b53c6 100644
--- a/usr/src/cmd/print/Makefile.sp
+++ b/usr/src/cmd/print/Makefile.sp
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/print/Makefile.sp
# Common makefile definitions (should be) used by all print(lp) makefiles
#
@@ -55,23 +53,6 @@ ROOTLIBPRINTBIN= $(ROOTLIBPRINT)/bin
ROOTUSRUCB= $(ROOT)/usr/ucb
-
-#
-# Typical owner and group for LP things. These can be overridden
-# in the individual makefiles.
-#
-OWNER = root
-GROUP = lp
-SUPER = root
-
-$(ROOTINIT_D) := GROUP = sys
-$(ROOTRC0_D) := GROUP = sys
-$(ROOTRCS_D) := GROUP = sys
-$(ROOTRC1_D) := GROUP = sys
-$(ROOTRC2_D) := GROUP = sys
-$(ROOTUSRUCB) := GROUP = bin
-$(ROOTUSRSBIN) := GROUP = bin
-$(ROOTBIN) := GROUP = bin
#
# $(EMODES): Modes for executables
# $(SMODES): Modes for setuid executables
diff --git a/usr/src/cmd/print/bsd-sysv-commands/Makefile b/usr/src/cmd/print/bsd-sysv-commands/Makefile
index 6be41d2f21..a735b815c7 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/Makefile
+++ b/usr/src/cmd/print/bsd-sysv-commands/Makefile
@@ -46,7 +46,6 @@ ROOTLIBLPPROGS = $(LIBLPPROGS:%=$(ROOTLIBLPBIN)/%)
FILEMODE = 0555
-OWNER = root
include ../../Makefile.cmd
diff --git a/usr/src/cmd/print/conv_fix/Makefile b/usr/src/cmd/print/conv_fix/Makefile
index 6bce653454..b9e9c76e82 100644
--- a/usr/src/cmd/print/conv_fix/Makefile
+++ b/usr/src/cmd/print/conv_fix/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1994,1998,2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/client/conv_fix/Makefile
#
@@ -39,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTLIBPRINTPROG= $(PROG:%=$(ROOTLIBPRINT)/%)
FILEMODE= 0555
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
diff --git a/usr/src/cmd/print/lpget/Makefile b/usr/src/cmd/print/lpget/Makefile
index a877ca51e7..db4d15b2b1 100644
--- a/usr/src/cmd/print/lpget/Makefile
+++ b/usr/src/cmd/print/lpget/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,8 @@
# CDDL HEADER END
#
#
-# Copyright (c) 1994, 1995, 1996 by Sun Microsystems, Inc.
-# All Rights Reserved
-#
-# ident "%Z%%M% %I% %E% SMI"
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/lp/client/lpget/Makefile
#
@@ -39,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTBINPROG= $(PROG:%=$(ROOTBIN)/%)
FILEMODE= 0511
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
LDLIBS += $(LIBNPRT)
diff --git a/usr/src/cmd/print/lpset/Makefile b/usr/src/cmd/print/lpset/Makefile
index 39226da6a0..3c5e847eca 100644
--- a/usr/src/cmd/print/lpset/Makefile
+++ b/usr/src/cmd/print/lpset/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/lp/client/lpset/Makefile
#
@@ -38,7 +36,6 @@ OBJS= $(SRCS:.c=.o)
ROOTBINPROG= $(PROG:%=$(ROOTBIN)/%)
FILEMODE= 04511
-OWNER= root
CPPFLAGS += -I$(NPRTINC)
LDLIBS += $(LIBNPRT) -lsecdb
diff --git a/usr/src/cmd/print/ppdmgr/Makefile b/usr/src/cmd/print/ppdmgr/Makefile
index a92a560b64..ab8f07b46e 100644
--- a/usr/src/cmd/print/ppdmgr/Makefile
+++ b/usr/src/cmd/print/ppdmgr/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
MANIFEST= ppd-cache-update.xml
SVCMETHOD= ppd-cache-update
@@ -37,7 +35,6 @@ ROOTVARLP= $(ROOTVAR)/lp
ROOTVARLPPPD= $(ROOTVARLP)/ppd
ROOTVARLPPPDCACHES= $(ROOTVARLPPPD)/caches
-$(ROOTVARLP):= OWNER= lp
$(ROOTVARLP):= DIRMODE= 775
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printer-info/Makefile b/usr/src/cmd/print/printer-info/Makefile
index 4bd90aeba9..6deed55e86 100644
--- a/usr/src/cmd/print/printer-info/Makefile
+++ b/usr/src/cmd/print/printer-info/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
-
-#
include ../Makefile.sp
@@ -37,8 +32,6 @@ SRCS = $(PROG).c
OBJECTS = $(PROG).o
ROOTPROG= $(PROG:%=$(ROOTLIBLPBIN)/%)
-$(ROOTPROG) := OWNER=root
-$(ROOTPROG) := GROUP=lp
$(ROOTPROG) := FILEMODE=555
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printmgr/Makefile b/usr/src/cmd/print/printmgr/Makefile
index 3ff29873e4..4d3bc72a77 100644
--- a/usr/src/cmd/print/printmgr/Makefile
+++ b/usr/src/cmd/print/printmgr/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -52,8 +52,6 @@ ROOTAPPFILE = $(ROOTAPPDIR)/solaris-print-manager.desktop
$(ROOTAPPFILE):= FILEMODE = 444
$(ROOTBINPROG):= FILEMODE = 644
-$(ROOTBINPROG):= OWNER = root
-$(ROOTBINPROG):= GROUP = lp
.KEEP_STATE:
diff --git a/usr/src/cmd/print/printmgr/bin/Makefile b/usr/src/cmd/print/printmgr/bin/Makefile
index d0cc89cefe..2964b6306f 100644
--- a/usr/src/cmd/print/printmgr/bin/Makefile
+++ b/usr/src/cmd/print/printmgr/bin/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# Makefile for print manager wrapper script
#
@@ -38,9 +34,6 @@ ROOTBINPROG = $(PROG:%=$(ROOTBIN)/%)
ROOTDIRS = $(ROOT)/usr/sadm/admin \
$(ROOT)/usr/sadm/admin/bin
-$(ROOTBINPROG):= OWNER = root
-$(ROOTBINPROG):= GROUP = lp
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
index 5133a2df50..f80827be30 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/client/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for Java Print Manager client
#
include $(SRC)/Makefile.master
@@ -95,8 +93,6 @@ MSGDIR = $(ROOT)/usr/share/lib/locale/com/sun/admin/pm/client
MSGJAVAFILES = pmResources.java pmHelpResources.java
MSGFILES = $(MSGJAVAFILES:%=$(MSGDIR)/%)
-$(MSGFILES):= OWNER = root
-$(MSGFILES):= GROUP = lp
$(MSGFILES):= FILEMODE = 644
CLEANFILES= *.class pmHelpResources.java pmCopyright.java \
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index 35f3b5cb78..3aea1611f6 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# Makefile for Java Print Manager server
@@ -81,8 +79,6 @@ ROOTDIRS = $(ROOT)/usr/sadm/admin \
ROOTLIBDIR = $(ROOT)/usr/sadm/admin/printmgr/lib
ROOTLIBS= $(LIBS:%=$(ROOTLIBDIR)/%)
-$(ROOTLINKS):= OWNER = root
-$(ROOTLINKS):= GROUP = lp
# Following variables define where to find header files
CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris -I.
diff --git a/usr/src/cmd/print/scripts/Makefile b/usr/src/cmd/print/scripts/Makefile
index 33412c7aed..7dfa94546e 100644
--- a/usr/src/cmd/print/scripts/Makefile
+++ b/usr/src/cmd/print/scripts/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -30,12 +30,8 @@ ROOTLIBLPBIN = $(ROOTLIBLP)/bin
ROOTVARLP = $(ROOTVAR)/lp
ROOTVARLPPPD = $(ROOTVARLP)/ppd
-$(ROOTVARSPOOLPRINT) := OWNER=root
-$(ROOTVARLP) := OWNER=lp
$(ROOTVARLP) := DIRMODE=0775
-OWNER = root
-GROUP = lp
FILEMODE = 0755
MSGFILES = lpadmin ppdmgr
@@ -52,14 +48,10 @@ $(ROOTUSRSBINPROG) := FILEMODE=555
PCONF= printers.conf
ROOTPCONF= $(PCONF:%=$(ROOTETC)/%)
-$(ROOTPCONF) := OWNER=root
-$(ROOTPCONF) := GROUP=sys
$(ROOTPCONF) := FILEMODE=644
MANUFALIASES= manufaliases
ROOTMANUFALIASES= $(MANUFALIASES:%=$(ROOTVARLPPPD)/%)
-$(ROOTMANUFALIASES) := OWNER=root
-$(ROOTMANUFALIASES) := GROUP=lp
$(ROOTMANUFALIASES) := FILEMODE=444
LIBLPPROGS= getmakes getmodels getppdfile getppds ppdfilename2mmp \
@@ -69,8 +61,6 @@ LIBLPPROGS= getmakes getmodels getppdfile getppds ppdfilename2mmp \
desktop-print-management-prefs
ROOTLIBLPPROGS= $(LIBLPPROGS:%=$(ROOTLIBLPBIN)/%)
-$(ROOTLIBLPPROGS) := OWNER=root
-$(ROOTLIBLPPROGS) := GROUP=lp
$(ROOTLIBLPPROGS) := FILEMODE=555
LIBLINKS= $(ROOTLIB)/lpadmin $(ROOTLIB)/lpsystem
diff --git a/usr/src/cmd/print/selector/Makefile b/usr/src/cmd/print/selector/Makefile
index faa0a1bb77..9cd5704869 100644
--- a/usr/src/cmd/print/selector/Makefile
+++ b/usr/src/cmd/print/selector/Makefile
@@ -39,7 +39,6 @@ ROOTUSRBINLINKS = $(BINLINKS:%=$(ROOTBIN)/%)
ROOTUSRSBINLINKS = $(SBINLINKS:%=$(ROOTUSRSBIN)/%)
FILEMODE = 0555
-OWNER = root
$(ROOTUSRBINLINKS):
$(RM) $@; $(SYMLINK) ../sbin/$(SBINPROG) $@
diff --git a/usr/src/cmd/priocntl/Makefile b/usr/src/cmd/priocntl/Makefile
index a947c89073..880545bca1 100644
--- a/usr/src/cmd/priocntl/Makefile
+++ b/usr/src/cmd/priocntl/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= priocntl
@@ -60,11 +57,7 @@ ROOTFSSPROG = $(FSSD)/$(FSSPROG)
ROOTFXPROG = $(FXD)/$(FXPROG)
$(ROOTUSRSBINPROG) := FILEMODE = 04555
-$(ROOTUSRSBINPROG) := OWNER= root
-$(ROOTUSRSBINPROG) := GROUP= root
$(DIRS) := FILEMODE = 0775
-$(DIRS) := OWNER = root
-$(DIRS) := GROUP = bin
CLOBBERFILES += $(RTPROG) $(TSPROG) $(IAPROG) $(FSSPROG) $(FXPROG)
# installation rules
diff --git a/usr/src/cmd/projadd/Makefile b/usr/src/cmd/projadd/Makefile
index 0e1e61e85a..f134faa4d1 100644
--- a/usr/src/cmd/projadd/Makefile
+++ b/usr/src/cmd/projadd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/projadd/Makefile
#
@@ -36,8 +34,6 @@ POFILE=
CLOBBERFILES= $(PROGS)
-GROUP= sys
-
.KEEP_STATE:
all: $(PROGS)
diff --git a/usr/src/cmd/prstat/Makefile.com b/usr/src/cmd/prstat/Makefile.com
index 7509f8d339..84aac0d24b 100644
--- a/usr/src/cmd/prstat/Makefile.com
+++ b/usr/src/cmd/prstat/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/prstat/Makefile.com
#
@@ -39,7 +37,6 @@ LINTFLAGS += -u
LINTFLAGS64 += -u
FILEMODE = 0555
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/prtconf/Makefile b/usr/src/cmd/prtconf/Makefile
index 4b80e748ec..1029bf9e7a 100644
--- a/usr/src/cmd/prtconf/Makefile
+++ b/usr/src/cmd/prtconf/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6.6.2 */
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -42,8 +38,6 @@ lint := TARGET = lint
RELUSRSBIN= ../usr/sbin
ROOTSYMLINK= $(ROOTETC)/$(PROG)
-OWNER= root
-GROUP= sys
FILEMODE= 0555
.KEEP_STATE:
diff --git a/usr/src/cmd/prtconf/Makefile.com b/usr/src/cmd/prtconf/Makefile.com
index c6e7127476..4685b78c5f 100644
--- a/usr/src/cmd/prtconf/Makefile.com
+++ b/usr/src/cmd/prtconf/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= prtconf
OBJS= $(PROG).o pdevinfo.o prt_xxx.o
@@ -35,8 +32,6 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
LDLIBS += -ldevinfo -lnvpair
-OWNER= root
-GROUP= sys
FILEMODE= 02555
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/prtdiag/Makefile.com b/usr/src/cmd/prtdiag/Makefile.com
index 46d21d2338..2f5e7b0ac0 100644
--- a/usr/src/cmd/prtdiag/Makefile.com
+++ b/usr/src/cmd/prtdiag/Makefile.com
@@ -20,10 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
include $(SRCDIR)/../Makefile.cmd
include $(SRCDIR)/../../Makefile.psm
@@ -34,8 +33,6 @@ CLASS = 32
FILEMODE = 2755
DIRMODE = 755
-OWNER = root
-GROUP = sys
LINT_OBJS = $(OBJS:%.o=%.ln)
POFILE = prtdiag.po
diff --git a/usr/src/cmd/prtdscp/sparc/sun4u/Makefile b/usr/src/cmd/prtdscp/sparc/sun4u/Makefile
index 76a57c3a1f..368dd5dbfd 100644
--- a/usr/src/cmd/prtdscp/sparc/sun4u/Makefile
+++ b/usr/src/cmd/prtdscp/sparc/sun4u/Makefile
@@ -18,12 +18,9 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# usr/src/cmd/prtdscp/sparc/sun4u/Makefile
#
@@ -51,8 +48,6 @@ LINT_FLAGS= -c -Nlevel=4 -Ncheck $($(CONCURR_MODE)_FLAGS)
# Definitions for installation of the program
FILEMODE= 0755
-OWNER= root
-GROUP= sys
ROOTPSMPROG = $(USR_PSM_SBIN_DIR)/$(PROG)
all: $(ROOTFS_PROG)
diff --git a/usr/src/cmd/prtfru/Makefile b/usr/src/cmd/prtfru/Makefile
index b200681342..3a90f7882e 100644
--- a/usr/src/cmd/prtfru/Makefile
+++ b/usr/src/cmd/prtfru/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# cmd/prtfru/Makefile
#
@@ -40,8 +38,6 @@ LINTFLAGS += -u
EXTRA_LDLIBS = -lfru -lfrureg -lfruutils
FILEMODE = 755
-OWNER = root
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/prtvtoc/Makefile b/usr/src/cmd/prtvtoc/Makefile
index 8ac86081f6..164efc05c6 100644
--- a/usr/src/cmd/prtvtoc/Makefile
+++ b/usr/src/cmd/prtvtoc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6.6.2 */
-#
-# Copyright 1990,2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/prtvtoc/Makefile
@@ -34,8 +30,6 @@ include ../Makefile.cmd
RELUSRSBIN= ../usr/sbin
ROOTSYMLINK= $(ROOTETC)/$(PROG)
-OWNER= root
-GROUP= sys
LDLIBS += -ladm -lefi
.KEEP_STATE:
diff --git a/usr/src/cmd/psradm/Makefile b/usr/src/cmd/psradm/Makefile
index 1bc7263630..56b6d2adf8 100644
--- a/usr/src/cmd/psradm/Makefile
+++ b/usr/src/cmd/psradm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/psradm/Makefile
#
@@ -32,9 +28,6 @@ PROG= psradm
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/psrinfo/Makefile b/usr/src/cmd/psrinfo/Makefile
index 9117d4688e..2455b4c67d 100644
--- a/usr/src/cmd/psrinfo/Makefile
+++ b/usr/src/cmd/psrinfo/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/psrinfo/Makefile
@@ -31,9 +28,6 @@ PROG= psrinfo
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/psrset/Makefile.com b/usr/src/cmd/psrset/Makefile.com
index 72d9c2de20..7420cb5d38 100644
--- a/usr/src/cmd/psrset/Makefile.com
+++ b/usr/src/cmd/psrset/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/psrset/Makefile.com
#
@@ -34,8 +31,6 @@ SRCS= $(OBJS:%.o=../%.c)
include ../../Makefile.cmd
-OWNER = root
-GROUP = sys
CFLAGS += $(CCVERBOSE)
LDLIBS += -lproc
diff --git a/usr/src/cmd/ptools/Makefile.bld b/usr/src/cmd/ptools/Makefile.bld
index ac0854383d..d0ab70bc6d 100644
--- a/usr/src/cmd/ptools/Makefile.bld
+++ b/usr/src/cmd/ptools/Makefile.bld
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -31,7 +31,6 @@ OBJS = $(PROG).o
SRCS = ../$(PROG).c
FILEMODE = 0555
-GROUP = bin
# libproc is added individually as pwait doesn't need it.
# These are defined this way so lint can use them
diff --git a/usr/src/cmd/pwconv/Makefile b/usr/src/cmd/pwconv/Makefile
index 0c44ab2d83..90b1dfebea 100644
--- a/usr/src/cmd/pwconv/Makefile
+++ b/usr/src/cmd/pwconv/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1990 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/pwconv/Makefile
#
@@ -33,8 +30,6 @@ include ../Makefile.cmd
TEXT_DOMAIN= SUNW_OST_ADMIN
FILEMODE= 0555
-OWNER= root
-GROUP= sys
RELSBIN= ../sbin
.KEEP_STATE:
diff --git a/usr/src/cmd/rcap/rcapd/Makefile b/usr/src/cmd/rcap/rcapd/Makefile
index e7fba1c8ea..62112abd00 100644
--- a/usr/src/cmd/rcap/rcapd/Makefile
+++ b/usr/src/cmd/rcap/rcapd/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
MANIFEST = rcap.xml
@@ -32,8 +29,6 @@ include ../../Makefile.cmd
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
-$(ROOTSVCSYSTEM)/rcap.xml := OWNER = root
-$(ROOTSVCSYSTEM)/rcap.xml := GROUP = sys
$(ROOTSVCSYSTEM)/rcap.xml := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/rcm_daemon/Makefile.com b/usr/src/cmd/rcm_daemon/Makefile.com
index 3bf50dd7eb..c72efbeed2 100644
--- a/usr/src/cmd/rcm_daemon/Makefile.com
+++ b/usr/src/cmd/rcm_daemon/Makefile.com
@@ -158,8 +158,6 @@ clean := TARGET= clean
clobber := TARGET= clobber
lint := TARGET= lint
-$(ROOTETC_RCM) := GROUP = sys
-$(ROOTETC_RCM_SCRIPT) := GROUP = sys
$(ROOTLIB_RCM_SCRIPTS) := FILEMODE = 555
.KEEP_STATE:
diff --git a/usr/src/cmd/rctladm/Makefile b/usr/src/cmd/rctladm/Makefile
index cbd70774d0..2592301166 100644
--- a/usr/src/cmd/rctladm/Makefile
+++ b/usr/src/cmd/rctladm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
PROG = rctladm
@@ -39,8 +37,6 @@ CFLAGS += $(CCVERBOSE)
POFILE = rctladm_msg.po
XGETFLAGS = -a
FILEMODE = 0555
-OWNER = root
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/rpcsvc/Makefile b/usr/src/cmd/rpcsvc/Makefile
index 9fa6887c48..4c7553b075 100644
--- a/usr/src/cmd/rpcsvc/Makefile
+++ b/usr/src/cmd/rpcsvc/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -105,12 +105,7 @@ ITPROG= $(TPROG:%=$(RSTAT)/%)
IETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
# non-default file attributes
-$(ROOTDIRS) := OWNER= root
-$(ROOTDIRS) := GROUP= sys
-
$(ROOTETC)/rpc := FILEMODE= 0644
-$(ROOTETC)/rpc := OWNER= root
-$(ROOTETC)/rpc := GROUP= sys
all:= TARGET= all
install:= TARGET= install
diff --git a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile
index ec4b3ac249..78c87ce0ca 100644
--- a/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile
+++ b/usr/src/cmd/rpcsvc/nis/rpc.nisd/configs/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,7 @@
#
# CDDL HEADER END
#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/rpcsvc/nis/rpc.nisd/configs/Makefile
@@ -35,8 +32,6 @@ ROOTVARNIS= $(ROOT)/var/nis
ROOTVARNISFILES= $(VARNISFILES:%=$(ROOTVARNIS)/%)
FILEMODE= 644
-OWNER= root
-GROUP= sys
all clean clobber lint:
diff --git a/usr/src/cmd/rpld/Makefile b/usr/src/cmd/rpld/Makefile
index 27c5748dc2..29e9620681 100644
--- a/usr/src/cmd/rpld/Makefile
+++ b/usr/src/cmd/rpld/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/rpld/Makefile
#
@@ -51,8 +48,6 @@ CLOBBERFILES= $(LIBDLA)
include ../Makefile.cmd
$(ROOTETC)/$(CONFILE):= FILEMODE = 644
-$(ROOTETC)/$(CONFILE):= OWNER = root
-$(ROOTETC)/$(CONFILE):= GROUP = sys
CPPFLAGS += -I.
diff --git a/usr/src/cmd/sa/Makefile b/usr/src/cmd/sa/Makefile
index 01fa461908..bb1ff6f10d 100644
--- a/usr/src/cmd/sa/Makefile
+++ b/usr/src/cmd/sa/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# cmd/sa/Makefile
#
@@ -89,13 +87,7 @@ ENTRY3= '$(COMMENT_CHAR) 5 18 * * 1-5 /usr/lib/sa/sa2 -s 8:00 -e 18:01 -i 1200
CLOBBERFILES= $(PROGS) $(SHELLS)
# Conditionals
-$(SYSCRONTAB) := OWNER = root
-$(SYSCRONTAB) := GROUP = sys
-$(ROOTBIN)/$(TIMEX) := GROUP = sys
-# $(ROOTUSRSBIN)/$(SADP) := FILEMODE = 2555
-# $(ROOTUSRSBIN)/$(SADP) := GROUP = sys
$(LIBSAD)/$(SADC) := FILEMODE = 0555
-$(LIBSAD)/$(SADC) := GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/saf/Makefile b/usr/src/cmd/saf/Makefile
index 4aa859db22..a61b2c8b91 100644
--- a/usr/src/cmd/saf/Makefile
+++ b/usr/src/cmd/saf/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= sac sacadm pmadm
@@ -57,8 +55,6 @@ ROOTADMF= $(ADMF:%=$(ROOTUSRSBIN)/%)
LDLIBS += -lnsl
LDFLAGS += $(MAPFILE.NGB:%=-M%)
LINTFLAGS += -b -x
-OWNER= root
-GROUP= sys
util1.o := CPPFLAGS += -DSAC
util2.o := CPPFLAGS += -USAC
diff --git a/usr/src/cmd/scadm/Makefile b/usr/src/cmd/scadm/Makefile
index 8d9ec77839..610d8ffc01 100644
--- a/usr/src/cmd/scadm/Makefile
+++ b/usr/src/cmd/scadm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/scadm/Makefile
#
# builds occur in kernel-architecture subdirectories using Makefile.com
@@ -36,7 +33,6 @@ include $(SRC)/cmd/Makefile.cmd
PROG = scadm
FILEMODE = 555
-GROUP = sys
# conditional assignments
all:= TARGET= all
diff --git a/usr/src/cmd/scadm/Makefile.com b/usr/src/cmd/scadm/Makefile.com
index f45ad9b8a4..10d310e01a 100644
--- a/usr/src/cmd/scadm/Makefile.com
+++ b/usr/src/cmd/scadm/Makefile.com
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/scadm/Makefile.com
#
@@ -41,8 +39,6 @@ PROG = scadm
FILEMODE = 2755
DIRMODE = 755
-OWNER = root
-GROUP = sys
#IMPL = $(PLATFORM:sun%=sun)
IMPL = mpxu
diff --git a/usr/src/cmd/sckmd/sparc/sun4u/Makefile b/usr/src/cmd/sckmd/sparc/sun4u/Makefile
index b73b2e3992..06d6eef994 100644
--- a/usr/src/cmd/sckmd/sparc/sun4u/Makefile
+++ b/usr/src/cmd/sckmd/sparc/sun4u/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile definitions for Sun Fire 15000 Key Management Daemon (sckmd)
#
@@ -45,9 +43,6 @@ include ../../../Makefile.cmd
include ../../../../Makefile.psm
-OWNER= root
-GROUP= sys
-
USRPSMPROG= $(USR_PSM_LIB_DIR)/$(PROG)
$(USRPSMPROG) := FILEMODE = 0755
diff --git a/usr/src/cmd/script/Makefile b/usr/src/cmd/script/Makefile
index 129a32d7de..f35f1f2c65 100644
--- a/usr/src/cmd/script/Makefile
+++ b/usr/src/cmd/script/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= script
@@ -30,7 +27,6 @@ PROG= script
include ../Makefile.cmd
FILEMODE= 0555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/sdpadm/Makefile b/usr/src/cmd/sdpadm/Makefile
index dd8e0758f4..dc1c83aed3 100644
--- a/usr/src/cmd/sdpadm/Makefile
+++ b/usr/src/cmd/sdpadm/Makefile
@@ -29,8 +29,6 @@ ETCFILES = sdp.conf
ROOTETC = $(ROOT)/etc
FILEMODE = 0555
-OWNER = root
-GROUP = bin
ROOTETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
$(ROOTETCFILES) := FILEMODE= 644
diff --git a/usr/src/cmd/sendmail/Makefile b/usr/src/cmd/sendmail/Makefile
index 057bcb7ac1..604b8d2959 100644
--- a/usr/src/cmd/sendmail/Makefile
+++ b/usr/src/cmd/sendmail/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/sendmail/Makefile
#
# Makefile for top level sendmail source directory
@@ -37,10 +35,7 @@ SUBDIRS= cf lib db libsm libsmdb libsmutil .WAIT src aux
include ../Makefile.cmd
ROOTDIRS= $(ROOT)/var/spool/mqueue $(ROOT)/var/spool/clientmqueue
-$(ROOTDIRS):= OWNER = root
$(ROOTDIRS):= DIRMODE = 0750
-$(ROOT)/var/spool/clientmqueue:= OWNER = smmsp
-$(ROOT)/var/spool/clientmqueue:= GROUP = smmsp
$(ROOT)/var/spool/clientmqueue:= DIRMODE = 0770
all:= TARGET= all
diff --git a/usr/src/cmd/sendmail/cf/Makefile b/usr/src/cmd/sendmail/cf/Makefile
index 09ee107a73..ef4f6b1ee1 100644
--- a/usr/src/cmd/sendmail/cf/Makefile
+++ b/usr/src/cmd/sendmail/cf/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/sendmail/cf/Makefile
#
@@ -131,9 +129,6 @@ SCRIPTS= $(ROOTUSRSBIN)/check-hostname \
FILEMODE= 444
M4FLAGS= -DSUN_HIDE_INTERNAL_DETAILS
-$(BUILDPARTS) := OWNER=root
-$(BUILDPARTS) := GROUP=mail
-
.KEEP_STATE:
all: $(CFS)
diff --git a/usr/src/cmd/sendmail/lib/Makefile b/usr/src/cmd/sendmail/lib/Makefile
index e685a9778e..1fcd8f7893 100644
--- a/usr/src/cmd/sendmail/lib/Makefile
+++ b/usr/src/cmd/sendmail/lib/Makefile
@@ -41,7 +41,6 @@ ROOTETCMAILSYMLINKS = $(ROOTETCMAIL)/sendmail.hf
# conditional assignments
$(ROOTETCMAILF) := FILEMODE = 644
-$(ROOTETCMAILF) := OWNER = root
.KEEP_STATE:
diff --git a/usr/src/cmd/sendmail/src/Makefile b/usr/src/cmd/sendmail/src/Makefile
index 84f7381e25..25784c3ba9 100644
--- a/usr/src/cmd/sendmail/src/Makefile
+++ b/usr/src/cmd/sendmail/src/Makefile
@@ -61,8 +61,6 @@ SUNENVDEF= -DSUN_EXTENSIONS -DVENDOR_DEFAULT=VENDOR_SUN \
CPPFLAGS = $(INCPATH) $(ENVDEF) $(SUNENVDEF) $(DBMDEF) $(CPPFLAGS.sm)
FILEMODE= 2555
-OWNER= root
-GROUP= smmsp
ROOTSYMLINKS= $(ROOTUSRSBIN)/newaliases $(ROOTUSRSBIN)/sendmail
diff --git a/usr/src/cmd/setpgrp/Makefile b/usr/src/cmd/setpgrp/Makefile
index e96329b305..aaf6e1e51c 100644
--- a/usr/src/cmd/setpgrp/Makefile
+++ b/usr/src/cmd/setpgrp/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,19 +18,14 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= setpgrp
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/sf880drd/Makefile b/usr/src/cmd/sf880drd/Makefile
index cec3749477..e01451fb29 100644
--- a/usr/src/cmd/sf880drd/Makefile
+++ b/usr/src/cmd/sf880drd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/sf880drd/Makefile
#
@@ -44,8 +42,6 @@ LDLIBS += -lcfgadm
PSMPROG = $(USR_PSM_LIB_DIR)/$(PROG)
$(PSMPROG) := FILEMODE = 0755
-$(PSMPROG) := OWNER = root
-$(PSMPROG) := GROUP = sys
.KEEP_STATE:
@@ -71,7 +67,6 @@ $(USR_PSM_LIB_DIR): $(USR_PSM_DIR)
$(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
cd $(USR_PLAT_DIR)/$(LINKED_PLATFORM)/lib; $(RM) $(PROG); \
- $(SYMLINK) ../../$(PLATFORM)/lib/$(PROG) $(PROG) $(CHOWNLINK) \
- $(CHGRPLINK)
+ $(SYMLINK) ../../$(PLATFORM)/lib/$(PROG) $(PROG)
include ../Makefile.targ
diff --git a/usr/src/cmd/sgs/librtld_db/rdb_demo/Makefile b/usr/src/cmd/sgs/librtld_db/rdb_demo/Makefile
index f734e2e403..543e199ef1 100644
--- a/usr/src/cmd/sgs/librtld_db/rdb_demo/Makefile
+++ b/usr/src/cmd/sgs/librtld_db/rdb_demo/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -88,8 +84,6 @@ ROOTDEMODIRS= $(ROOTDEMODIRBASE) \
ROOTDEMOFILES= $(DEMOFILES:%=$(ROOTDEMODIRBASE)/%)
-$(ROOTDEMODIRS) := OWNER = root
-$(ROOTDEMODIRS) := GROUP = bin
$(ROOTDEMODIRS) := DIRMODE = 755
SED= sed -e "/DEMO DELETE START/,/DEMO DELETE END/d"
diff --git a/usr/src/cmd/sgs/link_audit/Makefile b/usr/src/cmd/sgs/link_audit/Makefile
index 3c0e657f88..7239f056fd 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile
+++ b/usr/src/cmd/sgs/link_audit/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -59,8 +56,6 @@ ROOTDEMODIRS= $(ROOTDEMODIRBASE) .WAIT \
ROOTDEMOFILES= $(DEMOFILES:%=$(ROOTDEMODIRBASE)/%)
-$(ROOTDEMODIRS) := OWNER = root
-$(ROOTDEMODIRS) := GROUP = bin
$(ROOTDEMODIRS) := DIRMODE = 755
diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com
index 614febf066..c901fd8d8b 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile.com
+++ b/usr/src/cmd/sgs/link_audit/Makefile.com
@@ -89,8 +89,6 @@ $(WHOLIB):= MAPFILES = mapfile-vers-who
$(SYMBINDREP):= MAPFILES = mapfile-vers-symbindrep
$(BINDLIB):= MAPFILES = mapfile-vers-bindings
-$(ROOTCCSLIB) := OWNER = root
-$(ROOTCCSLIB) := GROUP = bin
$(ROOTCCSLIB) := DIRMODE = 755
CPPFLAGS += -D_REENTRANT
diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
index 960356c572..ebc2e0824d 100644
--- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= rtld.a
VERS= .1
@@ -55,7 +53,6 @@ LINTFLAGS64 += -u -erroff=E_NAME_DECL_NOT_USED_DEF2
LINTSRCS= $(COMOBJS:%.o=../common/%.c) $(BLTDATA)
-GROUP= sys
FILEMODE= 555
DYNLIB= ld.so
diff --git a/usr/src/cmd/sh/Makefile b/usr/src/cmd/sh/Makefile
index 052220ab4b..70ffd55aba 100644
--- a/usr/src/cmd/sh/Makefile
+++ b/usr/src/cmd/sh/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = sh
ROOTFS_PROG = $(PROG)
@@ -50,7 +48,6 @@ CPPFLAGS += -D_FILE_OFFSET_BITS=64 -DACCT
MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
LDFLAGS += $(MAPFILES:%=-M%)
LDLIBS += -lgen -lsecdb
-GROUP = root
.KEEP_STATE:
diff --git a/usr/src/cmd/shcomp/Makefile b/usr/src/cmd/shcomp/Makefile
index b39cb1d205..a75aa1669e 100644
--- a/usr/src/cmd/shcomp/Makefile
+++ b/usr/src/cmd/shcomp/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -42,7 +42,6 @@ LIBSHELLSRC=$(LIBSHELLBASE)/common/sh
SRCS= $(OBJECTS:%.o=$(LIBSHELLSRC)/%.c)
-GROUP= bin
LDLIBS += -lshell -last
# 1. Make sure that the -D/-U defines in CFLAGS below are in sync
diff --git a/usr/src/cmd/smbios/Makefile b/usr/src/cmd/smbios/Makefile
index 84eef2582c..f3d7803a78 100644
--- a/usr/src/cmd/smbios/Makefile
+++ b/usr/src/cmd/smbios/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
PROG = smbios
OBJS = smbios.o
@@ -35,7 +33,6 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -lsmbios
FILEMODE = 0555
-GROUP = bin
STRIPFLAG =
.KEEP_STATE:
diff --git a/usr/src/cmd/srptsvc/Makefile b/usr/src/cmd/srptsvc/Makefile
index 70e243b34b..9426b37dd5 100644
--- a/usr/src/cmd/srptsvc/Makefile
+++ b/usr/src/cmd/srptsvc/Makefile
@@ -39,8 +39,6 @@ MANIFEST = target.xml
SVCMETHOD = svc-srpt
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)/ibsrp
-$(ROOTMANIFESTDIR)/$(MANIFEST) := OWNER = root
-$(ROOTMANIFESTDIR)/$(MANIFEST) := GROUP = bin
$(ROOTMANIFESTDIR)/$(MANIFEST) := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/ssh/etc/Makefile b/usr/src/cmd/ssh/etc/Makefile
index a42d86cb16..305f328f34 100644
--- a/usr/src/cmd/ssh/etc/Makefile
+++ b/usr/src/cmd/ssh/etc/Makefile
@@ -37,8 +37,6 @@ FILES= sshd_config ssh_config moduli
ETCSSHFILES= $(FILES:%=$(ETCSSHDIR)/%)
$(ETCSSHFILES) := FILEMODE= 644
-$(ETCSSHFILES) := OWNER= root
-$(ETCSSHFILES) := GROUP= sys
ROOTMANIFESTDIR = $(ROOTSVCNETWORK)
diff --git a/usr/src/cmd/stat/fsstat/Makefile b/usr/src/cmd/stat/fsstat/Makefile
index ae02ecb795..2c12416481 100644
--- a/usr/src/cmd/stat/fsstat/Makefile
+++ b/usr/src/cmd/stat/fsstat/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
PROG = fsstat
OBJS = fsstat.o
@@ -39,7 +37,6 @@ COMMON_SRCS = $(COMMON_OBJS:%.o=$(STATCOMMONDIR)/%.c)
LDLIBS += -lkstat
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
FILEMODE= 0555
-GROUP= bin
lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
diff --git a/usr/src/cmd/stat/iostat/Makefile b/usr/src/cmd/stat/iostat/Makefile
index 2f320d9259..bbc3b4c8c1 100644
--- a/usr/src/cmd/stat/iostat/Makefile
+++ b/usr/src/cmd/stat/iostat/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = iostat
OBJS = iostat.o
@@ -35,7 +33,6 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -lkstat -ldevinfo -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
FILEMODE= 0555
-GROUP= bin
lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
@@ -48,7 +45,7 @@ install: all $(ROOTPROG)
$(PROG): $(OBJS) $(COMMON_OBJS)
$(LINK.c) -o $(PROG) $(OBJS) $(COMMON_OBJS) $(LDLIBS)
$(POST_PROCESS)
-
+
%.o : $(STATCOMMONDIR)/%.c
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
diff --git a/usr/src/cmd/stat/mpstat/Makefile b/usr/src/cmd/stat/mpstat/Makefile
index 50e0b5da11..c8638ebb49 100644
--- a/usr/src/cmd/stat/mpstat/Makefile
+++ b/usr/src/cmd/stat/mpstat/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
PROG = mpstat
OBJS = mpstat.o
@@ -35,7 +33,6 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -ldevinfo -lkstat -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
FILEMODE= 0555
-GROUP= bin
lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
@@ -48,7 +45,7 @@ install: all $(ROOTPROG)
$(PROG): $(OBJS) $(COMMON_OBJS)
$(LINK.c) -o $(PROG) $(OBJS) $(COMMON_OBJS) $(LDLIBS)
$(POST_PROCESS)
-
+
%.o : $(STATCOMMONDIR)/%.c
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
diff --git a/usr/src/cmd/stat/vmstat/Makefile b/usr/src/cmd/stat/vmstat/Makefile
index ca934c2ff3..3257070752 100644
--- a/usr/src/cmd/stat/vmstat/Makefile
+++ b/usr/src/cmd/stat/vmstat/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
PROG = vmstat
OBJS = vmstat.o
@@ -35,7 +33,6 @@ include $(SRC)/cmd/stat/Makefile.stat
LDLIBS += -ldevinfo -lkstat -lavl
CFLAGS += $(CCVERBOSE) -I${STATCOMMONDIR}
FILEMODE= 0555
-GROUP= bin
lint := LINTFLAGS = -muxs -I$(STATCOMMONDIR)
@@ -48,7 +45,7 @@ install: all $(ROOTPROG)
$(PROG): $(OBJS) $(COMMON_OBJS)
$(LINK.c) -o $(PROG) $(OBJS) $(COMMON_OBJS) $(LDLIBS)
$(POST_PROCESS)
-
+
%.o : $(STATCOMMONDIR)/%.c
$(COMPILE.c) -o $@ $<
$(POST_PROCESS_O)
diff --git a/usr/src/cmd/stmfsvc/Makefile b/usr/src/cmd/stmfsvc/Makefile
index b2a30e39c6..39221a537d 100644
--- a/usr/src/cmd/stmfsvc/Makefile
+++ b/usr/src/cmd/stmfsvc/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -44,8 +44,6 @@ MANIFEST = stmf.xml
SVCMETHOD = svc-stmf
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
-$(ROOTSVCSYSTEM)/stmf.xml := OWNER = root
-$(ROOTSVCSYSTEM)/stmf.xml := GROUP = bin
$(ROOTSVCSYSTEM)/stmf.xml := FILEMODE = 0444
.KEEP_STATE:
diff --git a/usr/src/cmd/streams/Makefile b/usr/src/cmd/streams/Makefile
index 80c22541c4..7253bde77b 100644
--- a/usr/src/cmd/streams/Makefile
+++ b/usr/src/cmd/streams/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,19 +18,14 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
SUBDIRS= log strcmd
include ../Makefile.cmd
-OWNER= root
-GROUP= sys
-
all:= TARGET= all
install:= TARGET= install
clean:= TARGET= clean
diff --git a/usr/src/cmd/streams/log/Makefile b/usr/src/cmd/streams/log/Makefile
index 69f18cccd9..c3f397ed68 100644
--- a/usr/src/cmd/streams/log/Makefile
+++ b/usr/src/cmd/streams/log/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -33,8 +29,6 @@ include ../../Makefile.cmd
CFLAGS += $(CCVERBOSE)
FILEMODE= 0555
-OWNER= root
-GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/cmd/streams/strcmd/Makefile b/usr/src/cmd/streams/strcmd/Makefile
index 181844ba31..4196ca1b45 100644
--- a/usr/src/cmd/streams/strcmd/Makefile
+++ b/usr/src/cmd/streams/strcmd/Makefile
@@ -18,9 +18,7 @@
#
# CDDL HEADER END
#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -28,9 +26,6 @@ PROG= strchg strconf
include ../../Makefile.cmd
-OWNER= root
-GROUP= root
-
.KEEP_STATE:
all: $(PROG)
diff --git a/usr/src/cmd/su/Makefile b/usr/src/cmd/su/Makefile
index 9046af3a10..6eb13dd6df 100644
--- a/usr/src/cmd/su/Makefile
+++ b/usr/src/cmd/su/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# build two versions, su and su.static
# su.static is dynamically linked; the .static suffix is historical.
@@ -41,8 +39,6 @@ PROG_STATIC = $(ROOTSBIN)/$(ROOTFS_PROG)
# set /usr/bin/su to 4555; set /sbin/su.static to 0555
FILEMODE = 04555
-GROUP = sys
-
$(PROG_STATIC) := FILEMODE = 0555
# A reduced su.static is created, with just enough functionality
diff --git a/usr/src/cmd/sulogin/Makefile b/usr/src/cmd/sulogin/Makefile
index 2f3ca31eba..caa77495e8 100644
--- a/usr/src/cmd/sulogin/Makefile
+++ b/usr/src/cmd/sulogin/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,9 +32,6 @@ LDLIBS += -lsecdb
FILEMODE = 0555
-OWNER = root
-GROUP = bin
-
.KEEP_STATE:
all: $(ROOTFS_PROG)
diff --git a/usr/src/cmd/svc/Makefile b/usr/src/cmd/svc/Makefile
index 27291de57b..c7eb639bbf 100644
--- a/usr/src/cmd/svc/Makefile
+++ b/usr/src/cmd/svc/Makefile
@@ -48,8 +48,6 @@ XMLDIR = $(ROOT)/usr/share/lib/xml
ROOTDTDS = $(DTDS:%=$(XMLDIR)/%)
$(ROOTDTDS) := FILEMODE = 444
-$(ROOTDTDS) := OWNER = root
-$(ROOTDTDS) := GROUP = bin
#
# Definitions for class action scripts
diff --git a/usr/src/cmd/svc/configd/Makefile b/usr/src/cmd/svc/configd/Makefile
index 5ad64d9ba5..849bc9eb19 100644
--- a/usr/src/cmd/svc/configd/Makefile
+++ b/usr/src/cmd/svc/configd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
MYPROG = svc.configd
MYOBJS = \
@@ -76,8 +74,6 @@ $(NATIVE_BUILD)LDLIBS = -L$(LIBUUTIL)/native -R $(LIBUUTIL)/native \
DIRMODE = 0755
FILEMODE = 0555
-OWNER = root
-GROUP = sys
LIBSQLITE = $(ROOT)/usr/lib/libsqlite.o
$(NATIVE_BUILD)LIBSQLITE = $(ROOT)/usr/lib/libsqlite-native.o
diff --git a/usr/src/cmd/svc/milestone/Makefile b/usr/src/cmd/svc/milestone/Makefile
index d727a17ebb..496b997ad9 100644
--- a/usr/src/cmd/svc/milestone/Makefile
+++ b/usr/src/cmd/svc/milestone/Makefile
@@ -25,8 +25,6 @@
include ../../Makefile.cmd
-OWNER = root
-GROUP = sys
FILEMODE = 0444
BUILTXML= \
diff --git a/usr/src/cmd/svc/profile/Makefile b/usr/src/cmd/svc/profile/Makefile
index ffa60a6ab3..a964d396c2 100644
--- a/usr/src/cmd/svc/profile/Makefile
+++ b/usr/src/cmd/svc/profile/Makefile
@@ -20,15 +20,12 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
include ../../Makefile.cmd
-OWNER = root
-GROUP = sys
FILEMODE = 0444
ROOTPROFILE = $(ROOT)/var/svc/profile
diff --git a/usr/src/cmd/svc/seed/Makefile b/usr/src/cmd/svc/seed/Makefile
index b8e915ca63..250ed93645 100644
--- a/usr/src/cmd/svc/seed/Makefile
+++ b/usr/src/cmd/svc/seed/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -105,8 +105,6 @@ MINIROOT_DESCRIPTIONS= \
../../nscd/name-service-cache.xml \
../../syslogd/system-log.xml
-OWNER = root
-GROUP = sys
FILEMODE = 0600
SEEDFILEMODE = 0444 # seeds are not intended for editing, but may
# be copied
diff --git a/usr/src/cmd/svc/shell/Makefile b/usr/src/cmd/svc/shell/Makefile
index a42f34c849..3367b317be 100644
--- a/usr/src/cmd/svc/shell/Makefile
+++ b/usr/src/cmd/svc/shell/Makefile
@@ -23,8 +23,6 @@
include ../../Makefile.cmd
-OWNER = root
-GROUP = bin
FILEMODE = 0444
SRCS = \
diff --git a/usr/src/cmd/svc/startd/Makefile b/usr/src/cmd/svc/startd/Makefile
index 582cf512c1..00ada48f5b 100644
--- a/usr/src/cmd/svc/startd/Makefile
+++ b/usr/src/cmd/svc/startd/Makefile
@@ -79,8 +79,6 @@ LDLIBS_i386 += -lgrubmgmt
LDLIBS += $(LDLIBS_$(MACH))
FILEMODE = 0555
-OWNER = root
-GROUP = sys
# lint doesn't like the unused _umem_*_init()
# And lint thinks uadmin() is undefined.
diff --git a/usr/src/cmd/swap/Makefile.com b/usr/src/cmd/swap/Makefile.com
index c5d4e75ef6..451fb51b65 100644
--- a/usr/src/cmd/swap/Makefile.com
+++ b/usr/src/cmd/swap/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/swap/Makefile.com
PROG= swap
@@ -37,7 +34,6 @@ CFLAGS += $(CCVERBOSE)
CPPFLAGS += -D_LARGEFILE64_SOURCE
CFLAGS64 += $(CCVERBOSE)
-GROUP=sys
FILEMODE=02555
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/sysdef/Makefile b/usr/src/cmd/sysdef/Makefile
index 66dd0cedb4..b72892bf86 100644
--- a/usr/src/cmd/sysdef/Makefile
+++ b/usr/src/cmd/sysdef/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -42,8 +38,6 @@ lint := TARGET = lint
RELUSRSBIN= ../usr/sbin
ROOTSYMLINK= $(ROOTETC)/$(PROG)
-OWNER= root
-GROUP= sys
FILEMODE= 0555
.KEEP_STATE:
diff --git a/usr/src/cmd/sysdef/Makefile.com b/usr/src/cmd/sysdef/Makefile.com
index b421c89844..df73086429 100644
--- a/usr/src/cmd/sysdef/Makefile.com
+++ b/usr/src/cmd/sysdef/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1997, 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= sysdef
OBJS= $(PROG).o sdevinfo.o
@@ -34,8 +31,6 @@ include ../../Makefile.cmd
LDLIBS += -ldevinfo -lelf
-OWNER= root
-GROUP= sys
FILEMODE= 02555
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/syseventadm/Makefile b/usr/src/cmd/syseventadm/Makefile
index 554002269a..95a3a0fdc3 100644
--- a/usr/src/cmd/syseventadm/Makefile
+++ b/usr/src/cmd/syseventadm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/syseventadm/Makefile
@@ -35,8 +31,6 @@ OBJS = $(PROG).o
include ../Makefile.cmd
-OWNER= root
-GROUP= sys
FILEMODE= 0555
POFILES = $(SRCS:.c=.po)
diff --git a/usr/src/cmd/syseventd/Makefile.com b/usr/src/cmd/syseventd/Makefile.com
index c629fc847d..76b110621a 100644
--- a/usr/src/cmd/syseventd/Makefile.com
+++ b/usr/src/cmd/syseventd/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# Compile flags & libraries for all sysevent daemons and modules
@@ -72,27 +69,7 @@ ROOTLIBSYSEVENTSYSEVENTD = $(PROG:%=$(ROOTLIBSYSEVENTDIR)/%)
ROOTETCSYSEVENTCONFIGFILES= $(CONFIG_FILES:%=$(ROOTETCSYSEVENTCONFIGDIR)/%)
#
-# explicit ownership and permissions
+# explicit permissions
#
-$(ROOTLIBSYSEVENTDIR) := OWNER= root
-$(ROOTLIBSYSEVENTDIR) := GROUP= bin
-
-$(ROOTLIBSYSEVENTSYSEVENTD) := OWNER= root
-$(ROOTLIBSYSEVENTSYSEVENTD) := GROUP= bin
-
-$(ROOTLIBSYSEVENTSYSEVENTCONFD) := OWNER= root
-$(ROOTLIBSYSEVENTSYSEVENTCONFD) := GROUP= bin
-
-$(ROOTLIBSYSEVENTMODULEDIR) := OWNER= root
-$(ROOTLIBSYSEVENTMODULEDIR) := GROUP= bin
-
-$(ROOTETCSYSEVENTDIR) := OWNER= root
-$(ROOTETCSYSEVENTDIR) := GROUP= sys
-
-$(ROOTETCSYSEVENTCONFIGDIR) := OWNER= root
-$(ROOTETCSYSEVENTCONFIGDIR) := GROUP= sys
-
-$(ROOTETCSYSEVENTCONFIGFILES) := OWNER= root
-$(ROOTETCSYSEVENTCONFIGFILES) := GROUP= sys
$(ROOTETCSYSEVENTCONFIGFILES) := FILEMODE= 0444
diff --git a/usr/src/cmd/syslogd/Makefile.com b/usr/src/cmd/syslogd/Makefile.com
index 952fdfea9e..0005ab31ba 100644
--- a/usr/src/cmd/syslogd/Makefile.com
+++ b/usr/src/cmd/syslogd/Makefile.com
@@ -18,11 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= syslogd
ROTATESCRIPT= newsyslog
@@ -47,9 +45,6 @@ VARSYSLOG= syslog
VARAUTHLOG= authlog
ROOTVARLOGD= $(ROOT)/var/log
-OWNER= root
-GROUP= sys
-
ROOTETCCONFIG= $(CONFIGFILE:%=$(ROOTETC)/%)
ROOTLIBROTATE= $(ROTATESCRIPT:%=$(ROOTLIB)/%)
ROOTVARSYSLOG= $(VARSYSLOG:%=$(ROOTVARLOGD)/%)
diff --git a/usr/src/cmd/tcpd/Makefile b/usr/src/cmd/tcpd/Makefile
index 7469e1a1f6..2ab048cf6d 100644
--- a/usr/src/cmd/tcpd/Makefile
+++ b/usr/src/cmd/tcpd/Makefile
@@ -1,9 +1,7 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG = safe_finger tcpd tcpdchk tcpdmatch try-from
@@ -55,8 +53,6 @@ DISTFILES = environ.c fakelog.c hosts_access.3 hosts_access.4 \
tcpdmatch.c try-from.c README.sfw $(SRCONLY)
ROOTSRC = $(ROOT)/usr/share/src/tcp_wrappers
-$(ROOTSRC) := OWNER = root
-$(ROOTSRC) := GROUP = bin
ROOTMAN = $(ROOT)/usr/share/man
ROOTMANPAGES = $(MANPAGES:%=$(ROOTMAN)/%)
ROOTMANDIRS = $(MANDIRS:%=$(ROOTMAN)/%)
diff --git a/usr/src/cmd/terminfo/Makefile b/usr/src/cmd/terminfo/Makefile
index bdd865ab9c..553f2ea947 100644
--- a/usr/src/cmd/terminfo/Makefile
+++ b/usr/src/cmd/terminfo/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -53,8 +50,6 @@ ECHO= echo
ROOTSHARELIBDIR = $(ROOT)/usr/share/lib
ROOTTABDIR = $(ROOTSHARELIBDIR)/tabset
ROOTTERMDIR = $(ROOTSHARELIBDIR)/terminfo
-OWNER = root
-GROUP = bin
DIRS= $(ROOTTERMDIR) $(ROOTTABDIR)
ROOTSYMLINK = $(ROOTETC)/termcap
@@ -82,8 +77,6 @@ $(PROG).src: $(PARTS)
$(ROOTTERMDIR)/s/sun: $(PROG).src
TERMINFO=$(ROOTTERMDIR) 2>&1 $(TIC) -v $(PROG).src > errs
- $(CHOWN) -R $(OWNER) $(ROOTTERMDIR)
- $(CHGRP) -R $(GROUP) $(ROOTTERMDIR)
@$(ECHO) "\n`2>/dev/null cat errs|wc -l` entries have been compiled\n"
@-( 2>/dev/null cat errs|grep -iv "^mkdir"|grep -iv "^create"|grep -iv "^link"|grep -vi terminfo.src|grep -vi touch|grep -vi "working"; \
if [ $$? -ne 0 ] ; \
diff --git a/usr/src/cmd/th_tools/Makefile b/usr/src/cmd/th_tools/Makefile
index f45c912c94..b2eb73cfe5 100644
--- a/usr/src/cmd/th_tools/Makefile
+++ b/usr/src/cmd/th_tools/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
PROG = th_manage th_define
SHFILES = th_script
@@ -45,7 +43,6 @@ ROOTPROG = $(PROG:%=$(ROOTUSRSBIN)/%)
CLOBBERFILES = $(PROG) $(SHFILE)
-OWNER = root
$(ROOTPROG) := FILEMODE = 0555
.KEEP_STATE:
diff --git a/usr/src/cmd/tip/Makefile b/usr/src/cmd/tip/Makefile
index 32ce22a653..0c04dc41fd 100644
--- a/usr/src/cmd/tip/Makefile
+++ b/usr/src/cmd/tip/Makefile
@@ -1,16 +1,14 @@
#
-# Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for intermachine communications package.
#
# Files are:
# /etc/remote remote host description file
-# /etc/phones phone number file, owned by $(OWNER) and
+# /etc/phones phone number file, owned by uucp and
# mode 6??
-# /var/adm/aculog ACU accounting file, owned by $(OWNER) and
+# /var/adm/aculog ACU accounting file, owned by uucp and
# mode 6?? (if ACULOG defined)
# Presently supports:
# BIZCOMP
@@ -57,10 +55,8 @@ ROOTACULOGD= $(ROOT)/var/adm
ROOTACULOG= $(ROOTACULOGD)/aculog
$(ROOTPROG) := FILEMODE = 4511
-$(ROOTPROG) := OWNER = uucp
$(ROOTETCREMOTE) := FILEMODE = 644
$(ROOTACULOG) := FILEMODE = 600
-$(ROOTACULOG) := OWNER = uucp
LINTFLAGS += -u
CPPFLAGS += -DDEFBR=300 -DDEFFS=BUFSIZ -DACULOG -DUSG
diff --git a/usr/src/cmd/trapstat/sun4u/Makefile b/usr/src/cmd/trapstat/sun4u/Makefile
index 79d0e7a86c..69c6a6d15f 100644
--- a/usr/src/cmd/trapstat/sun4u/Makefile
+++ b/usr/src/cmd/trapstat/sun4u/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PLATFORM = sun4u
PLATLINKS =
@@ -43,7 +41,6 @@ CPPFLAGS += $(IFLAGS) $(ARCHOPTS)
LINTFLAGS += $(LDLIBS) -u
FILEMODE= 0555
-GROUP= bin
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/trapstat/sun4v/Makefile b/usr/src/cmd/trapstat/sun4v/Makefile
index c82cf45905..928139e603 100644
--- a/usr/src/cmd/trapstat/sun4v/Makefile
+++ b/usr/src/cmd/trapstat/sun4v/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PLATFORM = sun4v
PLATLINKS =
@@ -43,7 +41,6 @@ CPPFLAGS += $(IFLAGS) $(ARCHOPTS) -Dsun4v
LINTFLAGS += $(LDLIBS) -u
FILEMODE= 0555
-GROUP= bin
CLEANFILES += $(OBJS)
diff --git a/usr/src/cmd/tsol/Makefile.targ b/usr/src/cmd/tsol/Makefile.targ
index e42655357f..4ccd6eb705 100644
--- a/usr/src/cmd/tsol/Makefile.targ
+++ b/usr/src/cmd/tsol/Makefile.targ
@@ -18,21 +18,15 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# Conditional assignment of default group/owner/permissions for SMF
# manifests and method scripts.
#
-$(ROOTMANIFEST) := OWNER= root
-$(ROOTMANIFEST) := GROUP= sys
$(ROOTMANIFEST) := FILEMODE= 444
-$(ROOTSVCBIN) := OWNER= root
-$(ROOTSVCBIN) := GROUP= bin
$(ROOTSVCBIN) := FILEMODE= 544
clobber: clean
diff --git a/usr/src/cmd/tsol/demo/Makefile b/usr/src/cmd/tsol/demo/Makefile
index a8d28afe21..d88a719921 100644
--- a/usr/src/cmd/tsol/demo/Makefile
+++ b/usr/src/cmd/tsol/demo/Makefile
@@ -18,11 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/libexacct/demo/Makefile
#
@@ -56,12 +54,8 @@ $(ROOTDEMODIR)/%: %
$(ROOTDEMOFILES): $(ROOTDEMODIR)
-$(ROOTDEMODIR) := OWNER = root
-$(ROOTDEMODIR) := GROUP = bin
$(ROOTDEMODIR) := DIRMODE = 755
-$(ROOTDEMOFILES) := OWNER = root
-$(ROOTDEMOFILES) := GROUP = bin
$(ROOTDEMOFILES) := FILEMODE = 555
include ../../../cmd/Makefile.targ
diff --git a/usr/src/cmd/tsol/tsol-zones/Makefile b/usr/src/cmd/tsol/tsol-zones/Makefile
index 9c88e42dec..d08da79d80 100644
--- a/usr/src/cmd/tsol/tsol-zones/Makefile
+++ b/usr/src/cmd/tsol/tsol-zones/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Makefile for tsol-zones service
#
@@ -42,7 +40,6 @@ $(ROOTMANIFESTDIR)/%: %
# install macros and rule
#
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/tsol/zones/Makefile b/usr/src/cmd/tsol/zones/Makefile
index f500e0579b..7ce117c3b9 100644
--- a/usr/src/cmd/tsol/zones/Makefile
+++ b/usr/src/cmd/tsol/zones/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../../Makefile.cmd
@@ -37,8 +35,6 @@ $(ROOTETCZONESFILES) := FILEMODE = 0444
$(ROOTLIBZONES) := DIRMODE = 0755
$(ROOTLIBZONESFILES) := FILEMODE = 0555
-$(ROOTLIBZONESFILES) := OWNER = root
-$(ROOTLIBZONESFILES) := GROUP = sys
all: $(PROG)
install: all $(ROOTETCZONESFILES) $(ROOTLIBZONES) $(ROOTLIBZONESFILES)
diff --git a/usr/src/cmd/ttymon/Makefile b/usr/src/cmd/ttymon/Makefile
index 2f47689912..abe863d46f 100644
--- a/usr/src/cmd/ttymon/Makefile
+++ b/usr/src/cmd/ttymon/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= stty ttymon ttyadm sttydefs
XPG4PROG= stty
@@ -92,8 +90,6 @@ ROOTUSRSBINF= $(USRSBINF:%=$(ROOTUSRSBIN)/%)
ROOTBINF= $(BINF:%=$(ROOTBIN)/%)
$(ROOTLIBF) := FILEMODE = 0555
$(ROOTUSRSBINF) := FILEMODE = 0755
-$(ROOTUSRSBINF) $(ROOTLIBF) := OWNER = root
-$(ROOTUSRSBINF) $(ROOTLIBF) := GROUP = sys
$(LIBSAFD)/% : %
$(INS.file)
diff --git a/usr/src/cmd/uadmin/Makefile b/usr/src/cmd/uadmin/Makefile
index aad6970d8c..b69957dc7c 100644
--- a/usr/src/cmd/uadmin/Makefile
+++ b/usr/src/cmd/uadmin/Makefile
@@ -28,9 +28,6 @@ ROOTFS_PROG= $(PROG)
include ../Makefile.cmd
-OWNER = root
-GROUP = sys
-
i386_LDLIBS += -lscf
LDLIBS += -lbsm
LDLIBS += $($(MACH)_LDLIBS)
diff --git a/usr/src/cmd/ucodeadm/Makefile b/usr/src/cmd/ucodeadm/Makefile
index a7e2d7243b..1155f50081 100644
--- a/usr/src/cmd/ucodeadm/Makefile
+++ b/usr/src/cmd/ucodeadm/Makefile
@@ -52,8 +52,6 @@ LDLIBS = -lgen
DIRMODE = 0755
FILEMODE = 0555
-OWNER = root
-GROUP = sys
$(ROOTINTELUCODE) := FILEMODE = 0444
$(ROOTAMDUCODE) := FILEMODE = 0444
diff --git a/usr/src/cmd/unlink/Makefile b/usr/src/cmd/unlink/Makefile
index 8341d3cc74..1a2c6d59bc 100644
--- a/usr/src/cmd/unlink/Makefile
+++ b/usr/src/cmd/unlink/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= unlink
@@ -30,7 +27,6 @@ PROG= unlink
include ../Makefile.cmd
FILEMODE = 0555
-OWNER = root
.KEEP_STATE:
diff --git a/usr/src/cmd/utmp_update/Makefile b/usr/src/cmd/utmp_update/Makefile
index f542dc376c..6f61bc6df4 100644
--- a/usr/src/cmd/utmp_update/Makefile
+++ b/usr/src/cmd/utmp_update/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= utmp_update
@@ -30,8 +27,6 @@ PROG= utmp_update
include ../Makefile.cmd
FILEMODE = 4555
-OWNER = root
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/utmpd/Makefile b/usr/src/cmd/utmpd/Makefile
index 1c623e6d50..ecb124120c 100644
--- a/usr/src/cmd/utmpd/Makefile
+++ b/usr/src/cmd/utmpd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= utmpd
DEFAULTFILES= utmpd.dfl
@@ -35,8 +33,6 @@ include ../Makefile.cmd
ROOTMANIFESTDIR = $(ROOTSVCSYSTEM)
FILEMODE = 555
-OWNER = root
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/vi/Makefile b/usr/src/cmd/vi/Makefile
index c3d1393fee..3cfb6b443f 100644
--- a/usr/src/cmd/vi/Makefile
+++ b/usr/src/cmd/vi/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/vi/Makefile
@@ -37,9 +33,6 @@ include ../Makefile.cmd
#
POFILE= vi.po
-OWNER= root
-GROUP= sys
-
all:= TARGET= all
install:= TARGET= install
clean:= TARGET= clean
diff --git a/usr/src/cmd/w/amd64/Makefile b/usr/src/cmd/w/amd64/Makefile
index 00c1c1f1da..8e80f8c4b1 100644
--- a/usr/src/cmd/w/amd64/Makefile
+++ b/usr/src/cmd/w/amd64/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= w
@@ -40,8 +37,6 @@ CFLAGS64 += $(CCVERBOSE)
ROOTLINK= $(ROOTBIN64)/uptime
FILEMODE= 4555
-OWNER= root # w needs to read /proc entries
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/w/i386/Makefile b/usr/src/cmd/w/i386/Makefile
index f8a2b50087..7e806136fc 100644
--- a/usr/src/cmd/w/i386/Makefile
+++ b/usr/src/cmd/w/i386/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/w/i386/Makefile
@@ -43,8 +39,6 @@ lint := LINTFLAGS = -x
ROOTLINK= $(ROOTBIN32)/uptime
FILEMODE= 4555
-OWNER= root # w needs to read /proc entries
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/w/sparcv9/Makefile b/usr/src/cmd/w/sparcv9/Makefile
index a712d32558..a83b770b3c 100644
--- a/usr/src/cmd/w/sparcv9/Makefile
+++ b/usr/src/cmd/w/sparcv9/Makefile
@@ -18,8 +18,7 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/w/sparcv9/Makefile
@@ -41,8 +40,6 @@ lint := LINTFLAGS64 = -x -m64
ROOTLINK= $(ROOTBIN64)/uptime
FILEMODE= 4555
-OWNER= root # w needs to read /proc entries
-GROUP= bin
.KEEP_STATE:
diff --git a/usr/src/cmd/wall/Makefile b/usr/src/cmd/wall/Makefile
index b08bebc8c7..193d5d0035 100644
--- a/usr/src/cmd/wall/Makefile
+++ b/usr/src/cmd/wall/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
PROG= wall
@@ -30,7 +27,6 @@ PROG= wall
include ../Makefile.cmd
FILEMODE = 02555
-GROUP = tty
.KEEP_STATE:
diff --git a/usr/src/cmd/wbem/Makefile.cmd b/usr/src/cmd/wbem/Makefile.cmd
index dbd4a2184d..94f0484a9e 100644
--- a/usr/src/cmd/wbem/Makefile.cmd
+++ b/usr/src/cmd/wbem/Makefile.cmd
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
# cmd/wbem/Makefile.cmd
#
@@ -49,8 +45,6 @@ $(ROOTWBEM32) $(ROOTWBEM64): $(ROOTWBEMDIRS)
DIRMODE= 755
FILEMODE= 755
-OWNER= root
-GROUP= sys
$(ROOTWBEM32)/%: %
$(INS.file)
diff --git a/usr/src/cmd/wbem/Makefile.com b/usr/src/cmd/wbem/Makefile.com
index 9437d084a8..dbd973d926 100644
--- a/usr/src/cmd/wbem/Makefile.com
+++ b/usr/src/cmd/wbem/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2001-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/wbem/Makefile.com
#
# Definitions common to both helper commands and providers.
@@ -46,11 +43,7 @@ ROOTWBEMDIRS= $(ROOTSADM) $(ROOTSADMLIB) $(ROOTWBEM) $(ROOTMOF)
DIRMODE= 755
FILEMODE= 755
-OWNER= root
-GROUP= sys
-$(ROOTSADM) := GROUP= bin
-$(ROOTSADMLIB) := GROUP= bin
$(ROOTMOFPROG) := FILEMODE= 644
$(ROOTWBEMDIRS):
diff --git a/usr/src/cmd/wbem/provider/c/mof/Makefile b/usr/src/cmd/wbem/provider/c/mof/Makefile
index 09f101f936..c4e33e7644 100644
--- a/usr/src/cmd/wbem/provider/c/mof/Makefile
+++ b/usr/src/cmd/wbem/provider/c/mof/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/cmd/wbem/Makefile.wbem
@@ -32,8 +29,6 @@ REG = Solaris_DMGT1.0.mof Solaris_NFS1.0.mof CIM2.7.mof
DIRMODE= 755
FILEMODE= 644
-OWNER= root
-GROUP= sys
VARSADM= $(ROOT)/var/sadm
VARSADMWBEM= $(ROOT)/var/sadm/wbem
diff --git a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile
index a0208a2f83..d2bf7f352b 100644
--- a/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile
+++ b/usr/src/cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,13 +18,10 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
# cmd/wbem/provider/com/sun/wbem/solarisprovider/srm/Makefile
#
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
#
include $(SRC)/cmd/wbem/Makefile.wbem
@@ -37,8 +33,6 @@ DOCDIR= doc
DIRMODE= 755
FILEMODE= 644
-OWNER= root
-GROUP= sys
ROOTCOM= $(ROOTWBEM)/com
ROOTCOMSUN= $(ROOTCOM)/sun
diff --git a/usr/src/cmd/wbem/provider/tools/rds/Makefile.com b/usr/src/cmd/wbem/provider/tools/rds/Makefile.com
index 36a739235d..02a6e4dc6d 100644
--- a/usr/src/cmd/wbem/provider/tools/rds/Makefile.com
+++ b/usr/src/cmd/wbem/provider/tools/rds/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# cmd/wbem/provider/tools/rds/Makefile.com
#
@@ -43,7 +41,6 @@ LINTFLAGS64 += -u
# i.e. permission and group for /usr/bin-style executables
FILEMODE = 0555
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/cmd/who/Makefile b/usr/src/cmd/who/Makefile
index 2752744c74..fea2089b01 100644
--- a/usr/src/cmd/who/Makefile
+++ b/usr/src/cmd/who/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -40,8 +36,6 @@ include ../Makefile.cmd
SED= sed
$(ROOTUTMPS):= FILEMODE= 644
-$(ROOTUTMPS):= OWNER= root
-$(ROOTUTMPS):= GROUP= bin
$(ROOTADM)/%: %
$(INS.file)
@@ -60,8 +54,6 @@ install: all $(ROOTPROG) $(ROOTUTMPS) $(SYMSETC) $(ROOTXPG4PROG)
$(SYMSETC):
-$(RM) $@; $(SYMLINK) ../var/adm/$(@F) $@
- $(CH)@-$(CHOWN) root $@
- $(CH)@-$(CHGRP) bin $@
clean:
diff --git a/usr/src/cmd/whodo/amd64/Makefile b/usr/src/cmd/whodo/amd64/Makefile
index cc7575d906..59abff4e6d 100644
--- a/usr/src/cmd/whodo/amd64/Makefile
+++ b/usr/src/cmd/whodo/amd64/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= whodo
@@ -38,7 +35,6 @@ include ../../Makefile.cmd.64
CFLAGS64 += $(CCVERBOSE)
FILEMODE= 04555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/whodo/i386/Makefile b/usr/src/cmd/whodo/i386/Makefile
index db8d3ce662..71fa35a66d 100644
--- a/usr/src/cmd/whodo/i386/Makefile
+++ b/usr/src/cmd/whodo/i386/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/whodo/i386/Makefile
@@ -41,7 +37,6 @@ CFLAGS += $(CCVERBOSE)
lint := LINTFLAGS = -x
FILEMODE= 04555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/whodo/sparcv9/Makefile b/usr/src/cmd/whodo/sparcv9/Makefile
index 8835ee9eff..bc1ac015a6 100644
--- a/usr/src/cmd/whodo/sparcv9/Makefile
+++ b/usr/src/cmd/whodo/sparcv9/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/whodo/sparcv9/Makefile
@@ -39,7 +39,6 @@ CFLAGS64 += $(CCVERBOSE)
lint := LINTFLAGS64 = -x -m64
FILEMODE= 04555
-OWNER= root
.KEEP_STATE:
diff --git a/usr/src/cmd/write/Makefile b/usr/src/cmd/write/Makefile
index be03323f96..7cd6e710a8 100644
--- a/usr/src/cmd/write/Makefile
+++ b/usr/src/cmd/write/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# cmd/write/Makefile
@@ -35,7 +31,6 @@ SED= sed
DCFILE= $(PROG).dc
FILEMODE = 02555
-GROUP = tty
XGETFLAGS += -a -x write.xcl
.KEEP_STATE:
diff --git a/usr/src/cmd/ypcmd/Makefile b/usr/src/cmd/ypcmd/Makefile
index 2f3cb308d0..55cf13f972 100644
--- a/usr/src/cmd/ypcmd/Makefile
+++ b/usr/src/cmd/ypcmd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
BINPROG = ypmatch ypwhich ypcat
SBINPROG = makedbm ypalias ypinit yppoll ypset
@@ -60,7 +58,6 @@ ypset := LDLIBS += -lnsl
makedbm := MAPFILES = $(MAPFILE.INT) $(MAPFILE.NGB)
makedbm := LDFLAGS += $(MAPFILES:%=-M%)
-$(ROOTVAR_YP)/aliases := GROUP=bin
$(ROOTVAR_YP)/aliases := FILEMODE=555
YPFILES = Makefile aliases nicknames updaters
@@ -153,15 +150,12 @@ ypxfr.o := CPPFLAGS += $(NIS2LDAPINC)
yppush.o := CPPFLAGS += $(NIS2LDAPINC)
$(NIS2LDAPPROG) := CPPFLAGS += $(NIS2LDAPINC)
$(SHAREDOBJ) := CPPFLAGS += -I$(SRC)/lib/libnisdb/yptol
-$(IBINPROG) := GROUP= other
$(ROOTVAR_YP)/Makefile := FILEMODE= 555
$(ROOTVAR_YP)/nicknames := FILEMODE= 644
$(ROOTVAR_YP)/updaters := FILEMODE= 500
$(ROOTETC)/publickey := FILEMODE= 644
# non-default file attributes to avoid conflict with rpcsrc
-$(NETSVC) := GROUP= sys
NETYP = $(NETSVC)/yp
-$(NETYP) := GROUP=bin
all:= TARGET= all
diff --git a/usr/src/cmd/ypcmd/yp2lscripts/Makefile b/usr/src/cmd/ypcmd/yp2lscripts/Makefile
index 664265d2e8..29954aa96f 100644
--- a/usr/src/cmd/ypcmd/yp2lscripts/Makefile
+++ b/usr/src/cmd/ypcmd/yp2lscripts/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,9 +18,7 @@
#
# CDDL HEADER END
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -35,8 +32,6 @@ NETYP = $(NETSVC)/yp
ROOTNETYPFILES= $(OBJS:%=$(NETYP)/%)
$(NETSVC) := FILEMODE=555
-$(NETSVC) := OWNER=root
-$(NETSVC) := GROUP=bin
all: FRC $(OBJS)
diff --git a/usr/src/cmd/ypcmd/yppasswd/Makefile b/usr/src/cmd/ypcmd/yppasswd/Makefile
index 5049d9d8e9..0cdb51721b 100644
--- a/usr/src/cmd/ypcmd/yppasswd/Makefile
+++ b/usr/src/cmd/ypcmd/yppasswd/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
NETYPPROG = rpc.yppasswdd # pwconv passmgmt
DEFAULTFILES = yppasswdd.dfl
@@ -73,10 +71,8 @@ OBJS = $(RPCYPPASSWDDOBJ) \
SRCS = $(OBJS:%.o=%.c)
#conditional assignments
-$(INETSVC) := GROUP=bin
$(INETSVC) := FILEMODE=555
-$(ETCDFLTFILE) := GROUP=sys
$(ETCDFLTFILE) := FILEMODE=0444
#install rules
diff --git a/usr/src/cmd/ypcmd/ypupdated/Makefile b/usr/src/cmd/ypcmd/ypupdated/Makefile
index ad3c3513d3..7f7592c7f0 100644
--- a/usr/src/cmd/ypcmd/ypupdated/Makefile
+++ b/usr/src/cmd/ypcmd/ypupdated/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
NETYPPROG = rpc.ypupdated
PROG = $(NETYPPROG)
@@ -55,7 +53,6 @@ OBJS = $(RPCYPUPDATEOBJ)
SRCS = $(OBJS:%.o=%.c)
#conditional assignments
-$(INETSVC) := GROUP=bin
$(INETSVC) := FILEMODE=555
#install rules
diff --git a/usr/src/cmd/zic/Makefile b/usr/src/cmd/zic/Makefile
index d2bb84c095..06cf5ba052 100644
--- a/usr/src/cmd/zic/Makefile
+++ b/usr/src/cmd/zic/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -20,8 +20,6 @@ TABFILES = continent.tab country.tab zone_sun.tab
OBJS= zic.o scheck.o ialloc.o
SRCS= $(OBJS:%.o=%.c)
NOBJS= $(OBJS:%=$(NATIVE)/%)
-OWNER= root
-GROUP= bin
CLOBBERFILES= $(NOBJS) $(KSHPROG) $(NPROG) $(NATIVE)/zic.c $(NATIVE)/tzfile.h
@@ -59,8 +57,6 @@ $(PROG): $(OBJS)
install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) $(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
$(NPROG) -d $(ROOTTZD) $(TZFILES)
- $(CH) $(CHOWN) -R $(OWNER) $(ROOTTZD)
- $(CH) $(CHGRP) -R $(GROUP) $(ROOTTZD)
$(NPROG): $(NATIVE) $(NOBJS)
$(NATIVECC) -o $@ $(NOBJS)
diff --git a/usr/src/cmd/zlogin/Makefile b/usr/src/cmd/zlogin/Makefile
index 2a9d85d543..4a9e4d0224 100644
--- a/usr/src/cmd/zlogin/Makefile
+++ b/usr/src/cmd/zlogin/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
PROG = zlogin
@@ -32,7 +31,6 @@ LINTFLAGS += -u
LDLIBS += -lsocket -lzonecfg -lcontract -lbrand
CFLAGS += $(CCVERBOSE)
FILEMODE = 0555
-GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/common/mapfiles/amd64/Makefile b/usr/src/common/mapfiles/amd64/Makefile
index e773979df4..6046640442 100644
--- a/usr/src/common/mapfiles/amd64/Makefile
+++ b/usr/src/common/mapfiles/amd64/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
@@ -37,10 +35,8 @@ FILES= $(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
install: $(DIRS) $(FILES) map.link
$(FILES):= FILEMODE=444
-$(FILES):= GROUP=bin
$(DIRS):= DIRMODE=755
-$(DIRS):= GROUP=bin
map.link:
$(RM) $(ROOTDIR64)/map.default
diff --git a/usr/src/common/mapfiles/common/Makefile b/usr/src/common/mapfiles/common/Makefile
index 663ebf2fdb..2c92087154 100644
--- a/usr/src/common/mapfiles/common/Makefile
+++ b/usr/src/common/mapfiles/common/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
@@ -40,10 +38,8 @@ FILES= \
install: $(DIRS) $(FILES)
$(FILES):= FILEMODE=444
-$(FILES):= GROUP=bin
$(DIRS):= DIRMODE=755
-$(DIRS):= GROUP=bin
$(DIRS):
$(INS.dir)
diff --git a/usr/src/common/mapfiles/i386/Makefile b/usr/src/common/mapfiles/i386/Makefile
index 5443f895da..a664baafb8 100644
--- a/usr/src/common/mapfiles/i386/Makefile
+++ b/usr/src/common/mapfiles/i386/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
@@ -39,10 +37,8 @@ FILES= \
install: $(DIRS) $(FILES)
$(FILES):= FILEMODE=444
-$(FILES):= GROUP=bin
$(DIRS):= DIRMODE=755
-$(DIRS):= GROUP=bin
$(DIRS):
$(INS.dir)
diff --git a/usr/src/common/mapfiles/sparc/Makefile b/usr/src/common/mapfiles/sparc/Makefile
index bd7bc823c4..e32b475c5b 100644
--- a/usr/src/common/mapfiles/sparc/Makefile
+++ b/usr/src/common/mapfiles/sparc/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
@@ -38,10 +36,8 @@ FILES= \
install: $(DIRS) $(FILES)
$(FILES):= FILEMODE=444
-$(FILES):= GROUP=bin
$(DIRS):= DIRMODE=755
-$(DIRS):= GROUP=bin
$(DIRS):
$(INS.dir)
diff --git a/usr/src/common/mapfiles/sparcv9/Makefile b/usr/src/common/mapfiles/sparcv9/Makefile
index e8769fc088..d98e3e9802 100644
--- a/usr/src/common/mapfiles/sparcv9/Makefile
+++ b/usr/src/common/mapfiles/sparcv9/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/Makefile.master
@@ -37,10 +35,8 @@ FILES= $(ROOTDIR64)/map.above4G $(ROOTDIR64)/map.below4G
install: $(DIRS) $(FILES) map.link
$(FILES):= FILEMODE=444
-$(FILES):= GROUP=bin
$(DIRS):= DIRMODE=755
-$(DIRS):= GROUP=bin
map.link:
$(RM) $(ROOTDIR64)/map.default
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 5e28b0d25c..d8f31410a8 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -114,8 +114,6 @@ ROOTFS_LINT64= $(LINTSRC:%=$(ROOTFS_LINTDIR64)/%)
ROOTMAN3= $(ROOT)/usr/share/man/man3
ROOTMAN3FILES= $(MAN3FILES:%=$(ROOTMAN3)/%)
$(ROOTMAN3FILES) := FILEMODE= 444
-$(ROOTMAN3FILES) := OWNER= root
-$(ROOTMAN3FILES) := GROUP= bin
# Demo rules
DEMOFILES=
@@ -123,8 +121,6 @@ DEMOFILESRCDIR= common
ROOTDEMODIRBASE= __nonexistent_directory__
ROOTDEMODIRS=
ROOTDEMOFILES= $(DEMOFILES:%=$(ROOTDEMODIRBASE)/%)
-$(ROOTDEMODIRS) := OWNER = root
-$(ROOTDEMODIRS) := GROUP = bin
$(ROOTDEMODIRS) := DIRMODE = 755
LINTLIB= llib-l$(LIBNAME).ln
diff --git a/usr/src/lib/brand/Makefile.brand b/usr/src/lib/brand/Makefile.brand
index 9c27431b47..dfd8b5b5fd 100644
--- a/usr/src/lib/brand/Makefile.brand
+++ b/usr/src/lib/brand/Makefile.brand
@@ -39,32 +39,18 @@ ROOTSHARED= $(SHARED:%=$(ROOTSHAREDDIR)/%)
ROOTTEMPLATES= $(TEMPLATES:%=$(ROOTTEMPLATEDIR)/%)
$(ROOTBRANDDIR) := FILEMODE = 755
-$(ROOTBRANDDIR) := OWNER = root
-$(ROOTBRANDDIR) := GROUP = sys
$(ROOTXMLDOCS) := FILEMODE = 444
-$(ROOTXMLDOCS) := OWNER = root
-$(ROOTXMLDOCS) := GROUP = bin
$(ROOTSHARED) := FILEMODE = 444
-$(ROOTSHARED) := OWNER = root
-$(ROOTSHARED) := GROUP = bin
$(ROOTTEMPLATEDIR) := FILEMODE = 755
-$(ROOTTEMPLATEDIR) := OWNER = root
-$(ROOTTEMPLATEDIR) := GROUP = sys
$(ROOTTEMPLATES) := FILEMODE = 444
-$(ROOTTEMPLATES) := OWNER = root
-$(ROOTTEMPLATES) := GROUP = bin
$(ROOTTXTS) := FILEMODE = 444
-$(ROOTTXTS) := OWNER = root
-$(ROOTTXTS) := GROUP = sys
$(ROOTPROGS) := FILEMODE = 755
-$(ROOTPROGS) := OWNER = root
-$(ROOTPROGS) := GROUP = bin
$(ROOTBRANDDIR)/% $(ROOTBRANDDIR64)/% $(ROOTTEMPLATEDIR)/% $(ROOTSHAREDDIR)/%: %
$(INS.file)
diff --git a/usr/src/lib/brand/lx/zone/distros/Makefile b/usr/src/lib/brand/lx/zone/distros/Makefile
index 7d5ecbfdfd..7b5a600c94 100644
--- a/usr/src/lib/brand/lx/zone/distros/Makefile
+++ b/usr/src/lib/brand/lx/zone/distros/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../../Makefile.lx
@@ -36,8 +34,6 @@ ROOTDISTRODIR= $(ROOTBRANDDIR)/distros
ROOTDISTROS= $(DISTROS:%=$(ROOTDISTRODIR)/%)
$(ROOTDISTROS) := FILEMODE = 444
-$(ROOTDISTROS) := OWNER = root
-$(ROOTDISTROS) := GROUP = bin
$(ROOTDISTRODIR):
$(INS.dir)
diff --git a/usr/src/lib/brand/native/zone/Makefile b/usr/src/lib/brand/native/zone/Makefile
index a7f9dc8cac..2d711cb13b 100644
--- a/usr/src/lib/brand/native/zone/Makefile
+++ b/usr/src/lib/brand/native/zone/Makefile
@@ -27,8 +27,6 @@
ETCBRANDDIR= $(ROOT)/etc/brand/native
ETCUSER= $(USERFILES:%=$(ETCBRANDDIR)/%)
$(ETCUSER) := FILEMODE = 644
-$(ETCUSER) := OWNER = root
-$(ETCUSER) := GROUP = sys
$(ETCBRANDDIR)/%: %
$(INS.file)
diff --git a/usr/src/lib/cfgadm_plugins/Makefile.com b/usr/src/lib/cfgadm_plugins/Makefile.com
index af6647d828..422de44173 100644
--- a/usr/src/lib/cfgadm_plugins/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/cfgadm_plugins/Makefile.com
# This is used by open and closed components, so it uses an absolute
@@ -71,7 +69,7 @@ LINKED_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%)
LINKED_LIB_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib)
LINKED_CFG_DIRS = $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/cfgadm)
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
$(LINKED_DIRS): $(USR_PLAT_DIR)
-$(INS.dir.root.sys)
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
index a191402d23..6393026734 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/cfgadm_plugins/Makefile.com
@@ -38,9 +36,7 @@ OBJECTS= mema.o mema_prom.o mema_test.o mema_test_config.o mema_test_subr.o \
include $(SRC)/lib/Makefile.lib
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) -u root -g bin $@
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
index fe0d0703d0..be002b0f79 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= pci.a
VERS= .1
@@ -34,9 +32,7 @@ include ../../../Makefile.lib
SRCDIR = ../common
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
INS.dir.bin.bin= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.bin.bin= $(INS) -s -d -m $(DIRMODE) -u bin -g bin $@
USR_LIB_DIR = $(ROOT)/usr/lib
USR_LIB_DIR_CFGADM = $(USR_LIB_DIR)/cfgadm
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index f4ab702c77..75469b5cc8 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PLATFORM= sun4u
LIBRARY= sbd.a
@@ -35,9 +33,7 @@ OBJECTS= ap.o ap_msg.o ap_rcm.o ap_sbd.o ap_seq.o cfga.o ap_err.o
include ../../../Makefile.lib
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) -u root -g bin $@
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
index beeeea5b3c..0e5e8d7059 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/cfgadm_plugins/Makefile.com
@@ -37,9 +35,7 @@ OBJECTS= cfga.o
include $(SRC)/lib/Makefile.lib
INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.sys= $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) $@
-$(CH)INS.dir.root.bin= $(INS) -s -d -m $(DIRMODE) -u root -g bin $@
USR_PLAT_DIR = $(ROOT)/usr/platform
USR_PSM_DIR = $(USR_PLAT_DIR)/sun4u
diff --git a/usr/src/lib/efcode/etc/Makefile b/usr/src/lib/efcode/etc/Makefile
index a2f87bdc94..f7aa6e71ea 100644
--- a/usr/src/lib/efcode/etc/Makefile
+++ b/usr/src/lib/efcode/etc/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Efcode cleanup
@@ -50,15 +47,9 @@ DIRS= $(ETCFLASHD) $(ETCFLASHPOSTD)
ETCFLASHPOSTDPROG= $(FLASHPOSTDPROG:%=$(ETCFLASHPOSTD)/%)
-$(ETCFLASHD) := DIRMODE= 755
-$(ETCFLASHD) := OWNER= root
-$(ETCFLASHD) := GROUP= sys
-$(ETCFLASHPOSTD) := DIRMODE= 755
-$(ETCFLASHPOSTD) := OWNER= root
-$(ETCFLASHPOSTD) := GROUP= sys
+$(ETCFLASHD) := DIRMODE= 755
+$(ETCFLASHPOSTD) := DIRMODE= 755
$(ETCFLASHPOSTDPROG) := FILEMODE= 0744
-$(ETCFLASHPOSTDPROG) := OWNER= root
-$(ETCFLASHPOSTDPROG) := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 5e1201c90e..2f0fa7e3c3 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -34,7 +34,6 @@
LIBRARY= mech_krb5.a
VERS = .1
-GROUP= sys
FILEMODE= 755
# objects are listed by source directory
diff --git a/usr/src/lib/hbaapi/Makefile.com b/usr/src/lib/hbaapi/Makefile.com
index 5c3f576857..b6b188cee7 100644
--- a/usr/src/lib/hbaapi/Makefile.com
+++ b/usr/src/lib/hbaapi/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -34,8 +34,6 @@ include ../../Makefile.lib
HETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%)
HETCFILES:= FILEMODE= 644
-HETCFILES:= OWNER= root
-HETCFILES:= GROUP= sys
LIBS = $(DYNLIB) $(LINTLIB)
SRCDIR= ../common
diff --git a/usr/src/lib/libbrand/Makefile b/usr/src/lib/libbrand/Makefile
index 2f40dfb9f6..9e2f22e24c 100644
--- a/usr/src/lib/libbrand/Makefile
+++ b/usr/src/lib/libbrand/Makefile
@@ -19,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
include ../Makefile.lib
@@ -39,8 +38,6 @@ HDRDIR= common
HDRS= libbrand.h
FILEMODE = 644
-OWNER = root
-GROUP = bin
BRANDDIR= brand
ROOTBRANDDIR= $(ROOTLIBDIR)/$(BRANDDIR)
diff --git a/usr/src/lib/libbsm/Makefile b/usr/src/lib/libbsm/Makefile
index e746b86cd0..48afff37c7 100644
--- a/usr/src/lib/libbsm/Makefile
+++ b/usr/src/lib/libbsm/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -70,22 +70,16 @@ clean clobber delete: $(SUBDIRS)
ROOTETCSECURITY = $(ROOT)/etc/security
$(ROOTETCSECURITY) := DIRMODE = 0755
-$(ROOTETCSECURITY) := OWNER = root
-$(ROOTETCSECURITY) := GROUP = sys
ESFILES = audit_class audit_control audit_event audit_user
ESSRC = $(ESFILES:%=%.txt)
ETCSECURITYFILES = $(ESFILES:%=$(ROOTETCSECURITY)/%)
$(ETCSECURITYFILES) := FILEMODE = 0644
-$(ETCSECURITYFILES) := OWNER = root
-$(ETCSECURITYFILES) := GROUP = sys
EESFILES = audit_startup
EESSRC = $(EESFILES:%=%.txt)
EETCSECURITYFILES = $(EESFILES:%=$(ROOTETCSECURITY)/%)
$(EETCSECURITYFILES) := FILEMODE = 0744
-$(EETCSECURITYFILES) := OWNER = root
-$(EETCSECURITYFILES) := GROUP = sys
#
# /etc/security/audit/localhost/files is a symbolic link to /var/audit.
@@ -96,8 +90,6 @@ RESAL=$(RESA)/localhost
VARAUDIT=$(ROOT)/var/audit
AUDITDIRS=$(RESA) $(RESAL) $(VARAUDIT)
$(AUDITDIRS) := FILEMODE = 0750
-$(AUDITDIRS) := OWNER = root
-$(AUDITDIRS) := GROUP = sys
ARSYMLNK=$(RESAL)/files
@@ -121,12 +113,8 @@ ROOTXMLDIRS = $(ROOTXMLDIR) $(ROOTDTDDIR) $(ROOTXSLDIR)
ROOTXMLFILES = $(ROOTDTD) $(ROOTXSL)
$(ROOTXMLDIRS) := FILEMODE = 755
-$(ROOTXMLDIRS) := OWNER = root
-$(ROOTXMLDIRS) := GROUP = sys
$(ROOTXMLFILES) := FILEMODE = 444
-$(ROOTXMLFILES) := OWNER = root
-$(ROOTXMLFILES) := GROUP = bin
CPPFLAGS += -I$(COMMONDIR)
diff --git a/usr/src/lib/libc/i386/etc/Makefile b/usr/src/lib/libc/i386/etc/Makefile
index 703a7a556d..98506e66f6 100644
--- a/usr/src/lib/libc/i386/etc/Makefile
+++ b/usr/src/lib/libc/i386/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile for libc-related x86 flarcreate precreation scripts
@@ -52,20 +48,10 @@ DIRS= $(ETCFLASHPREC) $(ETCFLASHPREE) $(ETCFLASHPOSTC)
ETCFLASHPREPROG= $(FLASHPREPROG:%=$(ETCFLASHPREC)/%)
$(ETCFLASHD) := DIRMODE= 755
-$(ETCFLASHD) := OWNER= root
-$(ETCFLASHD) := GROUP= sys
$(ETCFLASHPREC) := DIRMODE= 700
-$(ETCFLASHPREC) := OWNER= root
-$(ETCFLASHPREC) := GROUP= sys
$(ETCFLASHPREE) := DIRMODE= 700
-$(ETCFLASHPREE) := OWNER= root
-$(ETCFLASHPREE) := GROUP= sys
$(ETCFLASHPOSTC) := DIRMODE= 700
-$(ETCFLASHPOSTC) := OWNER= root
-$(ETCFLASHPOSTC) := GROUP= sys
$(ETCFLASHPREPROG) := FILEMODE= 0500
-$(ETCFLASHPREPROG) := OWNER= root
-$(ETCFLASHPREPROG) := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/lib/libc_psr/etc/Makefile b/usr/src/lib/libc_psr/etc/Makefile
index a3c9cecf3e..4fae2758ed 100644
--- a/usr/src/lib/libc_psr/etc/Makefile
+++ b/usr/src/lib/libc_psr/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile for libc_psr (hwcap) flarcreate precreation scripts
@@ -52,20 +48,10 @@ DIRS= $(ETCFLASHPREC) $(ETCFLASHPREE) $(ETCFLASHPOSTC)
ETCFLASHPREPROG= $(FLASHPREPROG:%=$(ETCFLASHPREC)/%)
$(ETCFLASHD) := DIRMODE= 755
-$(ETCFLASHD) := OWNER= root
-$(ETCFLASHD) := GROUP= sys
$(ETCFLASHPREC) := DIRMODE= 700
-$(ETCFLASHPREC) := OWNER= root
-$(ETCFLASHPREC) := GROUP= sys
$(ETCFLASHPREE) := DIRMODE= 700
-$(ETCFLASHPREE) := OWNER= root
-$(ETCFLASHPREE) := GROUP= sys
$(ETCFLASHPOSTC) := DIRMODE= 700
-$(ETCFLASHPOSTC) := OWNER= root
-$(ETCFLASHPOSTC) := GROUP= sys
$(ETCFLASHPREPROG) := FILEMODE= 0500
-$(ETCFLASHPREPROG) := OWNER= root
-$(ETCFLASHPREPROG) := GROUP= sys
.KEEP_STATE:
diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile b/usr/src/lib/libc_psr/sun4u-opl/Makefile
index afe82538d2..8bdf09f488 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/Makefile.lib
include $(SRC)/Makefile.psm
@@ -41,10 +39,10 @@ clobber := TARGET= clobber
MODULE = libc_psr.so.1
LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
-INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
#
# Used when building links in /platform/$(PLATFORM)/lib
diff --git a/usr/src/lib/libc_psr/sun4u-us3/Makefile b/usr/src/lib/libc_psr/sun4u-us3/Makefile
index 73b94e840c..dd9baaa89a 100644
--- a/usr/src/lib/libc_psr/sun4u-us3/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-us3/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include $(SRC)/lib/Makefile.lib
include $(SRC)/Makefile.psm
@@ -40,10 +38,10 @@ TOUCH = /usr/bin/touch
MODULE = libc_psr.so.1
LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
-INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink7 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
#
# Used when building links in /platform/$(PLATFORM)/lib
diff --git a/usr/src/lib/libc_psr/sun4u/sparc/Makefile b/usr/src/lib/libc_psr/sun4u/sparc/Makefile
index 184190b771..8531739c8d 100644
--- a/usr/src/lib/libc_psr/sun4u/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/sparc/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# Platform specific Makefile for libc_psr.
@@ -48,7 +46,7 @@ BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
MODULE = libc_psr.so.1
LIBC_PSR_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib)
LIBC_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
$(LIBC_PSR_DIRS):
-$(INS.dir.root.bin)
diff --git a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
index 7079ffd707..30b5968784 100644
--- a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -48,7 +48,7 @@ BUILD.SO= $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
MODULE = libc_psr.so.1
LIBC_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
LIBC_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
$(LIBC_PSR64_DIRS):
-$(INS.dir.root.bin)
diff --git a/usr/src/lib/libdtrace/Makefile b/usr/src/lib/libdtrace/Makefile
index 7aa994108e..c24a0800ce 100644
--- a/usr/src/lib/libdtrace/Makefile
+++ b/usr/src/lib/libdtrace/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.lib
@@ -46,8 +44,6 @@ all clean clobber lint yydebug: $(SUBDIRS)
install: install_h $(SUBDIRS)
-$(ROOTHDRS) := GROUP = bin
-
install_h: $(ROOTHDRS)
check: $(CHECKHDRS)
diff --git a/usr/src/lib/libexacct/demo/Makefile b/usr/src/lib/libexacct/demo/Makefile
index 54ad28fe0b..1e0e7a313a 100644
--- a/usr/src/lib/libexacct/demo/Makefile
+++ b/usr/src/lib/libexacct/demo/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/libexacct/demo/Makefile
#
@@ -64,12 +61,8 @@ $(ROOTDEMODIR)/%: %
$(ROOTDEMOFILES): $(ROOTDEMODIR)
-$(ROOTDEMODIR) := OWNER = root
-$(ROOTDEMODIR) := GROUP = bin
$(ROOTDEMODIR) := DIRMODE = 755
-$(ROOTDEMOFILES) := OWNER = root
-$(ROOTDEMOFILES) := GROUP = bin
$(ROOTDEMOFILES) := FILEMODE = 644
include ../../../cmd/Makefile.targ
diff --git a/usr/src/lib/libima/Makefile.com b/usr/src/lib/libima/Makefile.com
index 2d339cb25a..48f4c5b6e6 100644
--- a/usr/src/lib/libima/Makefile.com
+++ b/usr/src/lib/libima/Makefile.com
@@ -34,8 +34,6 @@ include ../../Makefile.lib
IETCFILES= $(CONFIGFILE:%=$(ROOTETC)/%)
IETCFILES:= FILEMODE= 644
-IETCFILES:= OWNER= root
-IETCFILES:= GROUP= sys
LIBS = $(DYNLIB) $(LINTLIB)
LDLIBS += -lc
diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com
index 4eb79481c5..05358fba47 100644
--- a/usr/src/lib/libmd/Makefile.com
+++ b/usr/src/lib/libmd/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# $LIBRARY is set in lower makefiles so we can have platform and
# processor optimised versions of this library via libmd_psr and libmd_hwcapN
@@ -102,9 +100,9 @@ LIBMD_PSR_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MODULE))
LIBMD_PSR64_DIRS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64))
LIBMD_PSR64_LINKS = $(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
-INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6 = $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
-INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink64 = $(RM) -r $@; $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
$(LIBMD_PSR_DIRS):
-$(INS.dir.root.bin)
diff --git a/usr/src/lib/libpam/Makefile b/usr/src/lib/libpam/Makefile
index d91d435700..e653cc877b 100644
--- a/usr/src/lib/libpam/Makefile
+++ b/usr/src/lib/libpam/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.lib
@@ -42,7 +40,6 @@ HDRDIR= .
ETCFILES= pam.conf
ROOTETC= $(ROOT)/etc
IETCFILES= $(ETCFILES:%=$(ROOTETC)/%)
-$(IETCFILES) := GROUP= sys
all := TARGET= all
clean := TARGET= clean
diff --git a/usr/src/lib/libpcp/Makefile.com b/usr/src/lib/libpcp/Makefile.com
index f7f8d25ed4..43328dbebd 100644
--- a/usr/src/lib/libpcp/Makefile.com
+++ b/usr/src/lib/libpcp/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libpcp.a
VERS= .1
@@ -51,9 +49,9 @@ LIBS = $(DYNLIB) $(LINTLIB)
CFLAGS += $(CCVERBOSE)
LDLIBS += -lc -lumem -ldevinfo
PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lpcp.ln $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so.1 $@
+INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libpcp.so $@
+INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lpcp.ln $@
.KEEP_STATE:
diff --git a/usr/src/lib/libpcp/sparc/Makefile b/usr/src/lib/libpcp/sparc/Makefile
index 5c2809b7df..f647d6b506 100644
--- a/usr/src/lib/libpcp/sparc/Makefile
+++ b/usr/src/lib/libpcp/sparc/Makefile
@@ -18,8 +18,7 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/libpcp/sparc/Makefile
@@ -53,7 +52,7 @@ include ../Makefile.com
#
$(PLATLIBS)/libpcp.so:
- $(RM) -r $@; $(SYMLINK) libpcp.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) libpcp.so.1 $@
$(USR_PSM_LIB_DIR)/%: % $(USR_PSM_LIB_DIR)
$(INS.file)
diff --git a/usr/src/lib/libpool/Makefile b/usr/src/lib/libpool/Makefile
index c9e929b86e..83e995e15e 100644
--- a/usr/src/lib/libpool/Makefile
+++ b/usr/src/lib/libpool/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.lib
@@ -65,8 +63,6 @@ XMLDIR = $(ROOT)/usr/share/lib/xml
ROOTDTDS= $(DTDS:%=$(XMLDIR)/%)
$(ROOTDTDS) := FILEMODE = 444
-$(ROOTDTDS) := OWNER = root
-$(ROOTDTDS) := GROUP = bin
$(XMLDIR)/%: %
$(INS.file)
diff --git a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
index e954427363..bdc057b8df 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
+++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libprtdiag_psr.a
VERS= .1
@@ -57,7 +55,7 @@ IFLAGS += -I $(UTSCLOSED)/sun4u/sunfire -I $(UTSBASE)/sun4u/sunfire
CPPFLAGS = $(IFLAGS) $(CPPFLAGS.master)
LDLIBS += -L $(ROOT)/usr/platform/$(PSR_MACH)/lib -lprtdiag -lc
DYNFLAGS += -R /usr/platform/$(PSR_MACH)/lib
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libprtdiag_psr.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libprtdiag_psr.so.1 $@
.KEEP_STATE:
diff --git a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile
index 1f15ae4d58..cde7f31b5c 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile
+++ b/usr/src/lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/libprtdiag_psr/sparc/desktop/nonpicl/Makefile
UTSBASE = $(SRC)/uts
@@ -79,7 +77,7 @@ $(USR_PSM_LIB_DIR):
#
$(USR_DEF_PSM_LIB_DIR)/%: % $(USR_DEF_PSM_LIB_DIR)
$(RM) -r $@; \
- $(SYMLINK) ../../$(PLATFORM)/lib/libprtdiag_psr.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(SYMLINK) ../../$(PLATFORM)/lib/libprtdiag_psr.so.1 $@
$(USR_DEF_PSM_LIB_DIR):
cd $(UTSBASE)/sun4u; $(MAKE) $(USR_DEF_PSM_LIB_DIR)
diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile
index 6ec3465251..3a671c5aae 100644
--- a/usr/src/lib/libresolv2/Makefile
+++ b/usr/src/lib/libresolv2/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -32,8 +32,6 @@ MANIFESTDIR= $(ROOT)/var/svc/manifest/network/dns
ROOTMANIFEST= $(MANIFEST:%=$(MANIFESTDIR)/%)
$(ROOTMANIFEST) := FILEMODE = 444
-$(ROOTMANIFEST) := OWNER = root
-$(ROOTMANIFEST) := GROUP = bin
CHKMANIFEST= $(MANIFEST:%.xml=%.xmlchk)
diff --git a/usr/src/lib/librsc/Makefile.com b/usr/src/lib/librsc/Makefile.com
index 55f2a98176..e83ce8c3b1 100644
--- a/usr/src/lib/librsc/Makefile.com
+++ b/usr/src/lib/librsc/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= librsc.a
VERS= .1
@@ -53,9 +51,9 @@ LIBS = $(DYNLIB) $(LINTLIB)
CFLAGS += $(CCVERBOSE)
LDLIBS += -lc
PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib/
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lrsc.ln $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so.1 $@
+INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/librsc.so $@
+INS.slink8= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/llib-lrsc.ln $@
.KEEP_STATE:
@@ -69,7 +67,7 @@ lint: lintcheck
# install rules
#
$(PLATLIBS)/librsc.so:
- $(RM) -r $@; $(SYMLINK) librsc.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) librsc.so.1 $@
install: all $(USR_PSM_LIBS) $(PLATLIBS)/librsc.so \
$(LINKED_DIRS) $(LINKED_LIB_DIRS) \
diff --git a/usr/src/lib/libsecdb/Makefile b/usr/src/lib/libsecdb/Makefile
index 8743e5b9bb..c14f742f6e 100644
--- a/usr/src/lib/libsecdb/Makefile
+++ b/usr/src/lib/libsecdb/Makefile
@@ -41,41 +41,33 @@ _msg:= TARGET= _msg
ROOTETC = $(ROOT)/etc
ROOTETCSECURITY = $(ROOTETC)/security
-$(ROOTETCSECURITY) := GROUP = sys
EFILES = user_attr
EFILESRC = $(EFILES:%=%)
ETCFILES = $(EFILES:%=$(ROOTETC)/%)
-$(ETCFILES) := GROUP = sys
ESFILES = auth_attr exec_attr prof_attr policy.conf
ESSRC = $(ESFILES:%=%)
ETCSECURITYFILES = $(ESFILES:%=$(ROOTETCSECURITY)/%)
-$(ETCSECURITYFILES) := GROUP = sys
MFSTFILES = rbac.xml
MANIFESTDIR = $(ROOT)/var/svc/manifest/system
MANIFEST = $(MFSTFILES:%=$(MANIFESTDIR)/%)
$(MANIFEST) := FILEMODE = 0444
-$(MANIFEST) := GROUP = sys
METHODFILES = svc-rbac
METHODDIR = $(ROOT)/lib/svc/method
METHOD = $(METHODFILES:%=$(METHODDIR)/%)
$(METHOD) := FILEMODE = 0555
-$(METHOD) := GROUP = bin
SCRIPTS = i.rbac r.rbac
CLASS_SCR_SRC_DIR = $(SRC)/pkgdefs/common_files
INSTALL_DIR = $(ROOT)/usr/sadm/install
-$(INSTALL_DIR) := GROUP = bin
CLASS_SCR_DIR = $(INSTALL_DIR)/scripts
-$(CLASS_SCR_DIR) := GROUP = bin
CLASS_SCR_FILES = $(SCRIPTS:%=$(CLASS_SCR_DIR)/%)
$(CLASS_SCR_FILES) := FILEMODE = 0555
-$(CLASS_SCR_FILES) := GROUP = sys
all clean clobber delete install lint package: $(SUBDIRS)
_msg: $(MSGSUBDIRS)
diff --git a/usr/src/lib/libsecdb/help/auths/Makefile b/usr/src/lib/libsecdb/help/auths/Makefile
index 96880ef46e..b18c017f5c 100644
--- a/usr/src/lib/libsecdb/help/auths/Makefile
+++ b/usr/src/lib/libsecdb/help/auths/Makefile
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# lib/libsecdb/help/auths/Makefile
@@ -176,8 +176,6 @@ MSGFILES= $(HTMLENTS)
MSGS= $(MSGFILES:%=$(MSGDIR)/%)
FILEMODE= 0444
-$(HELPFILES) := OWNER = root
-$(HELPFILES) := GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/lib/libsecdb/help/profiles/Makefile b/usr/src/lib/libsecdb/help/profiles/Makefile
index 085609a769..153d1eae39 100644
--- a/usr/src/lib/libsecdb/help/profiles/Makefile
+++ b/usr/src/lib/libsecdb/help/profiles/Makefile
@@ -111,8 +111,6 @@ MSGFILES= $(HTMLENTS)
MSGS= $(MSGFILES:%=$(MSGDIR)/%)
FILEMODE = 0444
-$(HELPFILES) := OWNER = root
-$(HELPFILES) := GROUP = bin
.KEEP_STATE:
diff --git a/usr/src/lib/libslp/etc/Makefile b/usr/src/lib/libslp/etc/Makefile
index 4fb151b6b1..491c079d70 100644
--- a/usr/src/lib/libslp/etc/Makefile
+++ b/usr/src/lib/libslp/etc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -42,9 +38,6 @@ $(ROOTETCINET)/%: $(ROOTETCINET) %
CLOBBERFILES = $(ROOTETCINETCONF)
-# override Makefile.master's GROUP=bin definition
-GROUP=sys
-
.KEEP_STATE:
all lint clean _msg:
diff --git a/usr/src/lib/libslp/javalib/Makefile.conf b/usr/src/lib/libslp/javalib/Makefile.conf
index 5de6b935fa..ab01d59946 100644
--- a/usr/src/lib/libslp/javalib/Makefile.conf
+++ b/usr/src/lib/libslp/javalib/Makefile.conf
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,9 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 1999-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile configuration for SLP.
@@ -76,14 +73,6 @@ CLIENT_MSGS=ClientLib_en.properties
SERVER_MSGS=Server_en.properties
MSGFILES=$(MSGDIR)/$(CLIENT_MSGS) $(MSGDIR)/$(SERVER_MSGS)
-$(MSGFILES) := OWNER = root
-$(MSGFILES) := GROUP = sys
-
-$(JARDESTDIR)/$(SLPJAR) := OWNER = root
-$(JARDESTDIR)/$(SLPJAR) := GROUP = sys
-
-$(JARDESTDIR)/$(SLPDJAR) := OWNER = root
-$(JARDESTDIR)/$(SLPDJAR) := GROUP = sys
$(JARDESTDIR)/$(SLPDJAR) := FILEMODE = 600
diff --git a/usr/src/lib/libtsalarm/Makefile.com b/usr/src/lib/libtsalarm/Makefile.com
index ade91ba95e..a4a6d07c25 100644
--- a/usr/src/lib/libtsalarm/Makefile.com
+++ b/usr/src/lib/libtsalarm/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY= libtsalarm.a
VERS= .1
@@ -51,9 +49,9 @@ CFLAGS += $(CCVERBOSE)
LDLIBS += -L$(USR_PLAT_DIR)/$(PLATFORM)/lib -lpcp -lc
DYNFLAGS += -R/usr/platform/$(PLATFORM)/lib
PLATLIBS = $(USR_PLAT_DIR)/$(PLATFORM)/lib
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libtsalarm.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libtsalarm.so $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink8= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/include $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libtsalarm.so.1 $@
+INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/libtsalarm.so $@
+INS.slink8= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/include $@
.KEEP_STATE:
diff --git a/usr/src/lib/libtsalarm/sparc/Makefile b/usr/src/lib/libtsalarm/sparc/Makefile
index 693be033d6..5597993953 100644
--- a/usr/src/lib/libtsalarm/sparc/Makefile
+++ b/usr/src/lib/libtsalarm/sparc/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# lib/libtsalarm/sparc/Makefile
UTSBASE= ../../../uts
@@ -46,7 +44,7 @@ include ../Makefile.com
#
$(PLATLIBS)/libtsalarm.so:
- $(RM) -r $@; $(SYMLINK) libtsalarm.so.1 $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) libtsalarm.so.1 $@
$(USR_PSM_LIB_DIR)/% := FILEMODE= 644
diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com
index 74850f334d..e205f8ec2c 100644
--- a/usr/src/lib/libwrap/Makefile.com
+++ b/usr/src/lib/libwrap/Makefile.com
@@ -18,11 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY = libwrap.a
MAJOR = .1
@@ -60,8 +58,6 @@ DISTFILES = clean_exit.c diag.c eval.c fix_options.c fromhost.c \
workarounds.c
ROOTSRC = $(ROOT)/usr/share/src/tcp_wrappers
-$(ROOTSRC) := OWNER = root
-$(ROOTSRC) := GROUP = bin
ROOTSRCFILES = $(DISTFILES:%=$(ROOTSRC)/%)
.KEEP_STATE:
diff --git a/usr/src/lib/libzonecfg/Makefile b/usr/src/lib/libzonecfg/Makefile
index e672d0caa0..794f477cdc 100644
--- a/usr/src/lib/libzonecfg/Makefile
+++ b/usr/src/lib/libzonecfg/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../Makefile.lib
@@ -50,8 +48,6 @@ DTDDIR = $(ROOT)/usr/share/lib/xml
ROOTDTDS= $(DTDS:%=$(DTDDIR)/%)
$(ROOTDTDS) := FILEMODE = 444
-$(ROOTDTDS) := OWNER = root
-$(ROOTDTDS) := GROUP = bin
$(DTDDIR)/%: %
$(INS.file)
diff --git a/usr/src/lib/mpapi/libmpapi/Makefile.com b/usr/src/lib/mpapi/libmpapi/Makefile.com
index 2ae558051c..dfff08bd39 100644
--- a/usr/src/lib/mpapi/libmpapi/Makefile.com
+++ b/usr/src/lib/mpapi/libmpapi/Makefile.com
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -48,8 +48,6 @@ CONFDIR = ../common
CONFFILE = $(CONFDIR)/mpapi.conf
IETCFILES = $(CONFFILE:$(CONFDIR)/%=$(ROOTETC)/%)
$(IETCFILES) := FILEMODE = 0644
-$(IETCFILES) := OWNER = root
-$(IETCFILES) := GROUP = sys
.KEEP_STATE:
diff --git a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
index 3ea8d44f99..d1581a890e 100644
--- a/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
+++ b/usr/src/lib/pkcs11/libsoftcrypto/Makefile.com
@@ -146,10 +146,9 @@ SOFT_PSR64_LINKS = \
$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/$(MACH64)/$(MODULE))
INS.slink6 = $(RM) -r $@; \
- $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
INS.slink64 = $(RM) -r $@; \
- $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) \
- $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(SYMLINK) ../../../$(PLATFORM)/lib/$(MACH64)/$(MODULE) $@
$(SOFT_PSR_DIRS) \
$(SOFT_PSR64_DIRS):
diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com
index ac0f9bcada..db7396619e 100644
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY = psm-lpd.a
VERS = .1
@@ -85,7 +83,6 @@ $(PROG): $(PROG_OBJS)
# needed for the 'install' phase
ROOTLIBPRINTPROG = $(PROG:%=$(ROOTLIBDIR)/%)
$(ROOTLIBPRINTPROG) := FILEMODE = 04511
-$(ROOTLIBPRINTPROG) := OWNER = root
$(ROOTLIBDIR)/%: $(ROOTLIBDIR) %
$(INS.file)
diff --git a/usr/src/lib/print/mod_ipp/Makefile b/usr/src/lib/print/mod_ipp/Makefile
index 2afbc75d45..6506765d77 100644
--- a/usr/src/lib/print/mod_ipp/Makefile
+++ b/usr/src/lib/print/mod_ipp/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
LIBRARY = mod_ipp.a
VERS =
@@ -41,8 +39,6 @@ ROOTDIRS = $(ROOT)/usr/apache $(APACHEMODDIR) $(APACHECONFDIR) \
$(ROOT)/var/lp:= DIRMODE = 775
$(ROOT)/var/lp:= FILEMODE = 775
-$(ROOT)/var/lp:= OWNER = lp
-$(ROOT)/var/lp:= GROUP = lp
LIBS = $(DYNLIB)
@@ -75,8 +71,6 @@ $(APACHECONFFILE) := FILEMODE= 644
LISTENERFILE= $(LISTENERDIR)/index.html
$(LISTENERFILE) := FILEMODE= 444
-$(ROOT)/var/lp:= OWNER = lp
-$(ROOT)/var/lp:= GROUP = lp
$(ROOT)/var/lp:= FILEMODE = 0775
$(APACHEMODDIR)/$(LIBLINKS):= FILEMODE = 0555
diff --git a/usr/src/pkgdefs/SUNW0on/Makefile b/usr/src/pkgdefs/SUNW0on/Makefile
index fb1dd6c46f..2ebb8b42c8 100644
--- a/usr/src/pkgdefs/SUNW0on/Makefile
+++ b/usr/src/pkgdefs/SUNW0on/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# pkgdefs/SUNW0on/Makefile
@@ -32,8 +32,6 @@ ROOTMSGDIR=$(ROOTDIR)/LC_MESSAGES
ROOTTIMEDIR=$(ROOTDIR)/LC_TIME
SED= /usr/bin/sed
-OWNER= root
-GROUP= sys
FILEMODE= 644
PO_LABEL=' The following lines are contents of '
@@ -67,8 +65,6 @@ _msg:
$(SED) -e '/^# msg/d' -e '/^domain/d' $$f >> \
$(ROOTMSGDIR)/$$d.po; \
done; \
- $(CHOWN) $(OWNER) $(ROOTMSGDIR)/$$d.po; \
- $(CHGRP) $(GROUP) $(ROOTMSGDIR)/$$d.po; \
$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/$$d.po; \
fi; \
x="`$(ECHO) $$d/*.msg`"; \
@@ -79,8 +75,6 @@ _msg:
x="`basename $$f`"; \
$(RM) $(ROOTMSGDIR)/$$x; \
$(CP) $$f $(ROOTMSGDIR); \
- $(CHOWN) $(OWNER) $(ROOTMSGDIR)/$$x; \
- $(CHGRP) $(GROUP) $(ROOTMSGDIR)/$$x; \
$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/$$x; \
done; \
fi; \
@@ -95,37 +89,23 @@ _msg:
$(SED) -e '/^# msg/d' -e '/^domain/d' $$f >> \
$(ROOTTIMEDIR)/$$d.po; \
done; \
- $(CHOWN) $(OWNER) $(ROOTTIMEDIR)/$$d.po; \
- $(CHGRP) $(GROUP) $(ROOTTIMEDIR)/$$d.po; \
$(CHMOD) $(FILEMODE) $(ROOTTIMEDIR)/$$d.po; \
done)
-$(RM) $(ROOTMSGDIR)/magic
$(CP) $(SRC)/cmd/file/magic $(ROOTMSGDIR)
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/magic
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/magic
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/magic
-$(RM) $(ROOTMSGDIR)/priv_names
$(CP) $(ROOT)/etc/security/priv_names $(ROOTMSGDIR)
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/priv_names
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/priv_names
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/priv_names
-$(RM) $(ROOTMSGDIR)/mailx.help
$(CP) $(SRC)/cmd/mailx/misc/mailx.help $(ROOTMSGDIR)
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/mailx.help
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/mailx.help
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/mailx.help
-$(RM) $(ROOTMSGDIR)/more.help
$(CP) $(SRC)/cmd/more/more.help $(ROOTMSGDIR)
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/more.help
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/more.help
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/more.help
-$(RM) $(ROOTMSGDIR)/uxlibc.src
$(CP) uxlibc.src $(ROOTMSGDIR)
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/uxlibc.src
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/uxlibc.src
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/uxlibc.src
-$(RM) $(ROOTMSGDIR)/SUNW_OST_LINFO
($(ECHO) "yes"; $(ECHO) "no" ) > $(ROOTMSGDIR)/SUNW_OST_LINFO
- -$(CHOWN) $(OWNER) $(ROOTMSGDIR)/SUNW_OST_LINFO
- -$(CHGRP) $(GROUP) $(ROOTMSGDIR)/SUNW_OST_LINFO
-$(CHMOD) $(FILEMODE) $(ROOTMSGDIR)/SUNW_OST_LINFO
diff --git a/usr/src/psm/stand/boot/Makefile.boot b/usr/src/psm/stand/boot/Makefile.boot
index b57c66a046..bf478a2444 100644
--- a/usr/src/psm/stand/boot/Makefile.boot
+++ b/usr/src/psm/stand/boot/Makefile.boot
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# psm/stand/boot/Makefile.boot
#
@@ -59,8 +57,6 @@ NFSBOOT = inetboot
#
FILEMODE = 644
DIRMODE = 755
-OWNER = root
-GROUP = sys
#
# Install locations
diff --git a/usr/src/psm/stand/bootblks/Makefile.com b/usr/src/psm/stand/bootblks/Makefile.com
index dfcb433931..1dea029f87 100644
--- a/usr/src/psm/stand/bootblks/Makefile.com
+++ b/usr/src/psm/stand/bootblks/Makefile.com
@@ -64,8 +64,6 @@ TOKENIZE = tokenize
#
FILEMODE = 444
DIRMODE = 755
-OWNER = root
-GROUP = sys
#
# For building lint objects
diff --git a/usr/src/psm/stand/bootblks/hsfs/Makefile.hsfs b/usr/src/psm/stand/bootblks/hsfs/Makefile.hsfs
index fa6b239012..3006a0c9b8 100644
--- a/usr/src/psm/stand/bootblks/hsfs/Makefile.hsfs
+++ b/usr/src/psm/stand/bootblks/hsfs/Makefile.hsfs
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/bootblks/hsfs/Makefile.hsfs
@@ -61,7 +58,6 @@ USR_SBIN_INSTALLBOOT = $(USR_SBIN)/$(INSTALLBOOT)
# Overrides for installing installboot.
#
INS.file.555 = $(RM) $@; $(INS) -s -m 555 -f $(@D) $<
-$(CH)INS.file.555 = $(INS) -s -m 555 -u $(OWNER) -g $(GROUP) -f $(@D) $<
#
# dependencies
diff --git a/usr/src/psm/stand/bootblks/ufs/Makefile.ufs b/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
index bf57019c9d..49a4adb7df 100644
--- a/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
+++ b/usr/src/psm/stand/bootblks/ufs/Makefile.ufs
@@ -19,9 +19,7 @@
# CDDL HEADER END
#
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/bootblks/ufs/Makefile.ufs
@@ -61,7 +59,6 @@ USR_SBIN_INSTALLBOOT = $(USR_SBIN)/$(INSTALLBOOT)
# Overrides for installing installboot.
#
INS.file.555 = $(RM) $@; $(INS) -s -m 555 -f $(@D) $<
-$(CH)INS.file.555 = $(INS) -s -m 555 -u $(OWNER) -g $(GROUP) -f $(@D) $<
%.fcode: $(UFS_DIR)/%.fth
$(TOKENIZE) $<
diff --git a/usr/src/psm/stand/bootblks/ufs/sparc/Makefile b/usr/src/psm/stand/bootblks/ufs/sparc/Makefile
index 9679b0362c..dcf6ba8b78 100644
--- a/usr/src/psm/stand/bootblks/ufs/sparc/Makefile
+++ b/usr/src/psm/stand/bootblks/ufs/sparc/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/bootblks/ufs/sparc/Makefile
@@ -44,7 +41,6 @@ USR_SBIN_INSTALLBOOT = $(USR_SBIN)/$(INSTALLBOOT)
# Overrides for installing installboot.
#
INS.file.555 = $(RM) $@; $(INS) -s -m 555 -f $(@D) $<
-$(CH)INS.file.555 = $(INS) -s -m 555 -u $(OWNER) -g $(GROUP) -f $(@D) $<
SUBDIRS = sun4u sun4v
diff --git a/usr/src/psm/stand/bootlst/common/Makefile.com b/usr/src/psm/stand/bootlst/common/Makefile.com
index dccf930192..25043b1c22 100644
--- a/usr/src/psm/stand/bootlst/common/Makefile.com
+++ b/usr/src/psm/stand/bootlst/common/Makefile.com
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/bootlst/common/Makefile.com
@@ -71,8 +68,6 @@ AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master)
# install values
LSTFILES= $(ALL:%=$(ROOT_PSM_DIR)/$(ARCH)/%)
FILEMODE= 644
-OWNER= root
-GROUP= sys
# lint stuff
LINTFLAGS += -Dlint
diff --git a/usr/src/psm/stand/cpr/common/Makefile.com b/usr/src/psm/stand/cpr/common/Makefile.com
index faf53edc9a..d5c43bba43 100644
--- a/usr/src/psm/stand/cpr/common/Makefile.com
+++ b/usr/src/psm/stand/cpr/common/Makefile.com
@@ -72,8 +72,6 @@ AS_CPPFLAGS = $(CPPINCS) $(CPPFLAGS.master)
# install values
CPRFILES= $(ALL:%=$(ROOT_PSM_DIR)/$(ARCH)/%)
FILEMODE= 644
-OWNER= root
-GROUP= sys
# lint stuff
LINTFLAGS += -Dlint
diff --git a/usr/src/tools/bfuld/Makefile b/usr/src/tools/bfuld/Makefile
index 07e85c4399..794179d176 100644
--- a/usr/src/tools/bfuld/Makefile
+++ b/usr/src/tools/bfuld/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,8 +28,6 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
.KEEP_STATE:
diff --git a/usr/src/tools/codesign/Makefile b/usr/src/tools/codesign/Makefile
index 5736069f30..38e11a7003 100644
--- a/usr/src/tools/codesign/Makefile
+++ b/usr/src/tools/codesign/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
SHFILES= \
signproto
@@ -39,8 +37,6 @@ CLEANFILES = $(SHFILES) $(PERLFILES)
include ../Makefile.tools
-OWNER= root
-GROUP= bin
$(ROOTONBLDMAN1FILES) := FILEMODE= 644
.KEEP_STATE:
diff --git a/usr/src/tools/ctf/dump/Makefile.com b/usr/src/tools/ctf/dump/Makefile.com
index 3918527495..2fbbeb1415 100644
--- a/usr/src/tools/ctf/dump/Makefile.com
+++ b/usr/src/tools/ctf/dump/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
.KEEP_STATE:
.SUFFIXES:
@@ -33,9 +31,6 @@ SRCS = dump.c utils.c symbol.c
include ../../Makefile.ctf
-OWNER = root
-GROUP = bin
-
LDLIBS += -lelf -lz
OBJS = $(SRCS:%.c=%.o)
diff --git a/usr/src/tools/ctf/stabs/Makefile.com b/usr/src/tools/ctf/stabs/Makefile.com
index 1253d9fcbe..e3f8e9689a 100644
--- a/usr/src/tools/ctf/stabs/Makefile.com
+++ b/usr/src/tools/ctf/stabs/Makefile.com
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
.KEEP_STATE:
@@ -41,9 +38,6 @@ SRCS = \
include ../../Makefile.ctf
-OWNER = root
-GROUP = bin
-
LDLIBS += -lctf
OBJS = $(SRCS:%.c=%.o)
diff --git a/usr/src/tools/depcheck/Makefile b/usr/src/tools/depcheck/Makefile
index 69961a628d..55549c9efc 100644
--- a/usr/src/tools/depcheck/Makefile
+++ b/usr/src/tools/depcheck/Makefile
@@ -38,8 +38,6 @@ MAN1FILES= \
include ../Makefile.tools
-OWNER= root
-GROUP= bin
$(ROOTONBLDETCFILES) := FILEMODE= 644
$(ROOTONBLDMAN1FILES) := FILEMODE= 644
diff --git a/usr/src/tools/elfsign/Makefile b/usr/src/tools/elfsign/Makefile
index 2b71da0ea8..29e18c13d9 100644
--- a/usr/src/tools/elfsign/Makefile
+++ b/usr/src/tools/elfsign/Makefile
@@ -39,8 +39,6 @@ CLEANFILES= $(PROG) $(OBJS) $(SHFILES)
include ../../../src/tools/Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
CFLAGS += -_gcc=-fasm
diff --git a/usr/src/tools/env/Makefile b/usr/src/tools/env/Makefile
index bdfbd72d3d..dad5ed1604 100644
--- a/usr/src/tools/env/Makefile
+++ b/usr/src/tools/env/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -33,8 +29,6 @@ ENVFILES= \
include ../Makefile.tools
-OWNER= root
-GROUP= bin
FILEMODE= 644
.KEEP_STATE:
diff --git a/usr/src/tools/fastfs/Makefile b/usr/src/tools/fastfs/Makefile
index 942f1b89fb..0f4f1ac1d3 100644
--- a/usr/src/tools/fastfs/Makefile
+++ b/usr/src/tools/fastfs/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# fastfs also lives in cmd/backup, but it's copied here since the backup
@@ -34,8 +30,6 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
.KEEP_STATE:
diff --git a/usr/src/tools/gk/Makefile b/usr/src/tools/gk/Makefile
index b4a4383a34..6790a54999 100644
--- a/usr/src/tools/gk/Makefile
+++ b/usr/src/tools/gk/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 1998-2002 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
GKFILES= \
cshrc \
@@ -32,8 +30,6 @@ GKFILES= \
include ../Makefile.tools
-OWNER= root
-GROUP= bin
FILEMODE= 644
.KEEP_STATE:
diff --git a/usr/src/tools/install.bin/Makefile b/usr/src/tools/install.bin/Makefile
index eba180d073..a049e94ccd 100644
--- a/usr/src/tools/install.bin/Makefile
+++ b/usr/src/tools/install.bin/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# tools/install.bin/Makefile
@@ -34,8 +30,6 @@ SRCS= $(PROG).c ../protocmp/stdusers.c
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I../protocmp
LDLIBS += -lgen
diff --git a/usr/src/tools/ndrgen/Makefile b/usr/src/tools/ndrgen/Makefile
index 28c67d9411..64cc1c3d9c 100644
--- a/usr/src/tools/ndrgen/Makefile
+++ b/usr/src/tools/ndrgen/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
PROG= ndrgen ndrgen1
@@ -35,8 +33,6 @@ SRCS= $(OBJS:%.o=%.c)
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
CLEANFILES += $(OBJS) y.tab.h
diff --git a/usr/src/tools/pmodes/Makefile b/usr/src/tools/pmodes/Makefile
index fe4e685a72..6552242279 100644
--- a/usr/src/tools/pmodes/Makefile
+++ b/usr/src/tools/pmodes/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -18,11 +17,8 @@
# information: Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
-#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# fastfs also lives in cmd/backup, but it's copied here since the backup
@@ -35,8 +31,6 @@ CLEANFILES += $(OBJS)
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
.KEEP_STATE:
diff --git a/usr/src/tools/protolist/Makefile b/usr/src/tools/protolist/Makefile
index bc63d6cee1..7fd71a1762 100644
--- a/usr/src/tools/protolist/Makefile
+++ b/usr/src/tools/protolist/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -32,8 +28,6 @@ SRCS= $(PROG).c ../protocmp/stdusers.c
include ../Makefile.tools
-OWNER= root
-GROUP= bin
CFLAGS += $(CCVERBOSE)
CPPFLAGS += -I../protocmp
CLEANFILES += $(OBJS)
diff --git a/usr/src/tools/scripts/Makefile b/usr/src/tools/scripts/Makefile
index f18b4f2583..347f77daaa 100644
--- a/usr/src/tools/scripts/Makefile
+++ b/usr/src/tools/scripts/Makefile
@@ -120,8 +120,6 @@ CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1
include ../Makefile.tools
-OWNER= root
-GROUP= bin
$(ROOTONBLDETCFILES) := FILEMODE= 644
$(ROOTONBLDMAKEFILES) := FILEMODE= 644
diff --git a/usr/src/tools/stabs/sparc/Makefile b/usr/src/tools/stabs/sparc/Makefile
index 0d0d24e4d3..56f04afba0 100644
--- a/usr/src/tools/stabs/sparc/Makefile
+++ b/usr/src/tools/stabs/sparc/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
STABS_SRC = ..
@@ -50,8 +47,6 @@ CLEANFILES = $(OBJECTS)
include ../../Makefile.tools
FILEMODE = 555
-OWNER = root
-GROUP = bin
CFLAGS += $(CCVERBOSE)
diff --git a/usr/src/tools/tokenize/Makefile b/usr/src/tools/tokenize/Makefile
index db7279115d..e1ee198e9e 100644
--- a/usr/src/tools/tokenize/Makefile
+++ b/usr/src/tools/tokenize/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
SHFILES= tokenize
BINARIES= forth_preload.so.1 forth tokenize.exe
@@ -46,9 +44,6 @@ LDLIBS = -lc
ASFLAGS += -P -D_ASM
-OWNER= root
-GROUP= bin
-
.KEEP_STATE:
all: $(SHFILES) $(BINARIES)
diff --git a/usr/src/uts/Makefile.uts b/usr/src/uts/Makefile.uts
index c5d1afa22d..443518fee7 100644
--- a/usr/src/uts/Makefile.uts
+++ b/usr/src/uts/Makefile.uts
@@ -266,8 +266,6 @@ CLOBBERFILES = $(BINARY) $(CLEANFILES)
#
FILEMODE = 755
DIRMODE = 755
-OWNER = root
-GROUP = sys
CFILEMODE = 644
#
@@ -294,9 +292,6 @@ ROOT_CONFFILE = $(ROOT_CONFFILE_$(CLASS))
INS.conffile= \
$(RM) $@; $(INS) -s -m $(CFILEMODE) -f $(@D) $(SRC_CONFFILE)
-$(CH)INS.conffile= \
- $(INS) -s -m $(CFILEMODE) -u $(OWNER) -g $(GROUP) -f $(@D) $(SRC_CONFFILE)
-
#
# The CTF merge of child kernel modules is performed against one of the genunix
@@ -555,25 +550,17 @@ USR_MOD_DIRS_32 += $(USR_DTRACE_DIR_32) $(USR_BRAND_DIR_32)
include $(SRC)/Makefile.psm
#
-# Set ownership on links.
-#
-CHOWNLINK=
-$(CH)CHOWNLINK= ; $(CHOWN) $(OWNER) $@
-CHGRPLINK=
-$(CH)CHGRPLINK= ; $(CHGRP) $(GROUP) $@
-
-#
# The "-r" on the remove may be considered temporary, but is required
# while the replacement of the SUNW,SPARCstation-10,SX directory by
# a symbolic link is being propagated.
#
-INS.slink1= $(RM) -r $@; $(SYMLINK) $(PLATFORM) $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink2= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink3= $(RM) -r $@; $(SYMLINK) $(IMPLEMENTED_PLATFORM) $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink4= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/include $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink5= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/sbin $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
-INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+INS.slink1= $(RM) -r $@; $(SYMLINK) $(PLATFORM) $@
+INS.slink2= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/$(@F) $@
+INS.slink3= $(RM) -r $@; $(SYMLINK) $(IMPLEMENTED_PLATFORM) $@
+INS.slink4= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/include $@
+INS.slink5= $(RM) -r $@; $(SYMLINK) ../$(PLATFORM)/sbin $@
+INS.slink6= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/lib/$(MODULE) $@
+INS.slink7= $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/$(@F) $@
ROOT_PLAT_LINKS = $(PLAT_LINKS:%=$(ROOT_PLAT_DIR)/%)
ROOT_PLAT_LINKS_2 = $(PLAT_LINKS_2:%=$(ROOT_PLAT_DIR)/%)
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index ef6cd77e27..842ab85923 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -25,7 +25,6 @@
include $(SRC)/uts/Makefile.uts
-GROUP=bin
FILEMODE=644
#
diff --git a/usr/src/uts/i86pc/sys/Makefile b/usr/src/uts/i86pc/sys/Makefile
index 156007ba15..e79da428af 100644
--- a/usr/src/uts/i86pc/sys/Makefile
+++ b/usr/src/uts/i86pc/sys/Makefile
@@ -19,8 +19,7 @@
# CDDL HEADER END
#
#
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# uts/i86pc/sys/Makefile
@@ -36,8 +35,6 @@ include ../Makefile.i86pc
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS= \
asm_misc.h \
@@ -88,7 +85,7 @@ $(ROOTDIRS):
$(INS.dir.root.bin)
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
FRC:
diff --git a/usr/src/uts/i86pc/vm/Makefile b/usr/src/uts/i86pc/vm/Makefile
index 270efbe462..d52eeb1eb9 100644
--- a/usr/src/uts/i86pc/vm/Makefile
+++ b/usr/src/uts/i86pc/vm/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# uts/i86pc/vm/Makefile
#
UTSBASE = ../..
@@ -37,7 +35,6 @@ include ../Makefile.i86pc
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= hat_i86.h hat_pte.h hment.h htable.h kboot_mmu.h
@@ -70,7 +67,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
CLEANFILES=
diff --git a/usr/src/uts/i86xpv/sys/Makefile b/usr/src/uts/i86xpv/sys/Makefile
index f559679a17..0216ac5f36 100644
--- a/usr/src/uts/i86xpv/sys/Makefile
+++ b/usr/src/uts/i86xpv/sys/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
UTSBASE = ../..
#
@@ -65,7 +63,7 @@ $(ROOTDIRS):
$(INS.dir.root.bin)
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
FRC:
diff --git a/usr/src/uts/i86xpv/vm/Makefile b/usr/src/uts/i86xpv/vm/Makefile
index 8cb19153eb..53decc0d91 100644
--- a/usr/src/uts/i86xpv/vm/Makefile
+++ b/usr/src/uts/i86xpv/vm/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# uts/i86xpv/vm/Makefile
#
# Compilation of .c files in this directory is driven by Makefiles in i86xpv.
@@ -72,7 +70,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
CLEANFILES=
diff --git a/usr/src/uts/intel/config/Makefile b/usr/src/uts/intel/config/Makefile
index 0222f9d617..f4826c47c1 100644
--- a/usr/src/uts/intel/config/Makefile
+++ b/usr/src/uts/intel/config/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -21,11 +20,9 @@
#
#
# uts/intel/config/Makefile
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of the kernel configuration files.
#
# intel architecture dependent
@@ -53,8 +50,6 @@ BOOTIMAGE = solaris.xpm.gz
BOOTENVRC = bootenv.rc
DEVMASTER = master
FILEMODE = 644
-OWNER = root
-GROUP = sys
ROOTETC = $(ROOT)/etc
ROOTETCSEC = $(ROOTETC)/security
ROOTBOOT = $(ROOT)/boot
@@ -86,7 +81,6 @@ install: all $(ROOTCONFIGFILES)
# etc/path_to_inst has permissions different from the other config files
#
$(ROOTETC)/$(PATH2INST):= FILEMODE=444
-$(ROOTETC)/$(PATH2INST):= GROUP=root
$(ROOTETC)/%: $(SRCDIR)/%
$(INS.file)
diff --git a/usr/src/uts/sparc/config/Makefile b/usr/src/uts/sparc/config/Makefile
index a12ff557f2..767ed0b41a 100644
--- a/usr/src/uts/sparc/config/Makefile
+++ b/usr/src/uts/sparc/config/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -21,11 +20,9 @@
#
#
# uts/sparc/config/Makefile
-# Copyright 1991-2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of the kernel configuration files.
#
# sparc architecture dependent
@@ -50,8 +47,6 @@ CONFIGFILES = name_to_major minor_perm driver_aliases name_to_sysnum \
driver_classes dacf.conf $(PATH2INST)
SECCONFIG = device_policy priv_names
FILEMODE = 644
-OWNER = root
-GROUP = sys
ROOTETC = $(ROOT)/etc
ROOTETCSEC = $(ROOTETC)/security
@@ -74,7 +69,6 @@ install: all $(ROOTCONFIGFILES)
# etc/path_to_inst has permissions different from the other config files
#
$(ROOTETC)/$(PATH2INST):= FILEMODE=444
-$(ROOTETC)/$(PATH2INST):= GROUP=root
$(ROOTETC)/%: $(SRCDIR)/%
$(INS.file)
diff --git a/usr/src/uts/sun4u/blade/Makefile b/usr/src/uts/sun4u/blade/Makefile
index 5bad6fdbc1..0a93a62379 100644
--- a/usr/src/uts/sun4u/blade/Makefile
+++ b/usr/src/uts/sun4u/blade/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# This makefile drives the production of the sun4u JBOS - blade platform
@@ -106,7 +102,7 @@ lint.platmod: modlintlib
$(BLADE_PLAT_LINK_1): $(ROOT_BLADE_DRV_DIR)
- $(RM) $@; $(SYMLINK) $(LINK1DESTDIR)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(LINK1DESTDIR)/$(@F) $@
#
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/boston/Makefile.targ b/usr/src/uts/sun4u/boston/Makefile.targ
index ece1ba33e1..fd46b057c7 100644
--- a/usr/src/uts/sun4u/boston/Makefile.targ
+++ b/usr/src/uts/sun4u/boston/Makefile.targ
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Common targets for sun4u implementation specific modules.
#
@@ -68,13 +66,13 @@ $(USR_BOSTON_SBIN_DIR): $(USR_BOSTON_DIR)
$(INS.dir.root.bin)
$(USR_BOSTON_SBIN_PRTDIAG): $(USR_BOSTON_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_BOSTON_SBIN_TRAPSTAT): $(USR_BOSTON_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_BOSTON_SBIN_FRUADM): $(USR_BOSTON_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(USR_BOSTON_LIB_DIR): $(USR_BOSTON_DIR)
-$(INS.dir.root.bin)
diff --git a/usr/src/uts/sun4u/cheetah/Makefile b/usr/src/uts/sun4u/cheetah/Makefile
index 91db48cd15..eab8f9aa2d 100644
--- a/usr/src/uts/sun4u/cheetah/Makefile
+++ b/usr/src/uts/sun4u/cheetah/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the sun4u UltraSPARC driver
@@ -108,7 +106,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/cheetahplus/Makefile b/usr/src/uts/sun4u/cheetahplus/Makefile
index ba0cb0a457..c828a05938 100644
--- a/usr/src/uts/sun4u/cheetahplus/Makefile
+++ b/usr/src/uts/sun4u/cheetahplus/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the sun4u UltraSPARC driver
@@ -114,7 +112,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/cherrystone/sys/Makefile b/usr/src/uts/sun4u/cherrystone/sys/Makefile
index 3f99aa18ec..aff87216d7 100644
--- a/usr/src/uts/sun4u/cherrystone/sys/Makefile
+++ b/usr/src/uts/sun4u/cherrystone/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/cherrystone/sys/Makefile
#
UTSBASE = ../../..
@@ -37,8 +35,6 @@ include ../Makefile.cherrystone
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS= cherrystone.h
diff --git a/usr/src/uts/sun4u/daktari/sys/Makefile b/usr/src/uts/sun4u/daktari/sys/Makefile
index 7fb3b00f04..7a19c05a03 100644
--- a/usr/src/uts/sun4u/daktari/sys/Makefile
+++ b/usr/src/uts/sun4u/daktari/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/daktari/sys/Makefile
#
UTSBASE = ../../..
@@ -37,8 +35,6 @@ include ../Makefile.daktari
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS= daktari.h hpc3130_events.h
diff --git a/usr/src/uts/sun4u/excalibur/sys/Makefile b/usr/src/uts/sun4u/excalibur/sys/Makefile
index f12655fd28..a2edc8646a 100644
--- a/usr/src/uts/sun4u/excalibur/sys/Makefile
+++ b/usr/src/uts/sun4u/excalibur/sys/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
UTSBASE = ../../..
@@ -35,8 +32,6 @@ include ../Makefile.excalibur
# Override defaults.
#
FILEMODE = 644
-OWNER = bin
-GROUP = bin
HDRS= xcalppm_reg.h xcalppm_var.h
diff --git a/usr/src/uts/sun4u/hummingbird/Makefile b/usr/src/uts/sun4u/hummingbird/Makefile
index d19a6148f6..836d9192e0 100644
--- a/usr/src/uts/sun4u/hummingbird/Makefile
+++ b/usr/src/uts/sun4u/hummingbird/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -106,7 +106,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/jalapeno/Makefile b/usr/src/uts/sun4u/jalapeno/Makefile
index 30158fb971..fdd2a22502 100644
--- a/usr/src/uts/sun4u/jalapeno/Makefile
+++ b/usr/src/uts/sun4u/jalapeno/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the sun4u UltraSPARC driver
@@ -113,7 +111,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/lw2plus/Makefile b/usr/src/uts/sun4u/lw2plus/Makefile
index 809a242fea..951c9df77d 100644
--- a/usr/src/uts/sun4u/lw2plus/Makefile
+++ b/usr/src/uts/sun4u/lw2plus/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the sun4u lw2plus platform
@@ -94,7 +92,7 @@ $(LW2PLUS_KMODS): FRC
@cd $@; pwd; $(MAKE) $(NO_STATE) $(TARGET)
$(LW2PLUS_PLAT_LINKS_2):
- $(RM) $@; $(SYMLINK) $(LINKS2DESTDIR)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(LINKS2DESTDIR)/$(@F) $@
$(LW2PLUS_CRYPTO_LINKS): $(ROOT_LW2PLUS_CRYPTO_DIR_64)
-$(RM) $(ROOT_LW2PLUS_CRYPTO_DIR_64)/$@;
diff --git a/usr/src/uts/sun4u/lw8/Makefile b/usr/src/uts/sun4u/lw8/Makefile
index ea0046617a..8b54a2bfd4 100644
--- a/usr/src/uts/sun4u/lw8/Makefile
+++ b/usr/src/uts/sun4u/lw8/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of the sun4u lw8 platform
# module.
#
@@ -106,13 +104,13 @@ LINT_LIBS = $(LINT_LIB) \
-L$(SPARC_LIB_DIR) $(SPARC_LINTS:%=-l%)
$(LW8_PLAT_LINKS_2): $(ROOT_LW8_MOD_DIR)
- $(RM) $@; $(SYMLINK) $(LINKS2DESTDIR)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(LINKS2DESTDIR)/$(@F) $@
$(LW8_PLAT_LINKS_3): $(ROOT_LW8_DRV_DIR_64)
- $(RM) $@; $(SYMLINK) $(LINKS3DESTDIR)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(LINKS3DESTDIR)/$(@F) $@
$(LW8_PLAT_LINKS_4): $(ROOT_LW8_DRV_DIR_64)
- $(RM) $@; $(SYMLINK) $(LINKS4DESTDIR)/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(LINKS4DESTDIR)/$(@F) $@
$(LW8_CRYPTO_LINKS): $(ROOT_LW8_CRYPTO_DIR_64)
-$(RM) $(ROOT_LW8_CRYPTO_DIR_64)/$@;
diff --git a/usr/src/uts/sun4u/lw8/sys/Makefile b/usr/src/uts/sun4u/lw8/sys/Makefile
index 66e38d8935..1860e85cbe 100644
--- a/usr/src/uts/sun4u/lw8/sys/Makefile
+++ b/usr/src/uts/sun4u/lw8/sys/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/sys/Makefile
#
UTSBASE = ../../..
@@ -38,8 +36,6 @@ include ../Makefile.lw8
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS=
diff --git a/usr/src/uts/sun4u/makaha/Makefile b/usr/src/uts/sun4u/makaha/Makefile
index 0625be1a88..c27f8e89fe 100644
--- a/usr/src/uts/sun4u/makaha/Makefile
+++ b/usr/src/uts/sun4u/makaha/Makefile
@@ -19,12 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
-#
# uts/sun4u/makaha/Makefile
#
# This makefile drives the production of all Makaha system
@@ -35,8 +32,6 @@
# Path to the base of the uts directory tree (usually /usr/src/uts).
#
UTSBASE = ../..
-GROUP = sys
-CHGRP = /usr/bin/chgrp -h
#
# Include common rules.
@@ -84,7 +79,6 @@ acebus.conf: $(ROOT_MAKAHA_DRV_DIR)
$(CP) $(UTSBASE)/sun4u/makaha/io/$@ \
$(ROOT_MAKAHA_DRV_DIR)/$@
$(CHMOD) $(CFILEMODE) $(ROOT_MAKAHA_DRV_DIR)/$@
- $(CHGRP) $(GROUP) $(ROOT_MAKAHA_DRV_DIR)/$@
pcf8574: $(ROOT_MAKAHA_DRV_DIR_64)
-@$(RM) $(ROOT_MAKAHA_DRV_DIR_64)/$@
diff --git a/usr/src/uts/sun4u/montecarlo/Makefile b/usr/src/uts/sun4u/montecarlo/Makefile
index 7f8654a761..ee28e01cbc 100644
--- a/usr/src/uts/sun4u/montecarlo/Makefile
+++ b/usr/src/uts/sun4u/montecarlo/Makefile
@@ -19,12 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of all MonteCarlo system
# dependent modules for the sun4u architecture.
#
@@ -33,8 +30,6 @@
# Path to the base of the uts directory tree (usually /usr/src/uts).
#
UTSBASE = ../..
-GROUP = sys
-CHGRP = /usr/bin/chgrp -h
#
# Include common rules.
@@ -76,14 +71,12 @@ se.conf: $(ROOT_MONTECARLO_DRV_DIR)
$(CP) $(UTSBASE)/sun4u/montecarlo/io/$@ \
$(ROOT_MONTECARLO_DRV_DIR)/$@
$(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR)/$@
- $(CHGRP) $(GROUP) $(ROOT_MONTECARLO_DRV_DIR)/$@
ttymux.conf: $(ROOT_MONTECARLO_DRV_DIR)
-@$(RM) $(ROOT_MONTECARLO_DRV_DIR)/$@
$(CP) $(UTSBASE)/sun4u/montecarlo/io/$@ \
$(ROOT_MONTECARLO_DRV_DIR)/$@
$(CHMOD) $(CFILEMODE) $(ROOT_MONTECARLO_DRV_DIR)/$@
- $(CHGRP) $(GROUP) $(ROOT_MONTECARLO_DRV_DIR)/$@
install_h check: FRC
@cd sys; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/uts/sun4u/montecarlo/sys/Makefile b/usr/src/uts/sun4u/montecarlo/sys/Makefile
index f9da9b007b..cad8b9152e 100644
--- a/usr/src/uts/sun4u/montecarlo/sys/Makefile
+++ b/usr/src/uts/sun4u/montecarlo/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
UTSBASE = ../../..
#
@@ -35,7 +33,6 @@ include ../Makefile.montecarlo
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= scsb_led.h
diff --git a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
index f9c46c5176..285fb402be 100644
--- a/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
+++ b/usr/src/uts/sun4u/mpxu/Makefile.targ.shared
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
#
# Common targets for sun4u MPXU implementation specific modules.
@@ -71,13 +69,13 @@ $(USR_MPXU_SBIN_DIR): $(USR_MPXU_DIR)
$(INS.dir.root.bin)
$(USR_MPXU_SBIN_PRTDIAG): $(USR_MPXU_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_MPXU_SBIN_TRAPSTAT): $(USR_MPXU_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_MPXU_SBIN_FRUADM): $(USR_MPXU_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR)
$(INS.slink3)
diff --git a/usr/src/uts/sun4u/mpxu/sys/Makefile b/usr/src/uts/sun4u/mpxu/sys/Makefile
index 9cc338fa27..1db1962b4a 100644
--- a/usr/src/uts/sun4u/mpxu/sys/Makefile
+++ b/usr/src/uts/sun4u/mpxu/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/mpxu/sys/Makefile
#
UTSBASE = ../../..
@@ -37,8 +35,6 @@ include ../Makefile.mpxu
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS= lom_io.h
diff --git a/usr/src/uts/sun4u/ngdr/sys/Makefile b/usr/src/uts/sun4u/ngdr/sys/Makefile
index ae2334819e..1c9c3da2a9 100644
--- a/usr/src/uts/sun4u/ngdr/sys/Makefile
+++ b/usr/src/uts/sun4u/ngdr/sys/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# uts/sun4u/ngdr/sys/Makefile
@@ -34,8 +31,6 @@ include ../../Makefile.sun4u
# Override defaults.
#
FILEMODE= 644
-OWNER= root
-GROUP= bin
HDRS=
diff --git a/usr/src/uts/sun4u/opl/Makefile.targ.shared b/usr/src/uts/sun4u/opl/Makefile.targ.shared
index 629a61110b..86eb1b47b3 100644
--- a/usr/src/uts/sun4u/opl/Makefile.targ.shared
+++ b/usr/src/uts/sun4u/opl/Makefile.targ.shared
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Common targets for sun4u opl implementation specific modules.
#
# uts/sun4u/opl/Makefile.targ
@@ -74,13 +72,13 @@ $(USR_OPL_SBIN_DIR): $(USR_OPL_DIR) $(USR_PSM_SBIN_DIR)
$(INS.dir.root.bin)
$(USR_OPL_SBIN_PRTDIAG): $(USR_OPL_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_OPL_SBIN_TRAPSTAT): $(USR_OPL_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_OPL_SBIN_FRUADM): $(USR_OPL_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(USR_OPL_LIB_DIR): $(USR_OPL_DIR) $(USR_PSM_LIB_DIR)
-$(INS.dir.root.bin)
diff --git a/usr/src/uts/sun4u/opl/olympus_c/Makefile b/usr/src/uts/sun4u/opl/olympus_c/Makefile
index f201e3c115..ba566c0d57 100644
--- a/usr/src/uts/sun4u/opl/olympus_c/Makefile
+++ b/usr/src/uts/sun4u/opl/olympus_c/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# This makefile drives the production of the OPL specific
# Olympus-C driver module.
#
@@ -111,7 +109,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/opl/sys/Makefile b/usr/src/uts/sun4u/opl/sys/Makefile
index ab589b442f..ca03d986c8 100644
--- a/usr/src/uts/sun4u/opl/sys/Makefile
+++ b/usr/src/uts/sun4u/opl/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/opl/sys/Makefile
#
@@ -39,8 +37,6 @@ include ../Makefile.opl
# Override defaults.
#
FILEMODE = 644
-OWNER = bin
-GROUP = bin
HDRS= opl_hwdesc.h
diff --git a/usr/src/uts/sun4u/schumacher/Makefile.targ b/usr/src/uts/sun4u/schumacher/Makefile.targ
index 2864ec75db..80f3131135 100644
--- a/usr/src/uts/sun4u/schumacher/Makefile.targ
+++ b/usr/src/uts/sun4u/schumacher/Makefile.targ
@@ -18,11 +18,9 @@
#
# CDDL HEADER END
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# Common targets for sun4u implementation specific modules.
#
@@ -67,13 +65,13 @@ $(USR_SCHUMACHER_SBIN_DIR): $(USR_SCHUMACHER_DIR)
-$(INS.dir.root.bin)
$(USR_SCHUMACHER_SBIN_PRTDIAG): $(USR_SCHUMACHER_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_SCHUMACHER_SBIN_TRAPSTAT): $(USR_SCHUMACHER_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_SCHUMACHER_SBIN_FRUADM): $(USR_SCHUMACHER_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(USR_SCHUMACHER_LIB_DIR): $(USR_SCHUMACHER_DIR)
-$(INS.dir.root.bin)
diff --git a/usr/src/uts/sun4u/seattle/Makefile.targ b/usr/src/uts/sun4u/seattle/Makefile.targ
index bb2a0ce141..81c846f09f 100644
--- a/usr/src/uts/sun4u/seattle/Makefile.targ
+++ b/usr/src/uts/sun4u/seattle/Makefile.targ
@@ -20,11 +20,9 @@
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# Common targets for sun4u implementation specific modules.
#
@@ -68,13 +66,13 @@ $(USR_SEATTLE_SBIN_DIR): $(USR_SEATTLE_DIR)
$(INS.dir.root.bin)
$(USR_SEATTLE_SBIN_PRTDIAG): $(USR_SEATTLE_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_SEATTLE_SBIN_TRAPSTAT): $(USR_SEATTLE_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_SEATTLE_SBIN_FRUADM): $(USR_SEATTLE_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(LINKED_PLATFORMS:%=$(ROOT_PLAT_DIR)/%): $(ROOT_PLAT_DIR)
$(INS.slink3)
diff --git a/usr/src/uts/sun4u/serengeti/cheetah/Makefile b/usr/src/uts/sun4u/serengeti/cheetah/Makefile
index c37d9a860a..27a8c3e7c1 100644
--- a/usr/src/uts/sun4u/serengeti/cheetah/Makefile
+++ b/usr/src/uts/sun4u/serengeti/cheetah/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the Serengeti
@@ -118,7 +116,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
index a23dbd50f1..da06097e3e 100644
--- a/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
+++ b/usr/src/uts/sun4u/serengeti/cheetahplus/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the Serengeti
@@ -123,7 +121,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/serengeti/sys/Makefile b/usr/src/uts/sun4u/serengeti/sys/Makefile
index 5c557c88e0..72f110ba66 100644
--- a/usr/src/uts/sun4u/serengeti/sys/Makefile
+++ b/usr/src/uts/sun4u/serengeti/sys/Makefile
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/sys/Makefile
#
UTSBASE = ../../..
@@ -37,8 +35,6 @@ include ../Makefile.serengeti
# Override defaults.
#
FILEMODE = 644
-OWNER = root
-GROUP = bin
HDRS=
diff --git a/usr/src/uts/sun4u/serrano/Makefile b/usr/src/uts/sun4u/serrano/Makefile
index 7a564b5659..acd6b33fb3 100644
--- a/usr/src/uts/sun4u/serrano/Makefile
+++ b/usr/src/uts/sun4u/serrano/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the SUNW,UltraSPARC-IIIi+ cpu
@@ -113,7 +111,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/snowbird/Makefile.targ b/usr/src/uts/sun4u/snowbird/Makefile.targ
index 9fd2bac81a..176d4df30c 100644
--- a/usr/src/uts/sun4u/snowbird/Makefile.targ
+++ b/usr/src/uts/sun4u/snowbird/Makefile.targ
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/snowbird/Makefile.targ
# Common targets for sun4u snowbird implementation specific modules.
#
@@ -89,13 +87,13 @@ $(USR_SNOWBIRD_SBIN_DIR): $(USR_SNOWBIRD_DIR)
-$(INS.dir.root.bin)
$(USR_SNOWBIRD_SBIN_PRTDIAG): $(USR_SNOWBIRD_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/prtdiag $@
$(USR_SNOWBIRD_SBIN_TRAPSTAT): $(USR_SNOWBIRD_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/trapstat $@
$(USR_SNOWBIRD_SBIN_FRUADM): $(USR_SNOWBIRD_SBIN_DIR)
- $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) -r $@; $(SYMLINK) ../../$(PLATFORM)/sbin/fruadm $@
$(USR_SNOWBIRD_LIB_DIR): $(USR_SNOWBIRD_DIR)
-$(INS.dir.root.bin)
diff --git a/usr/src/uts/sun4u/snowbird/sys/Makefile b/usr/src/uts/sun4u/snowbird/sys/Makefile
index 3cb0b96725..c5867e721b 100644
--- a/usr/src/uts/sun4u/snowbird/sys/Makefile
+++ b/usr/src/uts/sun4u/snowbird/sys/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -21,11 +20,9 @@
#
#
# uts/sun4u/snowbird/sys/Makefile
-# Copyright 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
UTSBASE = ../../..
#
@@ -37,7 +34,6 @@ include ../Makefile.snowbird
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= todds1307.h
diff --git a/usr/src/uts/sun4u/spitfire/Makefile b/usr/src/uts/sun4u/spitfire/Makefile
index 414fd83707..799f79e7bc 100644
--- a/usr/src/uts/sun4u/spitfire/Makefile
+++ b/usr/src/uts/sun4u/spitfire/Makefile
@@ -20,7 +20,7 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
@@ -116,7 +116,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/starcat/cheetah/Makefile b/usr/src/uts/sun4u/starcat/cheetah/Makefile
index 61836db92c..0588e4d986 100644
--- a/usr/src/uts/sun4u/starcat/cheetah/Makefile
+++ b/usr/src/uts/sun4u/starcat/cheetah/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the Starcat specific
@@ -113,7 +111,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/starcat/cheetahplus/Makefile b/usr/src/uts/sun4u/starcat/cheetahplus/Makefile
index c67d7f2eaa..d058c8858b 100644
--- a/usr/src/uts/sun4u/starcat/cheetahplus/Makefile
+++ b/usr/src/uts/sun4u/starcat/cheetahplus/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the Starcat specific
@@ -119,7 +117,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/starcat/sys/Makefile b/usr/src/uts/sun4u/starcat/sys/Makefile
index 2755674d52..f8062fb6ff 100644
--- a/usr/src/uts/sun4u/starcat/sys/Makefile
+++ b/usr/src/uts/sun4u/starcat/sys/Makefile
@@ -19,11 +19,10 @@
# CDDL HEADER END
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
+
UTSBASE = ../../..
#
@@ -35,8 +34,6 @@ include ../Makefile.starcat
# Override defaults.
#
FILEMODE = 644
-OWNER = bin
-GROUP = bin
HDRS=
diff --git a/usr/src/uts/sun4u/starfire/spitfire/Makefile b/usr/src/uts/sun4u/starfire/spitfire/Makefile
index c53dbb58b7..0dae0c68c3 100644
--- a/usr/src/uts/sun4u/starfire/spitfire/Makefile
+++ b/usr/src/uts/sun4u/starfire/spitfire/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the sun4u UltraSPARC driver module.
@@ -103,7 +101,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4u/starfire/sys/Makefile b/usr/src/uts/sun4u/starfire/sys/Makefile
index 1904790b17..1b3f2aa488 100644
--- a/usr/src/uts/sun4u/starfire/sys/Makefile
+++ b/usr/src/uts/sun4u/starfire/sys/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-# ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
UTSBASE = ../../..
@@ -35,7 +32,6 @@ include ../Makefile.starfire
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= cvc.h
diff --git a/usr/src/uts/sun4u/sunfire/sys/Makefile b/usr/src/uts/sun4u/sunfire/sys/Makefile
index cca53f629a..9e40e80589 100644
--- a/usr/src/uts/sun4u/sunfire/sys/Makefile
+++ b/usr/src/uts/sun4u/sunfire/sys/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
UTSBASE = ../../..
@@ -37,7 +35,6 @@ include ../Makefile.sunfire
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= ac.h environ.h fhc.h simmstat.h sysctrl.h sram.h
diff --git a/usr/src/uts/sun4u/sys/Makefile b/usr/src/uts/sun4u/sys/Makefile
index 18361ed6df..1a09a1a896 100644
--- a/usr/src/uts/sun4u/sys/Makefile
+++ b/usr/src/uts/sun4u/sys/Makefile
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# uts/sun4u/sys/Makefile
@@ -37,7 +34,6 @@ include ../Makefile.sun4u
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
SUN4_HDRS= \
async.h \
@@ -194,7 +190,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
mon/%.check: mon/%.h
$(DOT_H_CHECK)
diff --git a/usr/src/uts/sun4u/vm/Makefile b/usr/src/uts/sun4u/vm/Makefile
index 53422b4346..c7feb0eeb6 100644
--- a/usr/src/uts/sun4u/vm/Makefile
+++ b/usr/src/uts/sun4u/vm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2004 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4u/vm/Makefile
#
UTSBASE = ../..
@@ -38,7 +35,6 @@ include ../Makefile.sun4u
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= mach_sfmmu.h hat_sfmmu.h
@@ -71,7 +67,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
%.check: ../../sfmmu/vm/%.h
$(DOT_H_CHECK)
diff --git a/usr/src/uts/sun4v/generic/Makefile b/usr/src/uts/sun4v/generic/Makefile
index 8c4c0c01ba..1da2371622 100644
--- a/usr/src/uts/sun4v/generic/Makefile
+++ b/usr/src/uts/sun4v/generic/Makefile
@@ -20,11 +20,9 @@
#
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
#
# This makefile drives the production of the Generic sun4v cpu module.
@@ -123,7 +121,7 @@ $(SYM_MOD): $(UNIX_O) $(CPULIB)
CPU_DIR=$(HERE) SYM_MOD=$(HERE)/$(SYM_MOD) $(MAKE) symcheck)
$(ROOTSOFTLINKS): $(ROOTMODULE)
- $(RM) $@; $(SYMLINK) $(MODULE) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(RM) $@; $(SYMLINK) $(MODULE) $@
# Include common targets.
#
diff --git a/usr/src/uts/sun4v/montoya/Makefile.targ b/usr/src/uts/sun4v/montoya/Makefile.targ
index 14759f4a32..fb5eaf5db0 100644
--- a/usr/src/uts/sun4v/montoya/Makefile.targ
+++ b/usr/src/uts/sun4v/montoya/Makefile.targ
@@ -18,10 +18,7 @@
#
# CDDL HEADER END
#
-#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Common targets for sun4v platform-implementation specific modules.
@@ -82,7 +79,7 @@ $(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%): $(USR_PLAT_DIR)
$(USR_MONTOYA_SBIN_LINKS): $(USR_MONTOYA_SBIN_DIR)
$(RM) -r $@;
- $(SYMLINK) ../../$(PLATFORM)/sbin/$(@F) $@ $(CHOWNLINK) $(CHGRPLINK)
+ $(SYMLINK) ../../$(PLATFORM)/sbin/$(@F) $@
#
# Include common targets.
diff --git a/usr/src/uts/sun4v/sys/Makefile b/usr/src/uts/sun4v/sys/Makefile
index e08bd67f5a..448bd3ed64 100644
--- a/usr/src/uts/sun4v/sys/Makefile
+++ b/usr/src/uts/sun4v/sys/Makefile
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
@@ -37,7 +37,6 @@ include ../Makefile.sun4v
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
SUN4_HDRS= \
clock.h \
@@ -148,7 +147,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
mon/%.check: mon/%.h
$(DOT_H_CHECK)
diff --git a/usr/src/uts/sun4v/vm/Makefile b/usr/src/uts/sun4v/vm/Makefile
index 8464649e44..631c8b39c1 100644
--- a/usr/src/uts/sun4v/vm/Makefile
+++ b/usr/src/uts/sun4v/vm/Makefile
@@ -2,9 +2,8 @@
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License"). You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
#
# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
# or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#ident "%Z%%M% %I% %E% SMI"
-#
# uts/sun4v/vm/Makefile
#
UTSBASE = ../..
@@ -38,7 +35,6 @@ include ../Makefile.sun4v
# Override defaults.
#
FILEMODE = 644
-GROUP = bin
HDRS= mach_sfmmu.h hat_sfmmu.h
@@ -71,7 +67,7 @@ $(ROOTDIRS):
# -r because this used to be a directory and is now a link.
$(ROOTLINK): $(ROOTDIRS)
- -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@ $(CHOWNLINK) $(CHGRPLINK)
+ -$(RM) -r $@; $(SYMLINK) $(LINKDEST) $@
%.check: ../../sfmmu/vm/%.h
$(DOT_H_CHECK)