6849573 usr/src/tools license files should live under usr/src/tools

9 files changed, 52 insertions, 30 deletions

diff --git a/usr/src/tools/Makefile.tools b/usr/src/tools/Makefile.tools
index 9e9f30be8d..ea8fa6c15e 100644
--- a/usr/src/tools/Makefile.tools
+++ b/usr/src/tools/Makefile.tools
@@ -31,6 +31,8 @@ include $(SRC)/Makefile.master
 
 FILEMODE=	0555
 
+CLOBBERFILES += $(PYOBJS)
+
 TOOLS=			$(SRC)/tools
 TOOLS_PROTO=		$(TOOLS)/proto
 ROOTOPT=		$(TOOLS_PROTO)/opt
diff --git a/usr/src/tools/SUNWonbld/Makefile b/usr/src/tools/SUNWonbld/Makefile
index ae5c612b5c..db1974d0d6 100644
--- a/usr/src/tools/SUNWonbld/Makefile
+++ b/usr/src/tools/SUNWonbld/Makefile
@@ -18,17 +18,41 @@
 #
 # 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.master
 include $(PKGDEFS)/Makefile.com
 include ../Makefile.tools
 
-LICENSEFILES += ../ctf/dwarf/THIRDPARTYLICENSE $(GPLV2)
+#
+# Warning: do not use the common license files here.  Instead, make sure
+# that all files listed in LICENSEFILES come from somewhere under the
+# usr/src/tools directory, have a corresponding .descrip file, and have a
+# corresponding entry in usr/src/tools/opensolaris/license-list.
+#
+# If they only apply to source under usr/src/tools, simply integrate
+# the licenses as source-code-managed text files, as with the dwarf
+# license referenced below.
+#
+# If the licenses are duplicated in other parts of the source tree,
+# create a Makefile target to copy them into place, as is done in
+# usr/src/tools/onbld/Makefile for the onbld license referenced below.
+#
+# This dance ensures that the appropriate licenses are incorporated into
+# both the package copyright file and the tools tarball license file.
+# See usr/src/tools/scripts/mktpl.pl for details.
+#
+LICENSEFILES += \
+	../ctf/dwarf/THIRDPARTYLICENSE \
+	../onbld/THIRDPARTYLICENSE
+
+CLEANFILES += bld_awk_pkginfo
+
+CLOBBERFILES += awk_pkginfo
 
 .KEEP_STATE:
 
@@ -60,9 +84,11 @@ $(DATAFILES): $(PKGDEFS)/common_files/$$@
 $(MACHDATAFILES): $(PKGDEFS)/common_files/$$@_$(MACH)
 	$(RM) $@; cp $(PKGDEFS)/common_files/$@_$(MACH) $@
 
-clobber clean:
-	-$(RM) $(CLOBBERFILES) $(CLEANFILES)
-	-$(RM) awk_pkginfo bld_awk_pkginfo
+clean:
+	-$(RM) $(CLEANFILES)
+
+clobber: clean
+	-$(RM) $(CLOBBERFILES)
 
 copyright: $(BUILDPKGCR) $(LICENSEFILES)
 	@$(DO_BUILDPKGCR)
diff --git a/usr/src/tools/onbld/Checks/Makefile b/usr/src/tools/onbld/Checks/Makefile
index f94fd92069..54e523ccd0 100644
--- a/usr/src/tools/onbld/Checks/Makefile
+++ b/usr/src/tools/onbld/Checks/Makefile
@@ -56,7 +56,6 @@ all: $(PYOBJS)
 install: $(ROOTONBLDCHECKSFILES)
 
 clean:
-	$(RM) $(PYOBJS)
 
 $(ROOTONBLDLIBPY)/onbld/Checks/%: %
 	$(INS.pyfile)
diff --git a/usr/src/tools/onbld/Makefile b/usr/src/tools/onbld/Makefile
index 3da4d86b3e..91f17e95d3 100644
--- a/usr/src/tools/onbld/Makefile
+++ b/usr/src/tools/onbld/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 $(SRC)/Makefile.master
 include ../Makefile.tools
@@ -44,18 +42,24 @@ PYFILES= $(PYSRCS) $(PYOBJS)
 all := TARGET = all
 install := TARGET = install
 clean := TARGET = clean
+clobber := TARGET = clobber
 
 ROOTONBLDBASEFILES=	$(PYFILES:%=$(ROOTONBLDLIBPY)/onbld/%)
 $(ROOTONBLDBASEFILES) := FILEMODE = 0444
 
+CLOBBERFILES += THIRDPARTYLICENSE
+
 .KEEP_STATE:
 
-all: $(PYOBJS) $(SUBDIRS)
+all: $(PYOBJS) $(SUBDIRS) THIRDPARTYLICENSE
+
+install: all $(ROOTONBLDBASEFILES) $(SUBDIRS)
 
-install: $(ROOTONBLDBASEFILES) $(SUBDIRS)
+clean clobber: $(SUBDIRS)
 
-clean: $(SUBDIRS)
-	$(RM) $(PYOBJS)
+THIRDPARTYLICENSE: $(SRC)/pkgdefs/license_files/lic_GPLv2
+	$(RM) $@
+	$(CAT) $? > $@
 
 $(ROOTONBLDLIBPY)/onbld/%: %
 	$(INS.pyfile)
diff --git a/usr/src/tools/onbld/Scm/Makefile b/usr/src/tools/onbld/Scm/Makefile
index 4466ab539c..20285ba142 100644
--- a/usr/src/tools/onbld/Scm/Makefile
+++ b/usr/src/tools/onbld/Scm/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 $(SRC)/Makefile.master
 include ../../Makefile.tools
@@ -50,7 +48,6 @@ all: $(PYOBJS)
 install: all .WAIT $(ROOTONBLDSCMFILES)
 
 clean:
-	$(RM) $(PYOBJS)
 
 $(ROOTONBLDLIBPY)/onbld/Scm/%: %
 	$(INS.pyfile)
diff --git a/usr/src/tools/onbld/THIRDPARTYLICENSE.descrip b/usr/src/tools/onbld/THIRDPARTYLICENSE.descrip
new file mode 100644
index 0000000000..3f5920ba4f
--- /dev/null
+++ b/usr/src/tools/onbld/THIRDPARTYLICENSE.descrip
@@ -0,0 +1 @@
+SUNWonbld tools requiring use of Mercurial internals
diff --git a/usr/src/tools/onbld/hgext/Makefile b/usr/src/tools/onbld/hgext/Makefile
index 8295b93a63..02db613d9b 100644
--- a/usr/src/tools/onbld/hgext/Makefile
+++ b/usr/src/tools/onbld/hgext/Makefile
@@ -20,18 +20,16 @@
 #
 
 #
-# 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 $(SRC)/Makefile.master
 include ../../Makefile.tools
 
 PYSRCS= \
 	__init__.py	\
-	cdm.py		\
+	cdm.py
 
 PYOBJS = $(PYSRCS:%.py=%.pyc)
 
@@ -48,7 +46,6 @@ all: $(PYOBJS)
 install: all .WAIT $(ROOTONBLDHGEXTFILES)
 
 clean:
-	$(RM) $(PYOBJS)
 
 $(ROOTONBLDLIBPY)/onbld/hgext/%: %
 	$(INS.pyfile)
diff --git a/usr/src/tools/opensolaris/license-list b/usr/src/tools/opensolaris/license-list
index 0c2352376c..b948912c43 100644
--- a/usr/src/tools/opensolaris/license-list
+++ b/usr/src/tools/opensolaris/license-list
@@ -116,6 +116,7 @@ usr/src/lib/pkcs11/include/THIRDPARTYLICENSE
 usr/src/lib/print/libhttp-core/common/LICENSE.txt
 usr/src/stand/lib/tcp/THIRDPARTYLICENSE
 usr/src/tools/ctf/dwarf/THIRDPARTYLICENSE
+usr/src/tools/onbld/THIRDPARTYLICENSE
 usr/src/ucbcmd/basename/THIRDPARTYLICENSE
 usr/src/ucbcmd/echo/THIRDPARTYLICENSE
 usr/src/ucbcmd/from/THIRDPARTYLICENSE
diff --git a/usr/src/tools/scripts/onblddrop.sh b/usr/src/tools/scripts/onblddrop.sh
index ba8ea615d6..4898a92829 100644
--- a/usr/src/tools/scripts/onblddrop.sh
+++ b/usr/src/tools/scripts/onblddrop.sh
@@ -21,11 +21,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"
-#
 
 #
 # Make SUNWonbld package tarball for OpenSolaris.  Besides the
@@ -78,9 +76,6 @@ cd $CODEMGR_WS
     fail "$PKGARCHIVE/SUNWonbld is missing."
 (cd $PKGARCHIVE; tar cf - SUNWonbld) | (cd $stagedir/$subdir; tar xf -)
 
-# Insert binary license files.
-cp -p $SRC/tools/opensolaris/BINARYLICENSE.txt $stagedir/$subdir || \
-    fail "Can't add BINARYLICENSE.txt"
 mkreadme $stagedir/$subdir
 cp -p $CODEMGR_WS/THIRDPARTYLICENSE.ON-BUILD-TOOLS $stagedir/$subdir || \
     fail "Can't add THIRDPARTYLICENSE.ON-BUILD-TOOLS."