43 lines
1.8 KiB
Diff
43 lines
1.8 KiB
Diff
|
From de6e7cc62522ce1be21bd2f06e7c15cd234b5426 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Ax333l <main@axelen.xyz>
|
||
|
|
Date: Thu, 17 Aug 2023 00:00:00 +0000
|
||
|
|
Subject: [PATCH 1/6] Add CC0 license
|
||
|
|
|
||
|
|
Signed-off-by: Nicholas Johnson <nick@nicholasjohnson.ch>
|
||
|
|
---
|
||
|
|
grub-core/kern/dl.c | 3 ++-
|
||
|
|
util/grub-module-verifierXX.c | 3 ++-
|
||
|
|
2 files changed, 4 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
|
||
|
|
index 0bf40caa6..4011e2d15 100644
|
||
|
|
--- a/grub-core/kern/dl.c
|
||
|
|
+++ b/grub-core/kern/dl.c
|
||
|
|
@@ -470,7 +470,8 @@ grub_dl_check_license (grub_dl_t mod, Elf_Ehdr *e)
|
||
|
|
|
||
|
|
if (grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3") == 0
|
||
|
|
|| grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv3+") == 0
|
||
|
|
- || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0)
|
||
|
|
+ || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=GPLv2+") == 0
|
||
|
|
+ || grub_strcmp ((char *) e + s->sh_offset, "LICENSE=CC0") == 0)
|
||
|
|
return GRUB_ERR_NONE;
|
||
|
|
|
||
|
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
||
|
|
diff --git a/util/grub-module-verifierXX.c b/util/grub-module-verifierXX.c
|
||
|
|
index a42c20bd1..7157a30aa 100644
|
||
|
|
--- a/util/grub-module-verifierXX.c
|
||
|
|
+++ b/util/grub-module-verifierXX.c
|
||
|
|
@@ -236,7 +236,8 @@ check_license (const char * const filename,
|
||
|
|
Elf_Shdr *s = find_section (arch, e, ".module_license", module_size);
|
||
|
|
if (s && (strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3") == 0
|
||
|
|
|| strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv3+") == 0
|
||
|
|
- || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0))
|
||
|
|
+ || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=GPLv2+") == 0
|
||
|
|
+ || strcmp ((char *) e + grub_target_to_host(s->sh_offset), "LICENSE=CC0") == 0))
|
||
|
|
return;
|
||
|
|
grub_util_error ("%s: incompatible license", filename);
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.39.2
|
||
|
|
|