The shared font generator is offered under GPL-2.0-only too, so the 6x8 script may run it

The GPL-2.0-only 6x8 script executes the generator block out of the Apache-2.0 6x12 script, and GPLv2 and Apache-2.0 do not mix inside one program. Both files are the author's, so the block between the BEGIN/END markers is additionally available under GPL-2.0-only for that use; both headers and the hardware manual say so. No code changes.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
Jean-Pierre MartineauandClaude Fable 5.1 committed 2026-09-13 13:09:18 -04:00
1 parent d078e2379f
commit f16a7c4738
3 files changed
+8 -4

No files matched your search

+4 -2
View File
@@ -114,8 +114,10 @@ font: the script and the inventory move in the same commit or the test fails.
> bundles it and never redistributes it; it names a path on the console's own filesystem.
> The two scripts share one copy of the donor, alias and keeper tables — the 6×8 one reads
> them out of the 6×12 one, between its `shared generator` marker lines — so a glyph added
> in one place lands in both fonts. The XIAO firmware patch and builder reference MeshCore,
> which is under the MIT License — see [`scripts/xiao-radio/LICENSE.MeshCore`](../scripts/xiao-radio/LICENSE.MeshCore).
> in one place lands in both fonts. To permit this sharing, the shared generator block in
> the 6×12 script (Apache-2.0) is additionally offered under GPL-2.0-only by its source
> file. The XIAO firmware patch and builder reference MeshCore, which is under the MIT
> License — see [`scripts/xiao-radio/LICENSE.MeshCore`](../scripts/xiao-radio/LICENSE.MeshCore).
---
+2 -1
View File
@@ -18,7 +18,8 @@
# calculinux-console-font.sh (Apache-2.0), between its "shared generator (BEGIN)" and
# "(END)" marker lines, and exec'd -- so the two fonts can never drift, and a repo test
# that parses those tables has exactly one file to parse. That file must sit beside this
# one; point SHARED at it if it does not.
# one; point SHARED at it if it does not. The shared generator is additionally offered
# under GPL-2.0-only by its source file, permitting its extraction and use here.
#
# WHAT IS ONLY HERE. The GPL-2.0 base bitmap, its CP437 unicode mapping, and the same 18
# marks redrawn for the shorter cell (MARKS8).
+2 -1
View File
@@ -23,7 +23,8 @@
# clearly marked file is the point of the split. The two scripts share ONE copy of the
# donor / alias / keeper tables and the whole generator -- the block between the
# "shared generator" markers below, which the 6x8 script extracts from this file and execs.
# Edit those tables here and both fonts move together.
# Edit those tables here and both fonts move together. The shared generator block is
# additionally offered under GPL-2.0-only, to permit its use by calculinux-console-font-6x8.sh.
#
# Both fonts install into /usr/share/consolefonts. Flip live with
# `setfont /usr/share/consolefonts/meshterm8.psf.gz` (and back with meshterm.psf.gz), or