diff options
Diffstat (limited to 'external/poky/meta/recipes-core/kbd/kbd')
4 files changed, 162 insertions, 25 deletions
diff --git a/external/poky/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch b/external/poky/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch new file mode 100644 index 00000000..dc523606 --- /dev/null +++ b/external/poky/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch @@ -0,0 +1,45 @@ +From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001 +From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com> +Date: Wed, 22 Jan 2020 11:02:17 -0500 +Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest + failure + +Replace ABS_DATADIR with DATADIR and append i386 to dirpath. + +Upstream-Status: Inappropriate [OE specific] + +This OE specific patch applies to kbd v2.2.0 for now, the upstream +made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR +in commit 5b6df5c along with a series of other commits which may or +may not fix this issue. We will find out in future releases. + +Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com> +--- + tests/libkbdfile-test08.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c +index bf41707..5e287f1 100644 +--- a/tests/libkbdfile-test08.c ++++ b/tests/libkbdfile-test08.c +@@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv) + if (!fp) + kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); + +- const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; ++ const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/i386/**", 0 }; + const char *const suffixes[] = { "", ".map", ".kmap", 0 }; + +- const char *expect = ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; ++ const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; + + int rc = 0; + +- rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp); ++ rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp); + + if (rc != 0) + kbd_error(EXIT_FAILURE, 0, "unable to find file"); +-- +2.24.1 + diff --git a/external/poky/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch b/external/poky/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch new file mode 100644 index 00000000..8916fd9f --- /dev/null +++ b/external/poky/meta/recipes-core/kbd/kbd/0001-analyze.l-add-missing-string-format.patch @@ -0,0 +1,24 @@ +From dc6bf2ae0835c6569b270e8e1f26a3173f3927d9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 4 Dec 2019 13:14:01 +0100 +Subject: [PATCH] analyze.l: add missing string format + +Upstream-Status: Submitted [https://github.com/legionus/kbd/pull/35] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/libkeymap/analyze.l | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libkeymap/analyze.l b/src/libkeymap/analyze.l +index e32ace6..de62f46 100644 +--- a/src/libkeymap/analyze.l ++++ b/src/libkeymap/analyze.l +@@ -463,7 +463,7 @@ To to|To|TO + + strerror_r(errno, buf, sizeof(buf)); + +- ERR(yyextra, buf); ++ ERR(yyextra, "%s", buf); + return(ERROR); + } + diff --git a/external/poky/meta/recipes-core/kbd/kbd/fix_cflags.patch b/external/poky/meta/recipes-core/kbd/kbd/fix_cflags.patch new file mode 100644 index 00000000..37220960 --- /dev/null +++ b/external/poky/meta/recipes-core/kbd/kbd/fix_cflags.patch @@ -0,0 +1,25 @@ +We need to ensure our CFLAGS are preserved as well as whatever tweak configure +tries to make. Without these, the debug prefix changes get lost and we lose +build reproducibility, likely with other side effects. + +Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> +Upstream-Status: Pending +2020/1/27 + +Index: kbd-2.2.0/configure.ac +=================================================================== +--- kbd-2.2.0.orig/configure.ac ++++ kbd-2.2.0/configure.ac +@@ -72,9 +72,9 @@ if test "$enable_code_coverage" = yes; t + fi + + case "$GCC,$ac_cv_prog_cc_g" in +- yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE" ;; +- yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE" ;; +- ,yes) CFLAGS="-g" ;; ++ yes,yes) CFLAGS="-g $CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; ++ yes,) CFLAGS="$CC_O_LEVEL $FORTIFY_SOURCE $CFLAGS" ;; ++ ,yes) CFLAGS="-g $CFLAGS" ;; + esac + + CC_CHECK_CFLAGS_APPEND([\ diff --git a/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch b/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch index a9a3ab8a..4b1e5b8e 100644 --- a/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch +++ b/external/poky/meta/recipes-core/kbd/kbd/set-proper-path-of-resources.patch @@ -1,3 +1,8 @@ +From cb3af8fb072f8999dbb5160bdc95a102b02fd37a Mon Sep 17 00:00:00 2001 +From: Kai Kang <kai.kang@windriver.com> +Date: Fri, 30 Sep 2016 16:49:55 +0800 +Subject: [PATCH] kbd: create ptest sub-package + Upstream-Status: Inappropriate [embedded specific] kbd is out of source built, then the value of $(srcdir) is relative path of @@ -13,38 +18,61 @@ run as expected. Signed-off-by: Kai Kang <kai.kang@windriver.com> -Index: kbd-2.0.4/tests/Makefile.am -=================================================================== ---- kbd-2.0.4.orig/tests/Makefile.am -+++ kbd-2.0.4/tests/Makefile.am -@@ -1,7 +1,7 @@ - AM_CPPFLAGS = \ - -I$(srcdir)/../src/libkeymap \ +--- + tests/Makefile.am | 4 ++-- + tests/alt-is-meta.in | 2 +- + tests/dumpkeys-bkeymap.in | 4 ++-- + tests/dumpkeys-fulltable.in | 2 +- + tests/dumpkeys-mktable.in | 4 ++-- + 5 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 8d0ab69..5147c28 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -7,8 +7,8 @@ AM_CPPFLAGS = \ -I$(builddir)/../src/libkeymap \ -- -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" -+ -DDATADIR=\".\" -DBUILDDIR=\"$(builddir)\" - - AM_CFLAGS = $(CHECK_CFLAGS) - LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ -Index: kbd-2.0.4/tests/alt-is-meta.in -=================================================================== ---- kbd-2.0.4.orig/tests/alt-is-meta.in -+++ kbd-2.0.4/tests/alt-is-meta.in -@@ -7,8 +7,8 @@ cd "$cwd" + -I$(srcdir)/../src/libkbdfile \ + -I$(builddir)/../src/libkbdfile \ +- -DDATADIR=\"$(srcdir)\" \ +- -DABS_DATADIR=\"$(realpath $(srcdir))\" \ ++ -DDATADIR=\".\" \ ++ -DABS_DATADIR=\"/usr/lib/kbd/ptest/tests\" \ + -DBUILDDIR=\"$(builddir)\" + + AM_CFLAGS = $(CHECK_CFLAGS) $(CODE_COVERAGE_CFLAGS) +diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in +index 3a1441f..d829f2e 100755 +--- a/tests/alt-is-meta.in ++++ b/tests/alt-is-meta.in +@@ -7,7 +7,7 @@ cd "$cwd" rc=0 temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" --./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$? --cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$? -+./libkeymap-showmaps ./alt-is-meta.map > "$temp" || rc=$? -+cmp -s "./alt-is-meta.output" "$temp" || rc=$? +-datadir="@DATADIR@/data/alt-is-meta" ++datadir="./data/alt-is-meta" + + ./libkeymap-showmaps "$datadir"/alt-is-meta.map > "$temp" || rc=$? + cmp -s "$datadir/alt-is-meta.output" "$temp" || rc=$? +diff --git a/tests/dumpkeys-bkeymap.in b/tests/dumpkeys-bkeymap.in +index 03d4ca2..d1d0e26 100755 +--- a/tests/dumpkeys-bkeymap.in ++++ b/tests/dumpkeys-bkeymap.in +@@ -9,8 +9,8 @@ temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" + + datadir="@DATADIR@" + +-./libkeymap-bkeymap "$datadir/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? +-cmp -s "$datadir/data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$? ++./libkeymap-bkeymap ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? ++cmp -s "./data/dumpkeys-bkeymap/bkeymap.bin" "$temp" || rc=$? if [ "$rc" != 0 ]; then printf 'failed\n' -Index: kbd-2.0.4/tests/dumpkeys-fulltable.in -=================================================================== ---- kbd-2.0.4.orig/tests/dumpkeys-fulltable.in -+++ kbd-2.0.4/tests/dumpkeys-fulltable.in +diff --git a/tests/dumpkeys-fulltable.in b/tests/dumpkeys-fulltable.in +index a3a5ece..67a73ef 100755 +--- a/tests/dumpkeys-fulltable.in ++++ b/tests/dumpkeys-fulltable.in @@ -5,7 +5,7 @@ cwd="$(readlink -ev "${0%/*}")" cd "$cwd" @@ -54,3 +82,18 @@ Index: kbd-2.0.4/tests/dumpkeys-fulltable.in check_keymap() { local kmap temp rc +diff --git a/tests/dumpkeys-mktable.in b/tests/dumpkeys-mktable.in +index 0f17c40..7e5161d 100755 +--- a/tests/dumpkeys-mktable.in ++++ b/tests/dumpkeys-mktable.in +@@ -7,8 +7,8 @@ cd "$cwd" + rc=0 + temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")" + +-./libkeymap-mktable "@DATADIR@/"../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? +-cmp -s "@DATADIR@/data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$? ++./libkeymap-mktable ../data/keymaps/i386/qwerty/defkeymap.map > "$temp" || rc=$? ++cmp -s "./data/dumpkeys-mktable/defkeymap.c" "$temp" || rc=$? + + if [ "$rc" != 0 ]; then + printf 'failed\n' |