diff options
| author | jmcp <James.McPherson@Sun.COM> | 2009-07-29 16:56:03 -0700 |
|---|---|---|
| committer | jmcp <James.McPherson@Sun.COM> | 2009-07-29 16:56:03 -0700 |
| commit | 24fe0b3bf671e123467ce1df0b67cadd3614c8e4 (patch) | |
| tree | b1dbcd8a1c725f5a5c63b280db8456826236565d /usr/src/lib | |
| parent | 1c4f4ba644d8782956721a39baaa3a53ebc34570 (diff) | |
| download | illumos-joyent-24fe0b3bf671e123467ce1df0b67cadd3614c8e4.tar.gz | |
6864230 hiho, hiho, it'ch chtime for CH to go
Portions contributed by Rich Lowe
Diffstat (limited to 'usr/src/lib')
45 files changed, 74 insertions, 264 deletions
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 |