diff options
Diffstat (limited to 'meta/recipes-core/kbd')
-rw-r--r-- | meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch | 73 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.4.0.bb | 46 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.6.4.bb | 67 |
3 files changed, 140 insertions, 46 deletions
diff --git a/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch new file mode 100644 index 0000000000..de279b55f9 --- /dev/null +++ b/meta/recipes-core/kbd/kbd/0001-Remove-non-free-Agafari-fonts.patch | |||
@@ -0,0 +1,73 @@ | |||
1 | From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexey Gladkov <legion@kernel.org> | ||
3 | Date: Thu, 29 Feb 2024 17:38:37 +0100 | ||
4 | Subject: [PATCH] Remove non-free Agafari fonts | ||
5 | |||
6 | Based on legal analysis, we are removing non-free fonts for now. If we | ||
7 | can change the license of these fonts, we will return them back. | ||
8 | |||
9 | From: Stanislav Brabec <sbrabec@suse.com> | ||
10 | Date: Wed, 28 Feb 2024 16:47:54 +0100 | ||
11 | Subject: kbd: Legal problems of Agafari fonts | ||
12 | |||
13 | The data/consolefonts/README.Ethiopic contains a notice: | ||
14 | Agafari: | ||
15 | Donated by the Ethiopian Science and Technology Commission | ||
16 | <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed | ||
17 | for non-commercial use under Unix environments only. | ||
18 | |||
19 | According to our legal review, it makes impossible to distribute these | ||
20 | fonts as part of any commercial products, and even makes it impossible to | ||
21 | distribute kbd sources as part of any commercial product services. | ||
22 | |||
23 | Additionally, it makes the whole kbd package incompatible with GPL, so the | ||
24 | COPYING file (created during build of the tarball) cannot declare GPL | ||
25 | version 2. It also violates section 6 of GPL (no further restrictions). | ||
26 | |||
27 | That is why several GNU/Linux distributions exclude Agafari from the | ||
28 | release. To be on a safe side, SUSE even decided to repack any source | ||
29 | tarballs before putting it to their servers. | ||
30 | |||
31 | This was probably reported to the former kbd maintainer about 20 years ago, | ||
32 | but nothing changed over years. | ||
33 | |||
34 | That is why I recommend removing Agafari fonts and removing the reference | ||
35 | to them from README.Ethiopic. Alternatively, you can ask the Ethiopian | ||
36 | Science and Technology Commission for re-licensing. | ||
37 | |||
38 | Signed-off-by: Alexey Gladkov <legion@kernel.org> | ||
39 | |||
40 | Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee] | ||
41 | |||
42 | [do_configure prepend added to remove binary files] | ||
43 | |||
44 | Signed-off-by: Peter Marko <peter.marko@siemens.com> | ||
45 | --- | ||
46 | data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes | ||
47 | data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes | ||
48 | data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes | ||
49 | data/consolefonts/README.Ethiopic | 5 ----- | ||
50 | 4 files changed, 5 deletions(-) | ||
51 | delete mode 100644 data/consolefonts/Agafari-12.psfu | ||
52 | delete mode 100644 data/consolefonts/Agafari-14.psfu | ||
53 | delete mode 100644 data/consolefonts/Agafari-16.psfu | ||
54 | |||
55 | diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic | ||
56 | index 7502722..2810797 100644 | ||
57 | --- a/data/consolefonts/README.Ethiopic | ||
58 | +++ b/data/consolefonts/README.Ethiopic | ||
59 | @@ -14,11 +14,6 @@ Ethiopic fonts: | ||
60 | restrictions below: | ||
61 | |||
62 | |||
63 | -Agafari: | ||
64 | - Donated by the Ethiopian Science and Technology Commission | ||
65 | - <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed | ||
66 | - for non-commercial use under Unix environments only. | ||
67 | - | ||
68 | Goha and GohaClassic: | ||
69 | Donated by Yitna Firdyiwek <ybf2u@virgina.edu> of GohaTibeb Associates | ||
70 | and may be redistributed without restriction under the GNU GPL 2.0. | ||
71 | -- | ||
72 | 2.30.2 | ||
73 | |||
diff --git a/meta/recipes-core/kbd/kbd_2.4.0.bb b/meta/recipes-core/kbd/kbd_2.4.0.bb deleted file mode 100644 index b557d691b5..0000000000 --- a/meta/recipes-core/kbd/kbd_2.4.0.bb +++ /dev/null | |||
@@ -1,46 +0,0 @@ | |||
1 | SUMMARY = "Keytable files and keyboard utilities" | ||
2 | HOMEPAGE = "http://www.kbd-project.org/" | ||
3 | DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." | ||
4 | # everything minus console-fonts is GPLv2+ | ||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" | ||
7 | |||
8 | inherit autotools gettext pkgconfig | ||
9 | |||
10 | DEPENDS += "flex-native" | ||
11 | |||
12 | RREPLACES_${PN} = "console-tools" | ||
13 | RPROVIDES_${PN} = "console-tools" | ||
14 | RCONFLICTS_${PN} = "console-tools" | ||
15 | |||
16 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | ||
17 | " | ||
18 | |||
19 | SRC_URI[sha256sum] = "55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f" | ||
20 | |||
21 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | ||
22 | " | ||
23 | |||
24 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | ||
25 | |||
26 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" | ||
27 | |||
28 | FILES_${PN}-consolefonts = "${datadir}/consolefonts" | ||
29 | FILES_${PN}-consoletrans = "${datadir}/consoletrans" | ||
30 | FILES_${PN}-keymaps = "${datadir}/keymaps" | ||
31 | FILES_${PN}-unimaps = "${datadir}/unimaps" | ||
32 | |||
33 | do_install_append () { | ||
34 | if [ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', '', d)} = yes ] \ | ||
35 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then | ||
36 | mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd | ||
37 | fi | ||
38 | } | ||
39 | |||
40 | inherit update-alternatives | ||
41 | |||
42 | ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey \ | ||
43 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" | ||
44 | ALTERNATIVE_PRIORITY = "100" | ||
45 | |||
46 | BBCLASSEXTEND = "native" | ||
diff --git a/meta/recipes-core/kbd/kbd_2.6.4.bb b/meta/recipes-core/kbd/kbd_2.6.4.bb new file mode 100644 index 0000000000..2331b51e59 --- /dev/null +++ b/meta/recipes-core/kbd/kbd_2.6.4.bb | |||
@@ -0,0 +1,67 @@ | |||
1 | SUMMARY = "Keytable files and keyboard utilities" | ||
2 | HOMEPAGE = "http://www.kbd-project.org/" | ||
3 | DESCRIPTION = "The kbd project contains tools for managing Linux console (Linux console, virtual terminals, keyboard, etc.) – mainly, what they do is loading console fonts and keyboard maps." | ||
4 | |||
5 | # consolefonts and keymaps contain also some public domain and author notice licenses | ||
6 | LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-or-later" | ||
7 | LIC_FILES_CHKSUM = " \ | ||
8 | file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
9 | file://data/keymaps/pine/en.map;beginline=2;endline=15;md5=20914a59c0546a7b77ebf959bc88ad5d \ | ||
10 | " | ||
11 | LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later" | ||
12 | LICENSE:${PN}-consolefonts = "GPL-2.0-or-later" | ||
13 | LICENSE:${PN}-consoletrans = "GPL-2.0-or-later" | ||
14 | LICENSE:${PN}-keymaps-pine = "GPL-3.0-or-later" | ||
15 | LICENSE:${PN}-keymaps = "GPL-2.0-or-later" | ||
16 | LICENSE:${PN}-unimaps = "GPL-2.0-or-later" | ||
17 | |||
18 | inherit autotools gettext pkgconfig | ||
19 | |||
20 | DEPENDS += "flex-native" | ||
21 | |||
22 | RREPLACES:${PN} = "console-tools" | ||
23 | RPROVIDES:${PN} = "console-tools" | ||
24 | RCONFLICTS:${PN} = "console-tools" | ||
25 | |||
26 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | ||
27 | file://0001-Remove-non-free-Agafari-fonts.patch \ | ||
28 | " | ||
29 | |||
30 | SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" | ||
31 | |||
32 | EXTRA_OECONF = "--disable-tests" | ||
33 | PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ | ||
34 | " | ||
35 | |||
36 | PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," | ||
37 | |||
38 | PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" | ||
39 | |||
40 | FILES:${PN}-consolefonts = "${datadir}/consolefonts" | ||
41 | FILES:${PN}-consoletrans = "${datadir}/consoletrans" | ||
42 | FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine" | ||
43 | FILES:${PN}-keymaps = "${datadir}/keymaps" | ||
44 | FILES:${PN}-unimaps = "${datadir}/unimaps" | ||
45 | |||
46 | RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" | ||
47 | |||
48 | # remove this when upgrading to newer version which has integrated | ||
49 | # https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee | ||
50 | do_configure:prepend() { | ||
51 | rm -rf ${S}/data/consolefonts/Agafari-1* | ||
52 | } | ||
53 | |||
54 | do_install:append () { | ||
55 | if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ | ||
56 | && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then | ||
57 | mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd | ||
58 | fi | ||
59 | } | ||
60 | |||
61 | inherit update-alternatives | ||
62 | |||
63 | ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \ | ||
64 | ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" | ||
65 | ALTERNATIVE_PRIORITY = "100" | ||
66 | |||
67 | BBCLASSEXTEND = "native" | ||