[PATCH bpf-next] bpftool: Fix SPDX tag for Makefiles and .gitignore

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <redacted>
Cc: Peter Wu <redacted>
Cc: Roman Gushchin <redacted>
Cc: Song Liu <redacted>
Cc: Stanislav Fomichev <redacted>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Quentin Monnet <redacted>
---
 tools/bpf/bpftool/.gitignore             | 2 +-
 tools/bpf/bpftool/Documentation/Makefile | 2 +-
 tools/bpf/bpftool/Makefile               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/bpf/bpftool/.gitignore b/tools/bpf/bpftool/.gitignore
index 05ce4446b780..a736f64dc5dc 100644
--- a/tools/bpf/bpftool/.gitignore
+++ b/tools/bpf/bpftool/.gitignore

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 *.d
 /bootstrap/
 /bpftool

diff --git a/tools/bpf/bpftool/Documentation/Makefile b/tools/bpf/bpftool/Documentation/Makefile
index c49487905ceb..44b60784847b 100644
--- a/tools/bpf/bpftool/Documentation/Makefile
+++ b/tools/bpf/bpftool/Documentation/Makefile

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 include ../../../scripts/Makefile.include
 include ../../../scripts/utilities.mak
 

diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile
index c0c30e56988f..622568c7a9b8 100644
--- a/tools/bpf/bpftool/Makefile
+++ b/tools/bpf/bpftool/Makefile

@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 include ../../scripts/Makefile.include
 include ../../scripts/utilities.mak
 

-- 
2.32.0

On Fri, Nov 5, 2021 at 3:19 PM Quentin Monnet [off-list ref] wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>

Acked-by: Andrii Nakryiko <andrii@kernel.org>

On 2021-11-05 at 23:19:04 +0100, Quentin Monnet [off-list ref] wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <redacted>
Cc: Peter Wu <redacted>
Cc: Roman Gushchin <redacted>
Cc: Song Liu <redacted>
Cc: Stanislav Fomichev <redacted>
Cc: Tobias Klauser <tklauser@distanz.ch>

Acked-by: Tobias Klauser <tklauser@distanz.ch>

Thanks

On Nov 5, 2021, at 3:19 PM, Quentin Monnet [off-list ref] wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <redacted>
Cc: Peter Wu <redacted>
Cc: Roman Gushchin <redacted>
Cc: Song Liu <redacted>
Cc: Stanislav Fomichev <redacted>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Quentin Monnet <redacted>

Acked-by: Song Liu <redacted>

On Fri, Nov 5, 2021 at 3:19 PM Quentin Monnet [off-list ref] wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <redacted>
Cc: Peter Wu <redacted>
Cc: Roman Gushchin <redacted>
Cc: Song Liu <redacted>
Cc: Stanislav Fomichev <redacted>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Quentin Monnet <redacted>

Acked-by: Joe Stringer <redacted>

On Fri, Nov 05, 2021 at 10:19:04PM +0000, Quentin Monnet wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Joe Stringer <redacted>
Cc: Peter Wu <redacted>
Cc: Roman Gushchin <redacted>
Cc: Song Liu <redacted>
Cc: Stanislav Fomichev <redacted>
Cc: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: Quentin Monnet <redacted>

Acked-by: Jean-Philippe Brucker <redacted>

On 05/11/2021 23.19, Quentin Monnet wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Jean-Philippe Brucker <redacted>
Cc: Jesper Dangaard Brouer <redacted>

Acked-by: Jesper Dangaard Brouer <redacted>

On Fri,  5 Nov 2021 22:19:04 +0000 Quentin Monnet wrote:

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>

Acked-by: Jakub Kicinski <kuba@kernel.org>

On Wed, Nov 10, 2021 at 7:10 AM Jakub Kicinski [off-list ref] wrote:

On Fri,  5 Nov 2021 22:19:04 +0000 Quentin Monnet wrote:

quoted

Bpftool is dual-licensed under GPLv2 and BSD-2-Clause. In commit
907b22365115 ("tools: bpftool: dual license all files") we made sure
that all its source files were indeed covered by the two licenses, and
that they had the correct SPDX tags.

However, bpftool's Makefile, the Makefile for its documentation, and the
.gitignore file were skipped at the time (their GPL-2.0-only tag was
added later). Let's update the tags.

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andrii Nakryiko <redacted>
Cc: Ilya Leoshkevich <iii@linux.ibm.com>
Cc: Jakub Kicinski <kuba@kernel.org>

Acked-by: Jakub Kicinski <kuba@kernel.org>

Applied. Thanks everyone.