libbpf: relicense libbpf as LGPL-2.1 OR BSD-2-Clause
Subsystems (4)
Alexei Starovoitov
maintainerPATCH 1/1 libbpf: relicense libbpf as LGPL-2.1 OR BSD-2-Clause
libbpf is maturing as a library and gaining features that no other bpf libraries support (BPF Type Format, bpf to bpf calls, etc)
Many Apache2 licensed projects (like bcc, bpftrace, gobpf, cilium, etc) would like to use libbpf, but cannot do this yet, since Apache Foundation explicitly states that LGPL is incompatible with Apache2.
Hence let's relicense libbpf as dual license LGPL-2.1 or BSD-2-Clause, since BSD-2 is compatible with Apache2.
Dual LGPL or Apache2 is invalid combination.
Fix license mistake in Makefile as well.
Signed-off-by Alexei Starovoitov <[email protected]>
Acked-by Andrey Ignatov <[email protected]>
Acked-by Björn Töpel <[email protected]>
Acked-by Daniel Borkmann <[email protected]>
Acked-by David Beckett <[email protected]>
Acked-by Jakub Kicinski <[email protected]>
Acked-by Joe Stringer <[email protected]>
Acked-by John Fastabend <[email protected]>
Acked-by Martin KaFai Lau <[email protected]>
Acked-by Quentin Monnet <[email protected]>
Acked-by Thomas Graf <[email protected]>
Acked-by Roman Gushchin <[email protected]>
Acked-by Wang Nan <[email protected]>
Acked-by Yonghong Song <[email protected]>
---
vger rejected previous patch. resending with shorter cc list.
tools/lib/bpf/Makefile | 2 +- tools/lib/bpf/bpf.c | 2 +- tools/lib/bpf/bpf.h | 2 +- tools/lib/bpf/btf.c | 2 +- tools/lib/bpf/btf.h | 2 +- tools/lib/bpf/libbpf.c | 15 +-------------- tools/lib/bpf/libbpf.h | 15 +-------------- tools/lib/bpf/libbpf_errno.c | 15 +-------------- tools/lib/bpf/netlink.c | 2 +- tools/lib/bpf/nlattr.c | 7 +------ tools/lib/bpf/nlattr.h | 7 +------ tools/lib/bpf/str_error.c | 2 +- tools/lib/bpf/str_error.h | 2 +- 13 files changed, 13 insertions(+), 62 deletions(-)
tools/lib/bpf/Makefile +1 -1
@@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) # Most of this file is copied from tools/lib/traceevent/Makefile BPF_VERSION = 0
tools/lib/bpf/bpf.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* * common eBPF ELF operations.
tools/lib/bpf/bpf.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* * common eBPF ELF operations.
tools/lib/bpf/btf.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* Copyright (c) 2018 Facebook */ #include <stdlib.h>
tools/lib/bpf/btf.h +1 -1
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* Copyright (c) 2018 Facebook */ #ifndef __LIBBPF_BTF_H
tools/lib/bpf/libbpf.c +1 -14
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* * Common eBPF ELF object loading operations.
@@ -7,19 +7,6 @@* Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. * Copyright (C) 2017 Nicira, Inc. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; -* version 2.1 of the License (not later!) -* -* This program 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 Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, see <http://www.gnu.org/licenses> */ #define _GNU_SOURCE
tools/lib/bpf/libbpf.h +1 -14
@@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* * Common eBPF ELF object loading operations.
@@ -6,19 +6,6 @@* Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; -* version 2.1 of the License (not later!) -* -* This program 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 Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, see <http://www.gnu.org/licenses> */ #ifndef __LIBBPF_LIBBPF_H#define __LIBBPF_LIBBPF_H
tools/lib/bpf/libbpf_errno.c +1 -14
@@ -1,23 +1,10 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* * Copyright (C) 2013-2015 Alexei Starovoitov <[email protected]> * Copyright (C) 2015 Wang Nan <[email protected]> * Copyright (C) 2015 Huawei Inc. * Copyright (C) 2017 Nicira, Inc. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; -* version 2.1 of the License (not later!) -* -* This program 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 Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this program; if not, see <http://www.gnu.org/licenses> */ #include <stdio.h>
tools/lib/bpf/netlink.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* Copyright (c) 2018 Facebook */ #include <stdlib.h>
tools/lib/bpf/nlattr.c +1 -6
@@ -1,13 +1,8 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) /* * NETLINK Netlink attributes * -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation version 2.1 -* of the License. -* * Copyright (c) 2003-2013 Thomas Graf <[email protected]> */
tools/lib/bpf/nlattr.h +1 -6
@@ -1,13 +1,8 @@ -/* SPDX-License-Identifier: LGPL-2.1 */ +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ /* * NETLINK Netlink attributes * -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation version 2.1 -* of the License. -* * Copyright (c) 2003-2013 Thomas Graf <[email protected]> */
tools/lib/bpf/str_error.c +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +// SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) #undef _GNU_SOURCE#include <string.h> #include <stdio.h>
tools/lib/bpf/str_error.h +1 -1
@@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1 +/* SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) */ #ifndef __LIBBPF_STR_ERROR_H#define __LIBBPF_STR_ERROR_H
Signature · 1 line
2.17.1