Skip to contentSkip to conversation

kbd: package some fonts as restricted

PATCH In review Randy MacLeod 3 participants 4 messages Oct 18, 2022 – Oct 22, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbd: package some fonts as restricted

The distribution terms of the Agafari fonts as described in data/consolefonts/README.Ethiopic is:

Agafari:
Donated by the Ethiopian Science and Technology Commission <[email protected]> or <[email protected]> and may be redistributed for non-commercial use under Unix environments only.

so package them seperately to make it easier for affected users to avoid installing the fonts.

---
 meta/recipes-core/kbd/kbd_2.5.1.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/kbd/kbd_2.5.1.bb +4 -2
index aa3ab6e121..8822cdbef4 100644
@@ -23,9 +23,11 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
 
 PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 
-PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+PACKAGES += "${PN}-consolefonts ${PN}-consolefonts-restricted ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
 
-FILES:${PN}-consolefonts = "${datadir}/consolefonts"
+# Package some fonts as restricted, see README.Ethiopic
+FILES:${PN}-consolefonts = "${datadir}/consolefonts/[a-zB-Z0-9]*"
+FILES:${PN}-consolefonts-restricted = "${datadir}/consolefonts/Agafari*"
 FILES:${PN}-consoletrans = "${datadir}/consoletrans"
 FILES:${PN}-keymaps = "${datadir}/keymaps"
 FILES:${PN}-unimaps = "${datadir}/unimaps"
Signature · 1 line
2.34.1
#1 lore raw
Quoted 11 lines · Randy MacLeod via lists.openembedded.org

The distribution terms of the Agafari fonts as described in data/consolefonts/README.Ethiopic is:

Agafari:
Donated by the Ethiopian Science and Technology Commission <[email protected]> or <[email protected]> and may be redistributed for non-commercial use under Unix environments only.

so package them seperately to make it easier for affected users to avoid installing the fonts.

Looks like you need special per-package LICENSE variables set to people can identify this programatically.

Ross

#2 lore raw
Quoted 4 lines · Ross Burton
Quoted 3 lines · Randy MacLeod via lists.openembedded.org

The distribution terms of the Agafari fonts as described in data/consolefonts/README.Ethiopic is:

Quoted 8 lines
Quoted 7 lines

Agafari:
Donated by the Ethiopian Science and Technology Commission <[email protected]> or <[email protected]> and may be redistributed for non-commercial use under Unix environments only.

so package them seperately to make it easier for affected users to avoid installing the fonts.

Looks like you need special per-package LICENSE variables set to people can identify this programatically.

Indeed.

v2 will show up at some point, maybe even this week.

../Randy

Quoted 2 lines

Ross

Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#3 lore raw
In reply to Randy MacLeod
Quoted 27 lines

-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Randy MacLeod
Sent: den 18 oktober 2022 02:14
To: [email protected]
Subject: [OE-core] [PATCH] kbd: package some fonts as restricted

The distribution terms of the Agafari fonts as described in data/consolefonts/README.Ethiopic is:

Agafari:
Donated by the Ethiopian Science and Technology Commission <[email protected]> or <[email protected]> and may be redistributed for non-commercial use under Unix environments only.

so package them seperately to make it easier for affected users to avoid installing the fonts.

---
 meta/recipes-core/kbd/kbd_2.5.1.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/kbd/kbd_2.5.1.bb +0 -0
index aa3ab6e121..8822cdbef4 100644

meta/recipes-core/kbd/kbd_2.5.1.bb PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', · line 30

Quoted 10 lines
meta/recipes-core/kbd/kbd_2.5.1.bb +3 -2
@@ -23,9 +23,11 @@ PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES',
 'pam', d)} \
 
 PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 
-PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
+PACKAGES += "${PN}-consolefonts ${PN}-consolefonts-restricted ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
 
-FILES:${PN}-consolefonts = "${datadir}/consolefonts"
+# Package some fonts as restricted, see README.Ethiopic
+FILES:${PN}-consolefonts = "${datadir}/consolefonts/[a-zB-Z0-9]*"

Rather than that pretty odd pattern, I recommend to change PACKAGES so that ${PN}-consolefonts-restricted comes before "${PN}-consolefonts:

PACKAGES += "${PN}-consolefonts-restricted ${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"

The you can leave FILES:${PN}-consolefonts as it was:

FILES:${PN}-consolefonts = "${datadir}/consolefonts"

Quoted 6 lines
meta/recipes-core/kbd/kbd_2.5.1.bb +1 -0
+FILES:${PN}-consolefonts-restricted = "${datadir}/consolefonts/Agafari*"
 FILES:${PN}-consoletrans = "${datadir}/consoletrans"
 FILES:${PN}-keymaps = "${datadir}/keymaps"

FILES:${PN}-unimaps = "${datadir}/unimaps"
--
2.34.1

//Peter