From 913353ed03cf1df66d9fb7a4ad7e0d49adc30786 Mon Sep 17 00:00:00 2001 From: August Date: Thu, 9 Oct 2025 13:12:54 -0400 Subject: [PATCH] Relicense to MIT --- Cargo.toml | 1 + LICENSE | 19 +++++-------------- README.md | 2 +- src/kernel/arch/aarch64/asm.rs | 2 +- src/kernel/arch/aarch64/mod.rs | 2 +- src/kernel/arch/loongarch64/asm.rs | 2 +- src/kernel/arch/loongarch64/mod.rs | 2 +- src/kernel/arch/mod.rs | 2 +- src/kernel/arch/riscv64/asm.rs | 2 +- src/kernel/arch/riscv64/mod.rs | 2 +- src/kernel/arch/x86_64/asm.rs | 2 +- src/kernel/arch/x86_64/gdt.rs | 2 +- src/kernel/arch/x86_64/interrupts.rs | 2 +- src/kernel/arch/x86_64/mod.rs | 2 +- src/kernel/arch/x86_64/serial.rs | 2 +- src/kernel/boot/mod.rs | 2 +- src/kernel/boot/modules.rs | 2 +- src/kernel/boot/params.rs | 2 +- src/kernel/constants.rs | 2 +- src/kernel/device/acpi.rs | 2 +- src/kernel/device/mod.rs | 2 +- src/kernel/interrupt/mod.rs | 2 +- src/kernel/log.rs | 2 +- src/kernel/main.rs | 2 +- src/kernel/memory.rs | 4 ++-- src/kernel/panic.rs | 2 +- src/kernel/process.rs | 2 +- src/kernel/syscall_runner.rs | 2 +- src/kernel/util.rs | 2 +- src/lib/arch/aarch64/mod.rs | 2 +- src/lib/arch/loongarch64/mod.rs | 2 +- src/lib/arch/mod.rs | 2 +- src/lib/arch/riscv64/mod.rs | 2 +- src/lib/arch/x86_64/mod.rs | 2 +- src/lib/arch/x86_64/syscall_impl.rs | 2 +- src/lib/lib.rs | 2 +- src/lib/registers.rs | 2 +- 37 files changed, 42 insertions(+), 50 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ac45a84..ae22706 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ name = "gila" version = "0.3.1" edition = "2024" +license = "MIT" [dependencies] acid_alloc = { version = "0.1.0", features = ["alloc"] } diff --git a/LICENSE b/LICENSE index b8e973a..4d9b5c1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,18 +1,9 @@ +# License -# GNU Public License v3 +Copyright (c) 2025 shibedrill -Gila - a microkernel OS written in Rust, and inspired by Xinu. -Copyright (C) 2025 shibedrill +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -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 General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index d92acf8..048f9ca 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Information on the build system, repo structure, features, configuration options ## Licensing -Licensed under the GNU Public License v3. See [LICENSE](LICENSE) for details. +Licensed under the MIT License. See [LICENSE](LICENSE) for details. ## Credits diff --git a/src/kernel/arch/aarch64/asm.rs b/src/kernel/arch/aarch64/asm.rs index d763d5a..b07b2fc 100644 --- a/src/kernel/arch/aarch64/asm.rs +++ b/src/kernel/arch/aarch64/asm.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use core::arch::asm; diff --git a/src/kernel/arch/aarch64/mod.rs b/src/kernel/arch/aarch64/mod.rs index 699d211..fbbeca5 100644 --- a/src/kernel/arch/aarch64/mod.rs +++ b/src/kernel/arch/aarch64/mod.rs @@ -1,4 +1,4 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod asm; diff --git a/src/kernel/arch/loongarch64/asm.rs b/src/kernel/arch/loongarch64/asm.rs index eab1ce9..f9afc25 100644 --- a/src/kernel/arch/loongarch64/asm.rs +++ b/src/kernel/arch/loongarch64/asm.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use core::arch::asm; diff --git a/src/kernel/arch/loongarch64/mod.rs b/src/kernel/arch/loongarch64/mod.rs index 699d211..fbbeca5 100644 --- a/src/kernel/arch/loongarch64/mod.rs +++ b/src/kernel/arch/loongarch64/mod.rs @@ -1,4 +1,4 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod asm; diff --git a/src/kernel/arch/mod.rs b/src/kernel/arch/mod.rs index 31ce0c8..edd1e6f 100644 --- a/src/kernel/arch/mod.rs +++ b/src/kernel/arch/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #[cfg(not(any( target_arch = "x86_64", diff --git a/src/kernel/arch/riscv64/asm.rs b/src/kernel/arch/riscv64/asm.rs index 1570968..342e0f7 100644 --- a/src/kernel/arch/riscv64/asm.rs +++ b/src/kernel/arch/riscv64/asm.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use core::arch::asm; diff --git a/src/kernel/arch/riscv64/mod.rs b/src/kernel/arch/riscv64/mod.rs index 699d211..fbbeca5 100644 --- a/src/kernel/arch/riscv64/mod.rs +++ b/src/kernel/arch/riscv64/mod.rs @@ -1,4 +1,4 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod asm; diff --git a/src/kernel/arch/x86_64/asm.rs b/src/kernel/arch/x86_64/asm.rs index 05dbdb6..47a42d6 100644 --- a/src/kernel/arch/x86_64/asm.rs +++ b/src/kernel/arch/x86_64/asm.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub fn nop() { ::x86_64::instructions::nop(); diff --git a/src/kernel/arch/x86_64/gdt.rs b/src/kernel/arch/x86_64/gdt.rs index 74a594a..158b67a 100644 --- a/src/kernel/arch/x86_64/gdt.rs +++ b/src/kernel/arch/x86_64/gdt.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use core::arch::asm; use core::ptr::addr_of_mut; diff --git a/src/kernel/arch/x86_64/interrupts.rs b/src/kernel/arch/x86_64/interrupts.rs index 3a45773..a7bf604 100644 --- a/src/kernel/arch/x86_64/interrupts.rs +++ b/src/kernel/arch/x86_64/interrupts.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::LogLevel; use crate::{LOGGER, format, log_trace}; diff --git a/src/kernel/arch/x86_64/mod.rs b/src/kernel/arch/x86_64/mod.rs index 3b846b7..0270fd4 100644 --- a/src/kernel/arch/x86_64/mod.rs +++ b/src/kernel/arch/x86_64/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod asm; pub mod gdt; diff --git a/src/kernel/arch/x86_64/serial.rs b/src/kernel/arch/x86_64/serial.rs index 029db5b..904a71e 100644 --- a/src/kernel/arch/x86_64/serial.rs +++ b/src/kernel/arch/x86_64/serial.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #![allow(dead_code)] diff --git a/src/kernel/boot/mod.rs b/src/kernel/boot/mod.rs index d8f8ceb..16986c2 100644 --- a/src/kernel/boot/mod.rs +++ b/src/kernel/boot/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod modules; pub mod params; diff --git a/src/kernel/boot/modules.rs b/src/kernel/boot/modules.rs index 788d69d..9d40939 100644 --- a/src/kernel/boot/modules.rs +++ b/src/kernel/boot/modules.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::format; use crate::memory::alloc::string::String; diff --git a/src/kernel/boot/params.rs b/src/kernel/boot/params.rs index 54d5f20..c20fcf4 100644 --- a/src/kernel/boot/params.rs +++ b/src/kernel/boot/params.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::boot::modules::FILE_REQUEST; use crate::memory::alloc; diff --git a/src/kernel/constants.rs b/src/kernel/constants.rs index 18ba5bb..d6d7b31 100644 --- a/src/kernel/constants.rs +++ b/src/kernel/constants.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use enumflags2::{BitFlags, bitflags}; use lazy_static::lazy_static; diff --git a/src/kernel/device/acpi.rs b/src/kernel/device/acpi.rs index 6f82be8..e95733f 100644 --- a/src/kernel/device/acpi.rs +++ b/src/kernel/device/acpi.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT // TODO: Implement per-arch memory handlers for ACPI memory map regions diff --git a/src/kernel/device/mod.rs b/src/kernel/device/mod.rs index 98b0dcf..ee03f32 100644 --- a/src/kernel/device/mod.rs +++ b/src/kernel/device/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #[cfg(feature = "acpi")] mod acpi; diff --git a/src/kernel/interrupt/mod.rs b/src/kernel/interrupt/mod.rs index 6875d83..8b2aa50 100644 --- a/src/kernel/interrupt/mod.rs +++ b/src/kernel/interrupt/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::memory::alloc::string::String; diff --git a/src/kernel/log.rs b/src/kernel/log.rs index 112b946..f7a8e6b 100644 --- a/src/kernel/log.rs +++ b/src/kernel/log.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::constants::LOG_DEFAULT_LEVEL; use crate::format; diff --git a/src/kernel/main.rs b/src/kernel/main.rs index 4dc8ced..9660e9b 100644 --- a/src/kernel/main.rs +++ b/src/kernel/main.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #![no_std] #![no_main] diff --git a/src/kernel/memory.rs b/src/kernel/memory.rs index 4b6a05e..b75b457 100644 --- a/src/kernel/memory.rs +++ b/src/kernel/memory.rs @@ -1,9 +1,9 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::boot::modules::MODULE_RESPONSE; use crate::boot::params::EXECUTABLE_FILE_RESPONSE; -use crate::{LOGGER, LogLevel, format, log_info, log_trace}; +use crate::{LOGGER, LogLevel, format}; use alloc::string::String; use free_list::{AllocError, FreeList, PAGE_SIZE, PageRange}; diff --git a/src/kernel/panic.rs b/src/kernel/panic.rs index fc08dc7..4c773dc 100644 --- a/src/kernel/panic.rs +++ b/src/kernel/panic.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use core::panic::*; diff --git a/src/kernel/process.rs b/src/kernel/process.rs index 3d6ae2c..3e2972c 100644 --- a/src/kernel/process.rs +++ b/src/kernel/process.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT use crate::memory::alloc; use alloc::string::String; diff --git a/src/kernel/syscall_runner.rs b/src/kernel/syscall_runner.rs index 6bb8838..48f8aed 100644 --- a/src/kernel/syscall_runner.rs +++ b/src/kernel/syscall_runner.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #![allow(dead_code)] diff --git a/src/kernel/util.rs b/src/kernel/util.rs index 1211e41..4b7fe45 100644 --- a/src/kernel/util.rs +++ b/src/kernel/util.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT /// Critical section: Mark a section of code as critical. /// Interrupts will be disabled until the section completes. diff --git a/src/lib/arch/aarch64/mod.rs b/src/lib/arch/aarch64/mod.rs index b3313e9..07e4cef 100644 --- a/src/lib/arch/aarch64/mod.rs +++ b/src/lib/arch/aarch64/mod.rs @@ -1,2 +1,2 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT diff --git a/src/lib/arch/loongarch64/mod.rs b/src/lib/arch/loongarch64/mod.rs index b3313e9..07e4cef 100644 --- a/src/lib/arch/loongarch64/mod.rs +++ b/src/lib/arch/loongarch64/mod.rs @@ -1,2 +1,2 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT diff --git a/src/lib/arch/mod.rs b/src/lib/arch/mod.rs index 55133cf..63d160c 100644 --- a/src/lib/arch/mod.rs +++ b/src/lib/arch/mod.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #[cfg(target_arch = "x86_64")] pub mod x86_64; diff --git a/src/lib/arch/riscv64/mod.rs b/src/lib/arch/riscv64/mod.rs index b3313e9..07e4cef 100644 --- a/src/lib/arch/riscv64/mod.rs +++ b/src/lib/arch/riscv64/mod.rs @@ -1,2 +1,2 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT diff --git a/src/lib/arch/x86_64/mod.rs b/src/lib/arch/x86_64/mod.rs index d465cc0..07f786a 100644 --- a/src/lib/arch/x86_64/mod.rs +++ b/src/lib/arch/x86_64/mod.rs @@ -1,4 +1,4 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT pub mod syscall_impl; diff --git a/src/lib/arch/x86_64/syscall_impl.rs b/src/lib/arch/x86_64/syscall_impl.rs index e7dd5bd..3978716 100644 --- a/src/lib/arch/x86_64/syscall_impl.rs +++ b/src/lib/arch/x86_64/syscall_impl.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #![allow(dead_code, unused_variables)] diff --git a/src/lib/lib.rs b/src/lib/lib.rs index cb22907..6c3257f 100644 --- a/src/lib/lib.rs +++ b/src/lib/lib.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT #![no_std] #![allow(unused_imports)] diff --git a/src/lib/registers.rs b/src/lib/registers.rs index 6a2ce23..d5d6d77 100644 --- a/src/lib/registers.rs +++ b/src/lib/registers.rs @@ -1,5 +1,5 @@ // Copyright (c) 2025 shibedrill -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: MIT // Every architecture MUST implement this as part of the ABI. // Additional registers can be implemented with architecture-specific traits.