From bd85ea4bb68783a0a58a6ddc6c3cc1dd22715eb1 Mon Sep 17 00:00:00 2001 From: Marc Fiuczynski Date: Thu, 10 Aug 2006 19:00:27 +0000 Subject: [PATCH] Copyright notice for both Intel and Princeton --- source/BootAPI.py | 9 ++++++ source/BootServerRequest.py | 42 ++-------------------------- source/COPYRIGHT | 55 +++++++++++++++++++++++++++++++++++++ source/Exceptions.py | 7 +++++ source/ModelOptions.py | 10 +++++++ source/compatibility.py | 9 ++++++ source/merge_hw_tables.py | 9 +++++- source/notify_messages.py | 8 ++++++ source/utils.py | 45 ++++-------------------------- 9 files changed, 115 insertions(+), 79 deletions(-) create mode 100644 source/COPYRIGHT diff --git a/source/BootAPI.py b/source/BootAPI.py index f1d418b..a27593b 100644 --- a/source/BootAPI.py +++ b/source/BootAPI.py @@ -1,3 +1,12 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + + import xmlrpclib import xml.parsers.expat import hmac diff --git a/source/BootServerRequest.py b/source/BootServerRequest.py index efe3d9c..75fad3c 100644 --- a/source/BootServerRequest.py +++ b/source/BootServerRequest.py @@ -2,45 +2,9 @@ # Copyright (c) 2003 Intel Corporation # All rights reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: - -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. - -# * 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. - -# * Neither the name of the Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. - -# 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 INTEL 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. - -# EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF -# YOUR JURISDICTION. It is licensee's responsibility to comply with any -# export regulations applicable in licensee's jurisdiction. Under -# CURRENT (May 2000) U.S. export regulations this software is eligible -# for export from the U.S. and can be downloaded by or otherwise -# exported or reexported worldwide EXCEPT to U.S. embargoed destinations -# which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan, -# Afghanistan and any other country to which the U.S. has embargoed -# goods and services. - +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. import os, sys import re diff --git a/source/COPYRIGHT b/source/COPYRIGHT new file mode 100644 index 0000000..6bf1167 --- /dev/null +++ b/source/COPYRIGHT @@ -0,0 +1,55 @@ +The BootManager source code was initially developed by Intel +Corporation and subsequently rewritten by Princeton University. The +copyright for the BootManager source code is as follows: + +Copyright (c) 2003 Intel Corporation +All rights reserved. + +Copyright (c) 2004-2006 The Trustees of Princeton University +All rights reserved. + +The License from both Intel and Princeton for this software is +follows: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * 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. + + * Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +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 PRINCETON +UNIVERSITY 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. + +Intel Corporation places the following export restrictions on the +software: + +EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF +YOUR JURISDICTION. It is licensee's responsibility to comply with any +export regulations applicable in licensee's jurisdiction. Under +CURRENT (May 2000) U.S. export regulations this software is eligible +for export from the U.S. and can be downloaded by or otherwise +exported or reexported worldwide EXCEPT to U.S. embargoed destinations +which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan, +Afghanistan and any other country to which the U.S. has embargoed +goods and services. + diff --git a/source/Exceptions.py b/source/Exceptions.py index fc81fd3..915f120 100644 --- a/source/Exceptions.py +++ b/source/Exceptions.py @@ -1,3 +1,10 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. class BootManagerException(Exception): def __init__( self, err ): diff --git a/source/ModelOptions.py b/source/ModelOptions.py index ee1cab3..697b701 100644 --- a/source/ModelOptions.py +++ b/source/ModelOptions.py @@ -1,3 +1,12 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + + import string MINHW = 0x001 @@ -30,3 +39,4 @@ def Get(model): options = options | modeloptions.get(info,0) return options + diff --git a/source/compatibility.py b/source/compatibility.py index 0b69d43..ab2ab4a 100644 --- a/source/compatibility.py +++ b/source/compatibility.py @@ -1,3 +1,12 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + + """ Various functions that are used to allow the boot manager to run on various different cds are included here diff --git a/source/merge_hw_tables.py b/source/merge_hw_tables.py index 9d850d2..036d0e6 100755 --- a/source/merge_hw_tables.py +++ b/source/merge_hw_tables.py @@ -1,4 +1,11 @@ -#!/usr/bin/env python +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + """ The point of this small utility is to take a file in the format diff --git a/source/notify_messages.py b/source/notify_messages.py index f6bfb29..6186fa0 100644 --- a/source/notify_messages.py +++ b/source/notify_messages.py @@ -1,3 +1,11 @@ +#!/usr/bin/python2 + +# Copyright (c) 2003 Intel Corporation +# All rights reserved. +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. + """ this file contains the ids of messages that we can send the contacts at a site, through the BootNotifyOwners call diff --git a/source/utils.py b/source/utils.py index 5da5fcd..9efea4d 100644 --- a/source/utils.py +++ b/source/utils.py @@ -1,44 +1,11 @@ +#!/usr/bin/python2 + # Copyright (c) 2003 Intel Corporation # All rights reserved. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: - -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. - -# * 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. - -# * Neither the name of the Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. - -# 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 INTEL 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. - -# EXPORT LAWS: THIS LICENSE ADDS NO RESTRICTIONS TO THE EXPORT LAWS OF -# YOUR JURISDICTION. It is licensee's responsibility to comply with any -# export regulations applicable in licensee's jurisdiction. Under -# CURRENT (May 2000) U.S. export regulations this software is eligible -# for export from the U.S. and can be downloaded by or otherwise -# exported or reexported worldwide EXCEPT to U.S. embargoed destinations -# which include Cuba, Iraq, Libya, North Korea, Iran, Syria, Sudan, -# Afghanistan and any other country to which the U.S. has embargoed -# goods and services. - +# +# Copyright (c) 2004-2006 The Trustees of Princeton University +# All rights reserved. +# expected /proc/partitions format import os, sys, shutil import popen2 -- 2.43.0