diff --git a/docs/hardware.md b/docs/hardware.md index c7249dd..5d29ad4 100644 --- a/docs/hardware.md +++ b/docs/hardware.md @@ -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). --- diff --git a/scripts/calculinux-console-font-6x8.sh b/scripts/calculinux-console-font-6x8.sh index 7b81cf7..ae6fa2c 100644 --- a/scripts/calculinux-console-font-6x8.sh +++ b/scripts/calculinux-console-font-6x8.sh @@ -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). diff --git a/scripts/calculinux-console-font.sh b/scripts/calculinux-console-font.sh index da03538..d99eb62 100644 --- a/scripts/calculinux-console-font.sh +++ b/scripts/calculinux-console-font.sh @@ -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