From c823b424470ad52578d8f9adee952de0ecab9f2b Mon Sep 17 00:00:00 2001 From: Berkus Decker Date: Fri, 16 Oct 2020 00:09:35 +0300 Subject: [PATCH] Update license identification --- README.md | 7 +++++++ nucleus/src/arch/aarch64/boot.rs | 2 +- nucleus/src/arch/aarch64/memory/addr.rs | 1 + nucleus/src/arch/aarch64/memory/mod.rs | 1 + nucleus/src/arch/aarch64/mod.rs | 1 + nucleus/src/arch/aarch64/traps.rs | 1 + nucleus/src/arch/mod.rs | 1 + nucleus/src/macros.rs | 1 + nucleus/src/main.rs | 1 + nucleus/src/qemu.rs | 4 ++++ nucleus/src/tests.rs | 4 ++++ nucleus/src/write_to.rs | 2 ++ 12 files changed, 25 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ec66c4..78ac1a3 100644 --- a/README.md +++ b/README.md @@ -94,3 +94,10 @@ Various references from [OSDev Wiki](https://wiki.osdev.org/Raspberry_Pi_Bare_Bo ### License scan [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fmetta-systems%2Fvesper.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fmetta-systems%2Fvesper?ref=badge_large) + +Individual files contain the following tag instead of the full license text. + + SPDX-License-Identifier: BlueOak-1.0.0 + +This enables machine processing of license information based on the SPDX +License Identifiers that are here available: http://spdx.org/licenses/ diff --git a/nucleus/src/arch/aarch64/boot.rs b/nucleus/src/arch/aarch64/boot.rs index e90e549..87f8a76 100644 --- a/nucleus/src/arch/aarch64/boot.rs +++ b/nucleus/src/arch/aarch64/boot.rs @@ -1,7 +1,7 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 * - * Based on ideas from Jorge Aparicio, Andre Richter, Phil Oppenheimer. + * Based on ideas from Jorge Aparicio, Andre Richter, Phil Oppenheimer, Sergio Benitez. * Copyright (c) Berkus Decker */ diff --git a/nucleus/src/arch/aarch64/memory/addr.rs b/nucleus/src/arch/aarch64/memory/addr.rs index d79722d..4381182 100644 --- a/nucleus/src/arch/aarch64/memory/addr.rs +++ b/nucleus/src/arch/aarch64/memory/addr.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ use { super::{align_down, align_up}, diff --git a/nucleus/src/arch/aarch64/memory/mod.rs b/nucleus/src/arch/aarch64/memory/mod.rs index c44c74f..70af54e 100644 --- a/nucleus/src/arch/aarch64/memory/mod.rs +++ b/nucleus/src/arch/aarch64/memory/mod.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ //! Memory management functions for aarch64. diff --git a/nucleus/src/arch/aarch64/mod.rs b/nucleus/src/arch/aarch64/mod.rs index 7c49eb5..24965ad 100644 --- a/nucleus/src/arch/aarch64/mod.rs +++ b/nucleus/src/arch/aarch64/mod.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ //! Implementation of aarch64 kernel functions. diff --git a/nucleus/src/arch/aarch64/traps.rs b/nucleus/src/arch/aarch64/traps.rs index 21ef27c..8fc3986 100644 --- a/nucleus/src/arch/aarch64/traps.rs +++ b/nucleus/src/arch/aarch64/traps.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ //! Interrupt handling diff --git a/nucleus/src/arch/mod.rs b/nucleus/src/arch/mod.rs index 040edd5..aeec869 100644 --- a/nucleus/src/arch/mod.rs +++ b/nucleus/src/arch/mod.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ #[cfg(target_arch = "aarch64")] diff --git a/nucleus/src/macros.rs b/nucleus/src/macros.rs index 870494c..5554da8 100644 --- a/nucleus/src/macros.rs +++ b/nucleus/src/macros.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ /// Macro similar to [std](https://doc.rust-lang.org/src/std/macros.rs.html) diff --git a/nucleus/src/main.rs b/nucleus/src/main.rs index 84735ea..524b111 100644 --- a/nucleus/src/main.rs +++ b/nucleus/src/main.rs @@ -1,5 +1,6 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ //! Vesper single-address-space exokernel. diff --git a/nucleus/src/qemu.rs b/nucleus/src/qemu.rs index 0229ad2..97771a2 100644 --- a/nucleus/src/qemu.rs +++ b/nucleus/src/qemu.rs @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker + */ pub mod semihosting { #[cfg(test)] pub fn exit_success() { diff --git a/nucleus/src/tests.rs b/nucleus/src/tests.rs index 56e9400..cfcf67c 100644 --- a/nucleus/src/tests.rs +++ b/nucleus/src/tests.rs @@ -1,3 +1,7 @@ +/* + * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker + */ //============================================================================ // Testing environment //============================================================================ diff --git a/nucleus/src/write_to.rs b/nucleus/src/write_to.rs index b8ab529..f80150b 100644 --- a/nucleus/src/write_to.rs +++ b/nucleus/src/write_to.rs @@ -1,6 +1,8 @@ /* * SPDX-License-Identifier: BlueOak-1.0.0 + * Copyright (c) Berkus Decker */ + /// No-alloc write!() implementation from https://stackoverflow.com/a/50201632/145434 /// Requires you to allocate a buffer somewhere manually. // @todo Try to use arrayvec::ArrayString here instead?