svn commit: r262198 - in head/sys/boot/mips/beri: boot2 loader

[Robert Watson]

Author: rwatson
Date: Tue Feb 18 23:22:54 2014
New Revision: 262198
URL: http://svnweb.freebsd.org/changeset/base/262198

Log:
  Replace Apache-style license on two Makefiles with stock 2-clause BSD;
  license, although the former is pretty safe, it wasn't intended to be
  used in the version of MIPS boot2/loader upstreamed to FreeBSD.
  
  MFC after:	3 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/boot/mips/beri/boot2/Makefile
  head/sys/boot/mips/beri/loader/Makefile

Modified: head/sys/boot/mips/beri/boot2/Makefile
==============================================================================
--- head/sys/boot/mips/beri/boot2/Makefile	Tue Feb 18 23:18:32 2014	(r262197)
+++ head/sys/boot/mips/beri/boot2/Makefile	Tue Feb 18 23:22:54 2014	(r262198)
@@ -6,25 +6,28 @@
 # Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
 # ("CTSRD"), as part of the DARPA CRASH research programme.
 #
-# @BERI_LICENSE_HEADER_START@
+# 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 AUTHOR 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 AUTHOR 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.
 #
-# Licensed to BERI Open Systems C.I.C (BERI) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  BERI licenses this
-# file to you under the BERI Hardware-Software License, Version 1.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at:
-#
-#   http://www.beri-open-systems.org/legal/license-1-0.txt
-#
-# Unless required by applicable law or agreed to in writing, Work distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# @BERI_LICENSE_HEADER_END@
-#
-#  $FreeBSD$
+# $FreeBSD$
 
 BINDIR?=	/boot
 INSTALLFLAGS=	-b

Modified: head/sys/boot/mips/beri/loader/Makefile
==============================================================================
--- head/sys/boot/mips/beri/loader/Makefile	Tue Feb 18 23:18:32 2014	(r262197)
+++ head/sys/boot/mips/beri/loader/Makefile	Tue Feb 18 23:22:54 2014	(r262198)
@@ -6,25 +6,27 @@
 # Cambridge Computer Laboratory under DARPA/AFRL contract (FA8750-10-C-0237)
 # ("CTSRD"), as part of the DARPA CRASH research programme.
 #
-# @BERI_LICENSE_HEADER_START@
+# 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 AUTHOR 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 AUTHOR 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.
 #
-# Licensed to BERI Open Systems C.I.C (BERI) under one or more contributor
-# license agreements.  See the NOTICE file distributed with this work for
-# additional information regarding copyright ownership.  BERI licenses this
-# file to you under the BERI Hardware-Software License, Version 1.0 (the
-# "License"); you may not use this file except in compliance with the
-# License.  You may obtain a copy of the License at:
-#
-#   http://www.beri-open-systems.org/legal/license-1-0.txt
-#
-# Unless required by applicable law or agreed to in writing, Work distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations under the License.
-#
-# @BERI_LICENSE_HEADER_END@
-#
-
 # $FreeBSD$
 
 .include <bsd.own.mk>