aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2020-11-12 17:22:31 +0100
committerVratko Polak <vrpolak@cisco.com>2020-11-12 17:24:47 +0100
commita5eed81d7d04e0d23186781a79031f392b432ce8 (patch)
treea661b1193976a6d4dc0f23cad0915ca5362f47c2 /resources
parent2b118b7085cd58dfe9c730cd88f3955590de2607 (diff)
Switch licenses in GPL directory
To be merged after this completes: https://wiki.fd.io/view/TSC/Relicensing_Procedure Change-Id: I003e53a620a5f82ba2bcc65b12f9c84ae92264ef Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/tools/block_replacer/gpl_block.txt31
1 files changed, 19 insertions, 12 deletions
diff --git a/resources/tools/block_replacer/gpl_block.txt b/resources/tools/block_replacer/gpl_block.txt
index 2dbbb2af06..fb3c9d0e1b 100644
--- a/resources/tools/block_replacer/gpl_block.txt
+++ b/resources/tools/block_replacer/gpl_block.txt
@@ -1,13 +1,20 @@
#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This file is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this file. If not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
+#
+# Licensed under the Apache License 2.0 or
+# GNU General Public License v2.0 or later; you may not use this file
+# except in compliance with one of these Licenses. You
+# may obtain a copy of the Licenses at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+#
+# Note: If this file is linked with Scapy, which is GPLv2+, your use of it
+# must be under GPLv2+. If at any point in the future it is no longer linked
+# with Scapy (or other GPLv2+ licensed software), you are free to choose Apache 2.
+#
+# Unless required by applicable law or agreed to in writing, software
+# 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.