From 9acd9177c256266f0e2eb2d60ef80b2e7c81f01a Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Tue, 24 Oct 2023 01:16:21 +0000 Subject: [PATCH] crates/sel4-externally-shared: Fix licensing information As part of more a detailed pass. Signed-off-by: Nick Spinale --- crates/sel4-externally-shared/Cargo.toml | 4 ++-- crates/sel4-externally-shared/src/atomics/generic.rs | 3 ++- crates/sel4-externally-shared/src/atomics/mod.rs | 2 +- crates/sel4-externally-shared/src/atomics/ops.rs | 2 +- crates/sel4-externally-shared/src/atomics/ordering.rs | 2 +- crates/sel4-externally-shared/src/lib.rs | 2 +- crates/sel4-externally-shared/src/ops/bytewise_ops.rs | 2 +- crates/sel4-externally-shared/src/ops/mod.rs | 2 +- crates/sel4-externally-shared/src/ops/normal_ops.rs | 2 +- .../sel4-externally-shared/src/ops/unordered_atomic_ops.rs | 2 +- crates/sel4-externally-shared/src/ops/zerocopy_ops.rs | 2 +- .../crates/sel4-externally-shared/crate.nix | 6 ++++-- 12 files changed, 17 insertions(+), 14 deletions(-) diff --git a/crates/sel4-externally-shared/Cargo.toml b/crates/sel4-externally-shared/Cargo.toml index 2c8d6d4a1..f1e40cfd4 100644 --- a/crates/sel4-externally-shared/Cargo.toml +++ b/crates/sel4-externally-shared/Cargo.toml @@ -1,7 +1,7 @@ # # Copyright 2023, Colias Group, LLC # -# SPDX-License-Identifier: BSD-2-Clause +# SPDX-License-Identifier: MIT OR Apache-2.0 # [package] @@ -9,7 +9,7 @@ name = "sel4-externally-shared" version = "0.1.0" authors = ["Nick Spinale "] edition = "2021" -license = "BSD-2-Clause" +license = "MIT OR Apache-2.0" [features] unstable = ["volatile/unstable"] diff --git a/crates/sel4-externally-shared/src/atomics/generic.rs b/crates/sel4-externally-shared/src/atomics/generic.rs index 1713fde80..4042fe6f9 100644 --- a/crates/sel4-externally-shared/src/atomics/generic.rs +++ b/crates/sel4-externally-shared/src/atomics/generic.rs @@ -1,7 +1,8 @@ // // Copyright 2023, Colias Group, LLC +// Copyright 2023, Rust project contributors // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use core::intrinsics; diff --git a/crates/sel4-externally-shared/src/atomics/mod.rs b/crates/sel4-externally-shared/src/atomics/mod.rs index f1c28bb86..367a71eba 100644 --- a/crates/sel4-externally-shared/src/atomics/mod.rs +++ b/crates/sel4-externally-shared/src/atomics/mod.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use core::fmt; diff --git a/crates/sel4-externally-shared/src/atomics/ops.rs b/crates/sel4-externally-shared/src/atomics/ops.rs index 62a6e32c1..6e170bad4 100644 --- a/crates/sel4-externally-shared/src/atomics/ops.rs +++ b/crates/sel4-externally-shared/src/atomics/ops.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use core::sync::atomic::Ordering; diff --git a/crates/sel4-externally-shared/src/atomics/ordering.rs b/crates/sel4-externally-shared/src/atomics/ordering.rs index 4dd5b17b9..a2d68baf3 100644 --- a/crates/sel4-externally-shared/src/atomics/ordering.rs +++ b/crates/sel4-externally-shared/src/atomics/ordering.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use core::sync::atomic::Ordering; diff --git a/crates/sel4-externally-shared/src/lib.rs b/crates/sel4-externally-shared/src/lib.rs index 312d7b818..f971dcf4e 100644 --- a/crates/sel4-externally-shared/src/lib.rs +++ b/crates/sel4-externally-shared/src/lib.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // #![no_std] diff --git a/crates/sel4-externally-shared/src/ops/bytewise_ops.rs b/crates/sel4-externally-shared/src/ops/bytewise_ops.rs index b8ff84956..23bde8eae 100644 --- a/crates/sel4-externally-shared/src/ops/bytewise_ops.rs +++ b/crates/sel4-externally-shared/src/ops/bytewise_ops.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // #![cfg_attr(not(feature = "unstable"), allow(unused_imports))] diff --git a/crates/sel4-externally-shared/src/ops/mod.rs b/crates/sel4-externally-shared/src/ops/mod.rs index 877f51b27..fb80b86b2 100644 --- a/crates/sel4-externally-shared/src/ops/mod.rs +++ b/crates/sel4-externally-shared/src/ops/mod.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // pub use volatile::ops::*; diff --git a/crates/sel4-externally-shared/src/ops/normal_ops.rs b/crates/sel4-externally-shared/src/ops/normal_ops.rs index 278ac6619..dcab1784c 100644 --- a/crates/sel4-externally-shared/src/ops/normal_ops.rs +++ b/crates/sel4-externally-shared/src/ops/normal_ops.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use core::ptr; diff --git a/crates/sel4-externally-shared/src/ops/unordered_atomic_ops.rs b/crates/sel4-externally-shared/src/ops/unordered_atomic_ops.rs index 2aad93cb4..56ff2dd1c 100644 --- a/crates/sel4-externally-shared/src/ops/unordered_atomic_ops.rs +++ b/crates/sel4-externally-shared/src/ops/unordered_atomic_ops.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // #![cfg_attr(not(feature = "unstable"), allow(dead_code))] diff --git a/crates/sel4-externally-shared/src/ops/zerocopy_ops.rs b/crates/sel4-externally-shared/src/ops/zerocopy_ops.rs index 7e7b790bb..ceb3580d3 100644 --- a/crates/sel4-externally-shared/src/ops/zerocopy_ops.rs +++ b/crates/sel4-externally-shared/src/ops/zerocopy_ops.rs @@ -1,7 +1,7 @@ // // Copyright 2023, Colias Group, LLC // -// SPDX-License-Identifier: BSD-2-Clause +// SPDX-License-Identifier: MIT OR Apache-2.0 // use volatile::ops::{Ops, UnitaryOps}; diff --git a/hacking/cargo-manifest-sources/crates/sel4-externally-shared/crate.nix b/hacking/cargo-manifest-sources/crates/sel4-externally-shared/crate.nix index 321eaa387..54948d860 100644 --- a/hacking/cargo-manifest-sources/crates/sel4-externally-shared/crate.nix +++ b/hacking/cargo-manifest-sources/crates/sel4-externally-shared/crate.nix @@ -1,13 +1,15 @@ # # Copyright 2023, Colias Group, LLC # -# SPDX-License-Identifier: BSD-2-Clause +# SPDX-License-Identifier: MIT OR Apache-2.0 # { mk, localCrates, versions, volatileSource }: -mk { +mk rec { package.name = "sel4-externally-shared"; + package.license = "MIT OR Apache-2.0"; + nix.reuseFrontmatterArgs.licenseID = package.license; nix.local.dependencies = with localCrates; [ # volatile ];