kbd: Allow resizecons on x86_64

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

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
new file mode 100644 (file)
index 0000000..1a49846
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd-1.15.2/Allow-resizecons-on-x86_64.patch
@@ -0,0 +1,28 @@
+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_1.15.2.bb
index c5cb66a24cfed12448df58f1cad1a6f40d727140..a150ff1b5492606c533bfb04c6d621f43e944ab1 100644 (file)
--- a/meta/recipes-core/kbd/kbd_1.15.2.bb
+++ b/meta/recipes-core/kbd/kbd_1.15.2.bb
@@ -12,7 +12,8 @@ RCONFLICTS_${PN} = "console-tools"
 
 PR = "r4"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kbd/kbd-1.15.2.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] = "e850eb91e4d3b94b194efe8e953204c5"
 SRC_URI[sha256sum] = "b3602d191eef7a6a8317fc3cd231efa40a89ac235dce57a77cac825a2a21eba6"