From 5356536190580ece01ff1a9e44227006848dbdaa Mon Sep 17 00:00:00 2001
From: wangmy <wangmy@fujitsu.com>
Date: Mon, 6 Jun 2022 20:27:11 +0800
Subject: kbd: upgrade 2.4.0 -> 2.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

License-Update: Remove extra spaces.

Changelog:
=========
libkfont:
---------
    Make libkfont public library.
    Add kfont_free().
    Initialize kfont_context->options.
    Тake the verbose parameter into account when logging messages.

libkeymap:
---------
    Better error message on unsupported unicode value.

setvtrgb:
--------
    Add hexadecimal file support.

keymaps:
-------
    fa.map: drop high codepoint character that chokes loadkeys.
    i386/neo/3l.map: Add 3l keymap.
    i386/neo: use Delete instead of Backspace.
    i386/qwerty/ie.map: Add Irish keyboard map.
    i386/qwerty/it.map: Add braces to IT keyboard map.
    pine/en.map: Keymap for PinePhone keyboard.
    pt-latin1.map: Add Euro at Portuguese keyboards.

docs:
------
    Fix typos.

po:
-------
    Update translations (from translationproject.org).

(From OE-Core rev: 20808ab018915b07fac23ab310ab0ad0b9e1d1b3)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/kbd/kbd_2.4.0.bb | 46 --------------------------------------
 meta/recipes-core/kbd/kbd_2.5.0.bb | 46 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 46 deletions(-)
 delete mode 100644 meta/recipes-core/kbd/kbd_2.4.0.bb
 create mode 100644 meta/recipes-core/kbd/kbd_2.5.0.bb

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 4b23f1a89d..0000000000
--- a/meta/recipes-core/kbd/kbd_2.4.0.bb
+++ /dev/null
@@ -1,46 +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."
-# everything minus console-fonts is GPL-2.0-or-later
-LICENSE = "GPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
-
-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] = "55f0740458cfd3a84e775e50d7e8b92dc01846db1edad8e2411ccc293ece9b9f"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
-                  "
-
-PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
-
-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"
-
-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.5.0.bb b/meta/recipes-core/kbd/kbd_2.5.0.bb
new file mode 100644
index 0000000000..c0317a5d84
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd_2.5.0.bb
@@ -0,0 +1,46 @@
+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."
+# everything minus console-fonts is GPL-2.0-or-later
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+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] = "ad95964a4dede55f9239dd63b455fa4498cf3db3a0075ccd1d65a9f0e622a0fd"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
+                  "
+
+PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
+
+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"
+
+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