diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2021-01-13 10:02:51 +0100 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2021-01-13 10:02:51 +0100 |
| commit | f555028a8617f40a8501d8f2eabe94219da57afd (patch) | |
| tree | da3481f60d059fdd8fa2f8381a115e3ce875a63f | |
| parent | 7a26d43c4f71869695ba19ce58f9afac9a1d176d (diff) | |
License: Update block replacer
... so it replaces also long (older) form of GPL license.
This way replacing to apache and back ensures GPL has (newer) short form.
Change-Id: I34efd83a91e54b2b2bbb3c4429d1b82397a1e8f8
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
| -rw-r--r-- | resources/tools/block_replacer/gpl2apache.sh | 5 | ||||
| -rw-r--r-- | resources/tools/block_replacer/gpl_long_block.txt | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/resources/tools/block_replacer/gpl2apache.sh b/resources/tools/block_replacer/gpl2apache.sh index a1ef8df075..b9450d0be4 100644 --- a/resources/tools/block_replacer/gpl2apache.sh +++ b/resources/tools/block_replacer/gpl2apache.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020 Cisco and/or its affiliates. +# Copyright (c) 2021 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -25,3 +25,6 @@ fi find "${1}" \( -name "*.py" -o -name "*.sh" \) -print0 | xargs -0 \ python3 replace.py "gpl_block.txt" "apache_block.txt" + +find "${1}" \( -name "*.py" -o -name "*.sh" \) -print0 | xargs -0 \ +python3 replace.py "gpl_long_block.txt" "apache_block.txt" diff --git a/resources/tools/block_replacer/gpl_long_block.txt b/resources/tools/block_replacer/gpl_long_block.txt new file mode 100644 index 0000000000..fb3c9d0e1b --- /dev/null +++ b/resources/tools/block_replacer/gpl_long_block.txt @@ -0,0 +1,20 @@ +# +# 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. |