summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/kbd
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-10-07 18:14:30 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-18 14:49:58 (GMT)
commit81b08526c00c2d1ce2ccf7429339916ef4bade23 (patch)
tree58a94eff7e6bf8a4617494b4eca6916b80720e30 /meta/recipes-core/kbd
parentf2c4d8022da45259da0f424e8b8709933fb3a862 (diff)
downloadpoky-81b08526c00c2d1ce2ccf7429339916ef4bade23.tar.gz
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>
Diffstat (limited to 'meta/recipes-core/kbd')
-rw-r--r--meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch28
-rw-r--r--meta/recipes-core/kbd/kbd_2.0.0.bb (renamed from meta/recipes-core/kbd/kbd_1.15.2.bb)19
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 1a49846..0000000
--- a/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1Upstream-status: Accepted
2This patch had accepted at kdb-1.5.4
3
4From e069cfa96b41a6714118e15496cdd6b83fc16ad2 Mon Sep 17 00:00:00 2001
5From: Alexey Gladkov <gladkov.alexey@gmail.com>
6Date: Mon, 27 Feb 2012 14:30:50 +0400
7Subject: [PATCH] Allow resizecons on x86_64
8
9Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
10---
11 configure.ac | 1 +
12 1 files changed, 1 insertions(+), 0 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index a8115ed..b58f3bd 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -62,6 +62,7 @@ AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
19
20 case $host_cpu in
21 i?86*) RESIZECONS_PROGS=yes ;;
22+ x86_64*) RESIZECONS_PROGS=yes ;;
23 *) RESIZECONS_PROGS=no ;;
24 esac
25 AM_CONDITIONAL(RESIZECONS_PROGS, test "$RESIZECONS_PROGS" = "yes")
26--
271.7.1
28
diff --git a/meta/recipes-core/kbd/kbd_1.15.2.bb b/meta/recipes-core/kbd/kbd_2.0.0.bb
index a150ff1..eafa0b0 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 @@
1DESCRIPTION = "This package contains keytable files and keyboard utilities" 1DESCRIPTION = "This package contains keytable files and keyboard utilities"
2# everything minus console-fonts is GPLv2+ 2# everything minus console-fonts is GPLv2+
3LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=587ce626d15bd61699a64a6b8a5afefb" 4LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5"
5DEPENDS = "check"
5 6
6inherit autotools gettext 7inherit autotools gettext ptest
7 8
8BBCLASSEXTEND = "native"
9RREPLACES_${PN} = "console-tools" 9RREPLACES_${PN} = "console-tools"
10RPROVIDES_${PN} = "console-tools" 10RPROVIDES_${PN} = "console-tools"
11RCONFLICTS_${PN} = "console-tools" 11RCONFLICTS_${PN} = "console-tools"
12 12
13PR = "r4" 13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2"
14 14
15SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.tar.bz2 \ 15SRC_URI[md5sum] = "1d9bbc36506b8c25740d028b0f6d2839"
16 file://Allow-resizecons-on-x86_64.patch" 16SRC_URI[sha256sum] = "f5eb125d5154bc0fe6f38175de9fcd394879485dadbba75c350d4ab050684a42"
17 17
18SRC_URI[md5sum] = "e850eb91e4d3b94b194efe8e953204c5" 18PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
19SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6" 19PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
20 20
21PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" 21PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
22 22
@@ -27,6 +27,7 @@ FILES_${PN}-unimaps = "${datadir}/unimaps"
27 27
28inherit update-alternatives 28inherit update-alternatives
29 29
30
31ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt" 30ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt"
32ALTERNATIVE_PRIORITY = "100" 31ALTERNATIVE_PRIORITY = "100"
32
33BBCLASSEXTEND = "native"