From 302d116c2881b3ee97c84144f73f40b3021713ef Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 18 Jan 2025 01:38:13 +0000
Subject: [PATCH] snip
Signed-off-by: Leah Rowe <leah@libreboot.org>
---
README.md | 20 +++++--------------
...t-fam15h-use-new-upstream-for-acpica.patch | 3 ---
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/README.md b/README.md
index be94c2b..c18d827 100644
--- a/README.md
+++ b/README.md
@@ -18,26 +18,16 @@ Strictly speaking, it is a *fork* of Libreboot, but with a twist:
Canoeboot is provided for the purists who absolutely wish to have no proprietary
software of any kind. Regardless of any other firmware that exists outside of it,
the boot flash on your system will be *entirely free software* if you install
-Canoeboot on it. That includes a complete lack of CPU microcode updates, as per
-FSF policy.
+Canoeboot on it. That includes a complete lack of CPU microcode updates.
-More specifically: Canoeboot is engineered to comply with the GNU Free System
-Distribution Guidelines. It has, as of November 2023 releases, been strictly
-audited by FSF licensing staff (Craig Topham lead the audit), and it is listed
-on the FSF's own Free Software Directory.
-
-Libreboot previously complied with that same policy, but changed to a different
-one permitting binary blobs in limited circumstances, so as to support more newer
-machines. Canoeboot is, then, a continuation of the traditional Libreboot
-project prior to that policy change. Some users still want it, so, Canoeboot
-releases are rigoriously maintained, re-basing on newer Libreboot releases over
-time, just like how, say, Trisquel, re-bases itself on each new Ubuntu release.
+This policy is described here:
+<https://canoeboot.org/news/policy.html>
Project goals
=============
- Obviously, support as much hardware as possible (within the limitations
- imposed by GNU FSDG, and using what coreboot happens to have in its source
+ imposed by our policy) and using what coreboot happens to have in its source
tree - Canoeboot also heavily patches coreboot, sometimes adding new
mainboards out-of-tree).
- *Make coreboot easy to use*. Coreboot is notoriously difficult
@@ -66,7 +56,7 @@ Not a coreboot fork!
Canoeboot is not a fork of coreboot. Every so often, the project
re-bases on the latest version of coreboot, by virtue of maintaining sync
-with Libreboot releases (minus un-GNU parts), with the number of custom
+with Libreboot releases (minus unCanoe parts), with the number of custom
patches in use minimized. Tested, *stable* (static) releases are then provided
in Canoeboot, based on specific coreboot revisions.
diff --git a/config/coreboot/fam15h/patches/0007-coreboot-fam15h-use-new-upstream-for-acpica.patch b/config/coreboot/fam15h/patches/0007-coreboot-fam15h-use-new-upstream-for-acpica.patch
index e3606f8..b0e87fa 100644
--- a/config/coreboot/fam15h/patches/0007-coreboot-fam15h-use-new-upstream-for-acpica.patch
+++ b/config/coreboot/fam15h/patches/0007-coreboot-fam15h-use-new-upstream-for-acpica.patch
@@ -8,9 +8,6 @@ the original upstream died
i decided to host it myself, on libreboot rsync,
for use by mirrors.
-this is also useful for GNU Boot, when downloading
-acpica on coreboot 4.11_branch, for fam15h boards
-
this change is not necessary on other coreboot trees,
which adhere to new coreboot policy (newer coreboot
pulls acpica from github, which is fairly reliable)