License with Apache-2.0

Signed-off-by: Martynas Pumputis <[email protected]>
cilium · Jun 8, 2023 · 4839345 · 4839345
1 parent ce78405
commit 4839345
Show file tree

Hide file tree

Showing 15 changed files with 230 additions and 369 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ make release
 
 ## Contributing
 
-`pwru` is an open source project licensed under [GPLv2](LICENSE). Everybody is
+`pwru` is an open source project licensed under [Apache-2.0](LICENSE). Everybody is
 welcome to contribute. Contributors are required to follow the
 [Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct/)
 and must adhere to the [Developer Certificate of Origin](https://developercertificate.org/)

diff --git a/bpf/kprobe_pwru.c b/bpf/kprobe_pwru.c
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 /*
  * TODO: ipv6 l4 protocol

diff --git a/internal/byteorder/byteorder_bigendian.go b/internal/byteorder/byteorder_bigendian.go
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 // Copyright 2021 Authors of Cilium
 
 //go:build armbe || arm64be || mips || mips64 || ppc64

diff --git a/internal/byteorder/byteorder_littleendian.go b/internal/byteorder/byteorder_littleendian.go
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 // Copyright 2021-2022 Authors of Cilium
 
 //go:build 386 || amd64 || arm || arm64 || mips64le || ppc64le || riscv64 || wasm

diff --git a/internal/byteorder/byteorder_test.go b/internal/byteorder/byteorder_test.go
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 // Copyright 2017-2022 Authors of Cilium
 
 package byteorder

diff --git a/internal/pwru/config.go b/internal/pwru/config.go
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021-2022 Authors of Cilium */
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 package pwru
 

diff --git a/internal/pwru/output.go b/internal/pwru/output.go
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 package pwru
 

diff --git a/internal/pwru/types.go b/internal/pwru/types.go
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021-2022 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 package pwru
 

diff --git a/internal/pwru/utils.go b/internal/pwru/utils.go
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 package pwru
 

diff --git a/main.go b/main.go
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (C) 2020-2021 Martynas Pumputis */
-/* Copyright (C) 2021-2022 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+/* Copyright Martynas Pumputis */
+/* Copyright Authors of Cilium */
 
 package main
 

diff --git a/main_amd64.go b/main_amd64.go
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2021 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// Copyright Authors of Cilium */
 
 //go:generate sh -c "echo Generating for amd64"
 //go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang KProbePWRU ./bpf/kprobe_pwru.c -- -DOUTPUT_SKB -D__TARGET_ARCH_x86 -I./bpf/headers -Wno-address-of-packed-member

diff --git a/main_arm64.go b/main_arm64.go
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2021 Authors of Cilium */
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// Copyright Authors of Cilium */
 
 //go:generate sh -c "echo Generating for arm64"
 //go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang KProbePWRU ./bpf/kprobe_pwru.c -- -DOUTPUT_SKB -D__TARGET_ARCH_arm64 -I./bpf/headers -Wno-address-of-packed-member

diff --git a/tools/getgetter.go b/tools/getgetter.go
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2022 Authors of Cilium
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// Copyright Authors of Cilium
 
 // This tool parses the provided Go files to generate getters for any exported
 // fields of each struct matching the struct regexp filter.

diff --git a/tools/tools.go b/tools/tools.go
@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0-only
-// Copyright (C) 2021 Authors of Cilium
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+// Copyright Authors of Cilium
 
 //go:build tools
 // +build tools