kbd: Update to 2.0.0

Removed patch that is now included upstream, add DEPENDS on check since it
is now used to create. Additional added PACKAGECONFIG for PAM and --disbale-vlock

License checksum updated to reflect additional Copyright owners names.

(From OE-Core rev: 48621dc693b5f63419e042ab5dd21ea12ce05f67)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 10 insertions, 37 deletions

diff --git a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch b/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
deleted file mode 100644
index 1a49846972..0000000000
--- a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-status: Accepted
-This patch had accepted at kdb-1.5.4
-
-From e069cfa96b41a6714118e15496cdd6b83fc16ad2 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Mon, 27 Feb 2012 14:30:50 +0400
-Subject: [PATCH] Allow resizecons on x86_64
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- configure.ac |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index a8115ed..b58f3bd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,6 +62,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
- 
- case $host_cpu in
-        i?86*) RESIZECONS_PROGS=yes ;;
-+       x86_64*) RESIZECONS_PROGS=yes ;;
-        *)     RESIZECONS_PROGS=no ;;
- esac
- AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
--- 
-1.7.1
-
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_2.0.0.bb
index a150ff1b54..eafa0b0d03 100644
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.0.bb
@@ -1,22 +1,22 @@
 DESCRIPTION = "This package contains keytable files and keyboard utilities"
 # everything minus console-fonts is GPLv2+
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5"
+DEPENDS = "check"
 
-inherit autotools gettext
+inherit autotools gettext ptest
 
-BBCLASSEXTEND = "native"
 RREPLACES_${PN} = "console-tools"
 RPROVIDES_${PN} = "console-tools"
 RCONFLICTS_${PN} = "console-tools"
 
-PR = "r4"
+SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 \
-           file://Allow-resizecons-on-x86_64.patch"
+SRC_URI[md5sum] = "1d9bbc36506b8c25740d028b0f6d2839"
+SRC_URI[sha256sum] = "f5eb125d5154bc0fe6f38175de9fcd394879485dadbba75c350d4ab050684a42"
 
-SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5"
-SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"
+PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 
 PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
 
@@ -27,6 +27,7 @@ FILES_${PN}-unimaps = "${datadir}/unimaps"
 
 inherit update-alternatives
 
-
 ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
 ALTERNATIVE_PRIORITY = "100"
+
+BBCLASSEXTEND = "native"