Makefile copyrights and comment cleanup.

3 files changed, 100 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index b1c7467..b83d6cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,41 @@
 # Top-level build of packages for Novena PVT-1.
 #
+# Author: Rob Austein
+# Copyright (c) 2015, SUNET
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 # Building source and binary packages separately isn't strictly
 # necessary, but simplifies fault isolation.
 #
-# We generate the changes file on the fly to keep all the version
-# information in one place.  Nothing actually uses the changes file
-# once we've generated the source package, so this is harmless.  If
-# somebody really wants to be the human maintainer for a changes
-# file, be my guest.
+# This code optionally supports automatic generation of
+# debian/changelog files.  Whether this is useful or not depends on
+# the intended purpose of the resulting packages: if we're doing
+# snapshots under cron, automatic changelogs are useful; if we're
+# doing real releases, not so much.  Play this one by ear.
 #
 # We don't sign anything yet.  This will need fixing.
 
@@ -23,25 +51,11 @@ export CRYPTECH_VERSION := 1.0
 # somebody publishes packages generated with a modified version of the
 # superrepository, so don't do that (add check for uncommitted # changes?)
 
-ifdef NOTYET
-
 HEAD_TIME := $(shell git show -s --format=%ct HEAD)
 HEAD_HASH := $(shell git rev-parse HEAD)
 
 CRYPTECH_PACKAGE_VERSION := ${CRYPTECH_VERSION}~${HEAD_TIME}~${HEAD_HASH}
 
-else
-
-CRYPTECH_PACKAGE_VERSION := ${CRYPTECH_VERSION}~something
-
-endif
-
-# Make sure git can find certificatess.  We might want to change this
-# to use GIT_SSL_CAINFO so we can specify a particular file, perhaps
-# even a file in this repository, but skip that for the moment.
-
-export GIT_SSL_CAPATH=/etc/ssl/certs
-
 # Command to generate a new changelog containing one entry.
 # Does nothing if the changelog already exists.
 
@@ -67,4 +81,4 @@ rtl:
 	cd rtl; debuild -b -uc -us
 
 
-.PHONY: sw rtl
+.PHONY: all init sw rtl
diff --git a/rtl/Makefile b/rtl/Makefile
index 79ebf76..e413b48 100644
--- a/rtl/Makefile
+++ b/rtl/Makefile
@@ -1,3 +1,36 @@
+# Makefile to build Debian package for Cryptech Novena PVT-1 FPGA
+# bitstream.
+#
+# Author: Rob Austein
+# Copyright (c) 2015, SUNET
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Directory where we run Verilog synthesis
+
 BUILD_DIR := core/platform/novena/eim/build
 
 # This business of patching files that are under revision control
diff --git a/sw/Makefile b/sw/Makefile
index 962d448..9dd7dc9 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -1,3 +1,36 @@
+# Makefile to build Debian package for Cryptech Novena PVT-1 software
+# components.
+#
+# Author: Rob Austein
+# Copyright (c) 2015, SUNET
+#
+# Redistribution and use in source and binary forms, with or
+# without modification, are permitted provided that the following
+# conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Cross compilation tools
+
 export CC	:= arm-linux-gnueabihf-gcc 
 export AR	:= arm-linux-gnueabihf-ar
 export OBJCOPY	:= arm-linux-gnueabihf-objcopy