From 903bb7b7245ead0dcff215c7ea51a6e48c571413 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 4 Jun 2025 16:44:58 +0800 Subject: kbd: upgrade 2.7.1 -> 2.8.0 (From OE-Core rev: 14f3e3c59a503b2c7b8287ad627bca44802a3c4a) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/kbd/kbd_2.7.1.bb | 61 -------------------------------------- meta/recipes-core/kbd/kbd_2.8.0.bb | 61 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-core/kbd/kbd_2.7.1.bb create mode 100644 meta/recipes-core/kbd/kbd_2.8.0.bb diff --git a/meta/recipes-core/kbd/kbd_2.7.1.bb b/meta/recipes-core/kbd/kbd_2.7.1.bb deleted file mode 100644 index 9b9066e7b0..0000000000 --- a/meta/recipes-core/kbd/kbd_2.7.1.bb +++ /dev/null @@ -1,61 +0,0 @@ -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 \ - " - -SRC_URI[sha256sum] = "f167d899d92b56ccf12f6f49355173f93870a95f15d8aeebf5fdcd28a621aca8" - -# 'gzip -n' is set due to https://github.com/legionus/kbd/issues/124 -EXTRA_OECONF = "--disable-tests --enable-compress='gzip -n'" -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" - -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" diff --git a/meta/recipes-core/kbd/kbd_2.8.0.bb b/meta/recipes-core/kbd/kbd_2.8.0.bb new file mode 100644 index 0000000000..ababa09918 --- /dev/null +++ b/meta/recipes-core/kbd/kbd_2.8.0.bb @@ -0,0 +1,61 @@ +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 \ + " + +SRC_URI[sha256sum] = "01f5806da7d1d34f594b7b2a6ae1ab23215344cf1064e8edcd3a90fef9776a11" + +# 'gzip -n' is set due to https://github.com/legionus/kbd/issues/124 +EXTRA_OECONF = "--disable-tests --enable-compress='gzip -n'" +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" + +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" -- cgit v1.2.3-54-g00ecf