summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-05 16:43:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-09 12:00:42 +0000
commit7c8a6cbf42271442189e463e9f8772521b4f263d (patch)
tree52710c090fa5a2d5e72804878a07798762121ad3 /meta/recipes-core
parent491aac8f8f46bd5501203fef57e33f3ed871555c (diff)
downloadpoky-7c8a6cbf42271442189e463e9f8772521b4f263d.tar.gz
kbd: update to 2.2.0
Rebase set-proper-path-of-resources.patch Add a patch to address a string format error; as it modifies a .l file, add a dependency on flex which is processing that into C source code. License-Update: file with copyright statements was replaced with original GPLv2 text (From OE-Core rev: 729ac34dce472378cec5447c366a28de2081e7de) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch24
-rw-r--r--meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch57
-rw-r--r--meta/recipes-core/kbd/kbd_2.2.0.bb (renamed from meta/recipes-core/kbd/kbd_2.0.4.bb)11
3 files changed, 66 insertions, 26 deletions
diff --git a/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch b/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch
new file mode 100644
index 0000000000..8916fd9f5e
--- /dev/null
+++ b/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch
@@ -0,0 +1,24 @@
1From dc6bf2ae0835c6569b270e8e1f26a3173f3927d9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 4 Dec 2019 13:14:01 +0100
4Subject: [PATCH] analyze.l: add missing string format
5
6Upstream-Status: Submitted [https://github.com/legionus/kbd/pull/35]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 src/libkeymap/analyze.l | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l
13index e32ace6..de62f46 100644
14--- a/src/libkeymap/analyze.l
15+++ b/src/libkeymap/analyze.l
16@@ -463,7 +463,7 @@ To to|To|TO
17
18 strerror_r(errno, buf, sizeof(buf));
19
20- ERR(yyextra, buf);
21+ ERR(yyextra, "%s", buf);
22 return(ERROR);
23 }
24
diff --git a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
index a9a3ab8abf..5872cef36b 100644
--- a/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
+++ b/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch
@@ -1,3 +1,8 @@
1From 7f953dd689155bc1224a3369205c310bb5b760a7 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Fri, 30 Sep 2016 16:49:55 +0800
4Subject: [PATCH] kbd: create ptest sub-package
5
1Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
2 7
3kbd is out of source built, then the value of $(srcdir) is relative path of 8kbd is out of source built, then the value of $(srcdir) is relative path of
@@ -13,38 +18,46 @@ run as expected.
13 18
14Signed-off-by: Kai Kang <kai.kang@windriver.com> 19Signed-off-by: Kai Kang <kai.kang@windriver.com>
15 20
16Index: kbd-2.0.4/tests/Makefile.am 21---
17=================================================================== 22 tests/Makefile.am | 2 +-
18--- kbd-2.0.4.orig/tests/Makefile.am 23 tests/alt-is-meta.in | 6 ++----
19+++ kbd-2.0.4/tests/Makefile.am 24 tests/dumpkeys-fulltable.in | 2 +-
20@@ -1,7 +1,7 @@ 25 3 files changed, 4 insertions(+), 6 deletions(-)
21 AM_CPPFLAGS = \ 26
22 -I$(srcdir)/../src/libkeymap \ 27diff --git a/tests/Makefile.am b/tests/Makefile.am
28index f32b9aa..973cd26 100644
29--- a/tests/Makefile.am
30+++ b/tests/Makefile.am
31@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
23 -I$(builddir)/../src/libkeymap \ 32 -I$(builddir)/../src/libkeymap \
24- -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" 33 -I$(srcdir)/../src/libkbdfile \
25+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" 34 -I$(builddir)/../src/libkbdfile \
35- -DDATADIR=\"$(srcdir)\" \
36+ -DDATADIR=\".\" \
37 -DABS_DATADIR=\"$(realpath $(srcdir))\" \
38 -DBUILDDIR=\"$(builddir)\"
26 39
27 AM_CFLAGS = $(CHECK_CFLAGS) 40diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in
28 LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ 41index 3a1441f..772fb51 100755
29Index: kbd-2.0.4/tests/alt-is-meta.in 42--- a/tests/alt-is-meta.in
30=================================================================== 43+++ b/tests/alt-is-meta.in
31--- kbd-2.0.4.orig/tests/alt-is-meta.in 44@@ -7,10 +7,8 @@ cd "$cwd"
32+++ kbd-2.0.4/tests/alt-is-meta.in
33@@ -7,8 +7,8 @@ cd "$cwd"
34 rc=0 45 rc=0
35 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" 46 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
36 47
37-./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$? 48-datadir="@DATADIR@/data/alt-is-meta"
38-cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$? 49-
50-./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$?
51-cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$?
39+./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$? 52+./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$?
40+cmp -s "./alt-is-meta.output" "$temp" || rc=$? 53+cmp -s "./alt-is-meta.output" "$temp" || rc=$?
41 54
42 if [ "$rc" != 0 ]; then 55 if [ "$rc" != 0 ]; then
43 printf 'failed\n' 56 printf 'failed\n'
44Index: kbd-2.0.4/tests/dumpkeys-fulltable.in 57diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in
45=================================================================== 58index a3a5ece..67a73ef 100755
46--- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in 59--- a/tests/dumpkeys-fulltable.in
47+++ kbd-2.0.4/tests/dumpkeys-fulltable.in 60+++ b/tests/dumpkeys-fulltable.in
48@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" 61@@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")"
49 cd "$cwd" 62 cd "$cwd"
50 63
diff --git a/meta/recipes-core/kbd/kbd_2.0.4.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb
index 4af3256fff..9556302ab5 100644
--- a/meta/recipes-core/kbd/kbd_2.0.4.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -2,10 +2,12 @@ SUMMARY = "Keytable files and keyboard utilities"
2HOMEPAGE = "http://www.kbd-project.org/" 2HOMEPAGE = "http://www.kbd-project.org/"
3# everything minus console-fonts is GPLv2+ 3# everything minus console-fonts is GPLv2+
4LICENSE = "GPLv2+" 4LICENSE = "GPLv2+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" 5LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a"
6 6
7inherit autotools gettext ptest pkgconfig 7inherit autotools gettext ptest pkgconfig
8 8
9DEPENDS += "flex-native"
10
9RREPLACES_${PN} = "console-tools" 11RREPLACES_${PN} = "console-tools"
10RPROVIDES_${PN} = "console-tools" 12RPROVIDES_${PN} = "console-tools"
11RCONFLICTS_${PN} = "console-tools" 13RCONFLICTS_${PN} = "console-tools"
@@ -13,10 +15,11 @@ RCONFLICTS_${PN} = "console-tools"
13SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ 15SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \
14 file://run-ptest \ 16 file://run-ptest \
15 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://set-proper-path-of-resources.patch', '', d)} \
16 " 18 file://0001-analyze.l-add-missing-string-format.patch \
19 "
17 20
18SRC_URI[md5sum] = "c1635a5a83b63aca7f97a3eab39ebaa6" 21SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc"
19SRC_URI[sha256sum] = "5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88" 22SRC_URI[sha256sum] = "21a1bc5f6fb3b18ce9fdd717e4533368060a3182a39c7155eaf7ec0f5f83e9f7"
20 23
21PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ 24PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \
22 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)} \ 25 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests','', d)} \