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/run-ptest | 4 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch | 56 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.0.4.bb | 64 | ||||
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.6.4.bb | 67 |
5 files changed, 140 insertions, 124 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 @@ +From b757e6842f9631757f0d1a6b3833aabffa9ffeee Mon Sep 17 00:00:00 2001 +From: Alexey Gladkov <legion@kernel.org> +Date: Thu, 29 Feb 2024 17:38:37 +0100 +Subject: [PATCH] Remove non-free Agafari fonts + +Based on legal analysis, we are removing non-free fonts for now. If we +can change the license of these fonts, we will return them back. + +From: Stanislav Brabec <sbrabec@suse.com> +Date: Wed, 28 Feb 2024 16:47:54 +0100 +Subject: kbd: Legal problems of Agafari fonts + + The data/consolefonts/README.Ethiopic contains a notice: + Agafari: + Donated by the Ethiopian Science and Technology Commission + <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed + for non-commercial use under Unix environments only. + + According to our legal review, it makes impossible to distribute these + fonts as part of any commercial products, and even makes it impossible to + distribute kbd sources as part of any commercial product services. + + Additionally, it makes the whole kbd package incompatible with GPL, so the + COPYING file (created during build of the tarball) cannot declare GPL + version 2. It also violates section 6 of GPL (no further restrictions). + + That is why several GNU/Linux distributions exclude Agafari from the + release. To be on a safe side, SUSE even decided to repack any source + tarballs before putting it to their servers. + + This was probably reported to the former kbd maintainer about 20 years ago, + but nothing changed over years. + + That is why I recommend removing Agafari fonts and removing the reference + to them from README.Ethiopic. Alternatively, you can ask the Ethiopian + Science and Technology Commission for re-licensing. + +Signed-off-by: Alexey Gladkov <legion@kernel.org> + +Upstream-Status: Backport [https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee] + +[do_configure prepend added to remove binary files] + +Signed-off-by: Peter Marko <peter.marko@siemens.com> +--- + data/consolefonts/Agafari-12.psfu | Bin 7989 -> 0 bytes + data/consolefonts/Agafari-14.psfu | Bin 9013 -> 0 bytes + data/consolefonts/Agafari-16.psfu | Bin 10037 -> 0 bytes + data/consolefonts/README.Ethiopic | 5 ----- + 4 files changed, 5 deletions(-) + delete mode 100644 data/consolefonts/Agafari-12.psfu + delete mode 100644 data/consolefonts/Agafari-14.psfu + delete mode 100644 data/consolefonts/Agafari-16.psfu + +diff --git a/data/consolefonts/README.Ethiopic b/data/consolefonts/README.Ethiopic +index 7502722..2810797 100644 +--- a/data/consolefonts/README.Ethiopic ++++ b/data/consolefonts/README.Ethiopic +@@ -14,11 +14,6 @@ Ethiopic fonts: + restrictions below: + + +-Agafari: +- Donated by the Ethiopian Science and Technology Commission +- <ncic@padis.gn.apc.org> or <ncic@telecom.net.et> and may be redistributed +- for non-commercial use under Unix environments only. +- + Goha and GohaClassic: + Donated by Yitna Firdyiwek <ybf2u@virgina.edu> of GohaTibeb Associates + and may be redistributed without restriction under the GNU GPL 2.0. +-- +2.30.2 + diff --git a/meta/recipes-core/kbd/kbd/run-ptest b/meta/recipes-core/kbd/kbd/run-ptest deleted file mode 100644 index 7a2d205f54..0000000000 --- a/meta/recipes-core/kbd/kbd/run-ptest +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -CURDIR=$(dirname `readlink -f $0`) -make -k -C ${CURDIR}/tests check-TESTS diff --git a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch deleted file mode 100644 index a9a3ab8abf..0000000000 --- a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -kbd is out of source built, then the value of $(srcdir) is relative path of -${S}/tests to ${B}/tests. Macro DATADIR is defined with $(srcdir) and replaced -in .c files by compiler, and string @DATADIR@ is replaced with $(srdir) by rule -"%: %.in" in Makefile. - -But kbd-ptest puts test cases and resource files in same directory, then some -ptest cases fail to find resources. - -Replace DATADIR and @DATADIR@ with current directory(dot) to make test cases -run as expected. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - -Index: kbd-2.0.4/tests/Makefile.am -=================================================================== ---- kbd-2.0.4.orig/tests/Makefile.am -+++ kbd-2.0.4/tests/Makefile.am -@@ -1,7 +1,7 @@ - AM_CPPFLAGS = \ - -I$(srcdir)/../src/libkeymap \ - -I$(builddir)/../src/libkeymap \ -- -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" -+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" - - AM_CFLAGS = $(CHECK_CFLAGS) - LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ -Index: kbd-2.0.4/tests/alt-is-meta.in -=================================================================== ---- kbd-2.0.4.orig/tests/alt-is-meta.in -+++ kbd-2.0.4/tests/alt-is-meta.in -@@ -7,8 +7,8 @@ cd "$cwd" - rc=0 - temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" - --./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$? --cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$? -+./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$? -+cmp -s "./alt-is-meta.output" "$temp" || rc=$? - - if [ "$rc" != 0 ]; then - printf 'failed\n' -Index: kbd-2.0.4/tests/dumpkeys-fulltable.in -=================================================================== ---- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in -+++ kbd-2.0.4/tests/dumpkeys-fulltable.in -@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" - cd "$cwd" - - BUILDDIR="@BUILDDIR@" --DATADIR="@DATADIR@" -+DATADIR="." - - check_keymap() { - local kmap temp rc diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.0.4.bb deleted file mode 100644 index 4af3256fff..0000000000 --- a/meta/recipes-core/kbd/kbd_2.0.4.bb +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Keytable files and keyboard utilities" -HOMEPAGE = "http://www.kbd-project.org/" -# everything minus console-fonts is GPLv2+ -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" - -inherit autotools gettext ptest pkgconfig - -RREPLACES_${PN} = "console-tools" -RPROVIDES_${PN} = "console-tools" -RCONFLICTS_${PN} = "console-tools" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ - file://run-ptest \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ - " - -SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" -SRC_URI[sha256sum] = "5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)} \ - " - -PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," -PACKAGECONFIG[tests] = "--enable-tests, --disable-tests, libcheck" - -do_compile_ptest() { - oe_runmake -C ${B}/tests dumpkeys-fulltable alt-is-meta -} - -do_install_ptest() { - install -D ${B}/tests/Makefile ${D}${PTEST_PATH}/tests/Makefile - sed -i -e '/Makefile:/,/^$/d' -e '/%: %.in/,/^$/d' \ - -e 's:--sysroot=${STAGING_DIR_TARGET}::g' \ - -e 's:${DEBUG_PREFIX_MAP}::g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${RECIPE_SYSROOT}::g' \ - -e 's:${S}/config/missing::g' \ - -e 's:${WORKDIR}::g' \ - -e '/libkeymap_.*_SOURCES =/d' -e '/$(EXEEXT):/,/^$/d' ${D}${PTEST_PATH}/tests/Makefile - - find ${B}/tests -executable -exec install {} ${D}${PTEST_PATH}/tests \; - find ${S}/tests \( -name \*.map -o -name \*.bin -o -name \*.output \) -exec install {} ${D}${PTEST_PATH}/tests \; - - install -D -m 755 ${S}/config/test-driver ${D}${PTEST_PATH}/config/test-driver -} - -PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" - -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-keymaps = "${datadir}/keymaps" -FILES_${PN}-unimaps = "${datadir}/unimaps" - -RDEPENDS_${PN}-ptest = "make" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt showkey" -ALTERNATIVE_PRIORITY = "100" - -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 @@ +SUMMARY = "Keytable files and keyboard utilities" +HOMEPAGE = "http://www.kbd-project.org/" +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." + +# consolefonts and keymaps contain also some public domain and author notice licenses +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later & GPL-3.0-or-later" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://data/keymaps/pine/en.map;beginline=2;endline=15;md5=20914a59c0546a7b77ebf959bc88ad5d \ +" +LICENSE:${PN} = "GPL-2.0-or-later & LGPL-2.0-or-later" +LICENSE:${PN}-consolefonts = "GPL-2.0-or-later" +LICENSE:${PN}-consoletrans = "GPL-2.0-or-later" +LICENSE:${PN}-keymaps-pine = "GPL-3.0-or-later" +LICENSE:${PN}-keymaps = "GPL-2.0-or-later" +LICENSE:${PN}-unimaps = "GPL-2.0-or-later" + +inherit autotools gettext pkgconfig + +DEPENDS += "flex-native" + +RREPLACES:${PN} = "console-tools" +RPROVIDES:${PN} = "console-tools" +RCONFLICTS:${PN} = "console-tools" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ + file://0001-Remove-non-free-Agafari-fonts.patch \ + " + +SRC_URI[sha256sum] = "519f8d087aecca7e0a33cd084bef92c066eb19731666653dcc70c9d71aa40926" + +EXTRA_OECONF = "--disable-tests" +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ + " + +PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," + +PACKAGES += "${PN}-consolefonts ${PN}-keymaps-pine ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" + +FILES:${PN}-consolefonts = "${datadir}/consolefonts" +FILES:${PN}-consoletrans = "${datadir}/consoletrans" +FILES:${PN}-keymaps-pine = "${datadir}/keymaps/pine" +FILES:${PN}-keymaps = "${datadir}/keymaps" +FILES:${PN}-unimaps = "${datadir}/unimaps" + +RRECOMMENDS:${PN}-keymaps = "${PN}-keymaps-pine" + +# remove this when upgrading to newer version which has integrated +# https://github.com/legionus/kbd/commit/b757e6842f9631757f0d1a6b3833aabffa9ffeee +do_configure:prepend() { + rm -rf ${S}/data/consolefonts/Agafari-1* +} + +do_install:append () { + if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)}" = "yes" ] \ + && [ -f ${D}${sysconfdir}/pam.d/vlock ]; then + mv -f ${D}${sysconfdir}/pam.d/vlock ${D}${sysconfdir}/pam.d/vlock.kbd + fi +} + +inherit update-alternatives + +ALTERNATIVE:${PN} = "chvt deallocvt fgconsole openvt showkey \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'vlock','', d)}" +ALTERNATIVE_PRIORITY = "100" + +BBCLASSEXTEND = "native" |