tools: fix licenses

libsel4/tools/syscall_stub_gen.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #
 # Copyright 2017, Data61
 # Commonwealth Scientific and Industrial Research Organisation (CSIRO)

tools/bf.vim

@@ -1,11 +1,13 @@
 "
-" Copyright 2014, NICTA
+" Copyright 2017, Data61
+" Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+" ABN 41 687 119 230.
 "
 " This software may be distributed and modified according to the terms of
 " the BSD 2-Clause license. Note that NO WARRANTY is provided.
 " See "LICENSE_BSD2.txt" for details.
 "
-" @TAG(NICTA_BSD)
+" @TAG(DATA61_BSD)
 "
 
 " Vim syntax for .bf/.pbf files. Where relevant, comments below refer to the

tools/bitfield_gen.py

@@ -9,7 +9,7 @@
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 ##

tools/changed.sh

@@ -8,7 +8,7 @@
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 #

tools/circular_includes.py

@@ -1,4 +1,15 @@
 #!/usr/bin/env python
+#
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
+#
+# This software may be distributed and modified according to the terms of
+# the BSD 2-Clause license. Note that NO WARRANTY is provided.
+# See "LICENSE_BSD2.txt" for details.
+#
+# @TAG(DATA61_BSD)
+#
 """
 Script for reporting circular #includes in pre-processed sel4 source.
 Exits with a status of 0 if no circular dependencies are found, otherwise

tools/cpp_gen.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 #
-# Copyright 2014, NICTA
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
 #
 # This software may be distributed and modified according to the terms of
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 #

tools/invocation_header_gen.py

@@ -8,7 +8,7 @@
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 # seL4 Invocation ID Generator
@@ -23,9 +23,27 @@ import xml.dom.minidom
 
 COMMON_HEADER = """
 {{if libsel4}}
-/* @LICENSE(NICTA) */
+/*
+ * Copyright 2017, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
 {{else}}
-/* @LICENSE(OKL_CORE) */
+/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */
 {{endif}}
 
 /* This header was generated by kernel/tools/invocation_header_gen.py.

tools/pylintrc

@@ -1,4 +1,5 @@
-# Copyright 2017, Data 61
+#
+# Copyright 2017, Data61
 # Commonwealth Scientific and Industrial Research Organisation (CSIRO)
 # ABN 41 687 119 230.
 #

tools/python-deps/setup.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
-# Copyright 2017, Data 61
+#
+# Copyright 2017, Data61
 # Commonwealth Scientific and Industrial Research Organisation (CSIRO)
 # ABN 41 687 119 230.
 #

tools/syscall_header_gen.py

@@ -8,7 +8,7 @@
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 # seL4 System Call ID Generator
@@ -31,7 +31,15 @@ common_header = """
  */"""
 
 kernel_header_template = \
-"""/* @LICENSE(OKL_CORE) */""" + common_header + """
+"""/*
+ * Copyright 2014, General Dynamics C4 Systems
+ *
+ * This software may be distributed and modified according to the terms of
+ * the GNU General Public License version 2. Note that NO WARRANTY is provided.
+ * See "LICENSE_GPLv2.txt" for details.
+ *
+ * @TAG(GD_GPL)
+ */""" + common_header + """
 #ifndef __ARCH_API_SYSCALL_H
 #define __ARCH_API_SYSCALL_H
 
@@ -88,7 +96,19 @@ static char *syscall_names[] UNUSED = {
 """
 
 libsel4_header_template = \
-"""/* @LICENSE(NICTA) */""" + common_header + """
+"""/*
+ * Copyright 2017, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ *
+ * @TAG(DATA61_BSD)
+ */
+""" + common_header + """
 #ifndef __LIBSEL4_SYSCALL_H
 #define __LIBSEL4_SYSCALL_H
 

tools/umm.py

@@ -1,13 +1,15 @@
 #!/usr/bin/env python
 
 #
-# Copyright 2014, NICTA
+# Copyright 2017, Data61
+# Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+# ABN 41 687 119 230.
 #
 # This software may be distributed and modified according to the terms of
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 from __future__ import print_function

tools/xmllint.sh

@@ -8,7 +8,7 @@
 # the BSD 2-Clause license. Note that NO WARRANTY is provided.
 # See "LICENSE_BSD2.txt" for details.
 #
-# @TAG(NICTA_BSD)
+# @TAG(DATA61_BSD)
 #
 
 if [ 0$V -ge 3 ]; then