From: Miguel Ojeda Date: Mon, 8 Jun 2026 14:14:33 +0000 (+0200) Subject: rust: zerocopy-derive: add SPDX License Identifiers X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f85604cf0877b0369dfd68cd50cf61c0f134819;p=thirdparty%2Flinux.git rust: zerocopy-derive: add SPDX License Identifiers Originally, when the Rust upstream `alloc` standard library crate was vendored, the SPDX License Identifiers were added to every file so that the license on those was clear. The same happened with the vendoring of `proc_macro2`, `quote` and `syn`. Please see: commit 057b8d257107 ("rust: adapt `alloc` crate to the kernel") commit 69942c0a8965 ("rust: syn: add SPDX License Identifiers") commit ddfa1b279d08 ("rust: quote: add SPDX License Identifiers") commit a9acfceb9614 ("rust: proc-macro2: add SPDX License Identifiers") Thus do the same for the `zerocopy-derive` crate. This makes `scripts/spdxcheck.py` pass: use parentheses like commit 06e9bfc1e57d ("ionic: make spdxcheck.py happy") did since we have two `OR` operators in the expression (three licenses). Finally, as requested, I filed an issue [1] with upstream about it. Cc: Joshua Liebow-Feeser Cc: Jack Wrenn Link: https://github.com/google/zerocopy/issues/3428 [1] Link: https://patch.msgid.link/20260608141439.182634-15-ojeda@kernel.org Signed-off-by: Miguel Ojeda --- diff --git a/rust/zerocopy-derive/derive/from_bytes.rs b/rust/zerocopy-derive/derive/from_bytes.rs index ad8b6233fe54..d693a63b7645 100644 --- a/rust/zerocopy-derive/derive/from_bytes.rs +++ b/rust/zerocopy-derive/derive/from_bytes.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + use proc_macro2::{Span, TokenStream}; use syn::{ parse_quote, Data, DataEnum, DataStruct, DataUnion, Error, Expr, ExprLit, ExprUnary, Lit, UnOp, diff --git a/rust/zerocopy-derive/derive/into_bytes.rs b/rust/zerocopy-derive/derive/into_bytes.rs index 8c1e1009dd91..ad52a6b45d28 100644 --- a/rust/zerocopy-derive/derive/into_bytes.rs +++ b/rust/zerocopy-derive/derive/into_bytes.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + use proc_macro2::{Span, TokenStream}; use quote::quote; use syn::{Data, DataEnum, DataStruct, DataUnion, Error, Type}; diff --git a/rust/zerocopy-derive/derive/known_layout.rs b/rust/zerocopy-derive/derive/known_layout.rs index b91b4de0098c..fddffd167c82 100644 --- a/rust/zerocopy-derive/derive/known_layout.rs +++ b/rust/zerocopy-derive/derive/known_layout.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + use proc_macro2::TokenStream; use quote::quote; use syn::{parse_quote, Data, Error, Type}; diff --git a/rust/zerocopy-derive/derive/mod.rs b/rust/zerocopy-derive/derive/mod.rs index a3d066ed2b4d..665ba7da55a8 100644 --- a/rust/zerocopy-derive/derive/mod.rs +++ b/rust/zerocopy-derive/derive/mod.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + pub mod from_bytes; pub mod into_bytes; pub mod known_layout; diff --git a/rust/zerocopy-derive/derive/try_from_bytes.rs b/rust/zerocopy-derive/derive/try_from_bytes.rs index 4e36ab40bcf8..ce9c926d5b8e 100644 --- a/rust/zerocopy-derive/derive/try_from_bytes.rs +++ b/rust/zerocopy-derive/derive/try_from_bytes.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + use proc_macro2::TokenStream; use quote::quote; use syn::{ diff --git a/rust/zerocopy-derive/derive/unaligned.rs b/rust/zerocopy-derive/derive/unaligned.rs index 819d84984a03..d6dea0a11f1e 100644 --- a/rust/zerocopy-derive/derive/unaligned.rs +++ b/rust/zerocopy-derive/derive/unaligned.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + use proc_macro2::{Span, TokenStream}; use syn::{Data, DataEnum, DataStruct, DataUnion, Error}; diff --git a/rust/zerocopy-derive/lib.rs b/rust/zerocopy-derive/lib.rs index a1d10a2ada27..c517ea7db1eb 100644 --- a/rust/zerocopy-derive/lib.rs +++ b/rust/zerocopy-derive/lib.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + // Copyright 2019 The Fuchsia Authors // // Licensed under a BSD-style license , Apache License, Version 2.0 diff --git a/rust/zerocopy-derive/repr.rs b/rust/zerocopy-derive/repr.rs index 57014b38b2da..74fd376d9fda 100644 --- a/rust/zerocopy-derive/repr.rs +++ b/rust/zerocopy-derive/repr.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + // Copyright 2019 The Fuchsia Authors // // Licensed under a BSD-style license , Apache License, Version 2.0 diff --git a/rust/zerocopy-derive/util.rs b/rust/zerocopy-derive/util.rs index 4ec28bf95758..5ba5228e2a44 100644 --- a/rust/zerocopy-derive/util.rs +++ b/rust/zerocopy-derive/util.rs @@ -1,3 +1,5 @@ +// SPDX-License-Identifier: (BSD-2-Clause OR Apache-2.0) OR MIT + // Copyright 2019 The Fuchsia Authors // // Licensed under a BSD-style license , Apache License, Version 2.0