diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-01 23:23:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-02 14:42:08 +0100 |
commit | 65525a3c6a55dafb8ea01b65ba55cd7025545cbb (patch) | |
tree | 075517cdb1e45dc63666a4bb69619a775d107387 /meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch | |
parent | 0c0a03eb4ad713b992b9dfc8711904fb307d82f0 (diff) | |
download | poky-65525a3c6a55dafb8ea01b65ba55cd7025545cbb.tar.gz |
kbd: update 2.2.0 -> 2.3.0
Drop ptest support: upstream has rewritten the tests in GNU autotest,
which is another m4 monstrosity entirely incompatible with the idea of
installing tests to the target system.
All dropped patches are either merged upstream, or made for ptest.
(From OE-Core rev: 79f456da4b752f897bb5546d9ec291cdf4196ae8)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch')
-rw-r--r-- | meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch b/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch deleted file mode 100644 index dc5236063b..0000000000 --- a/meta/recipes-core/kbd/kbd/0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | From 4c12f76f4177cfd560cf708a16774ebfadbd41a5 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Mingde (Matthew) Zeng" <matthew.zeng@windriver.com> | ||
3 | Date: Wed, 22 Jan 2020 11:02:17 -0500 | ||
4 | Subject: [PATCH] Use DATADIR and append i386 to fix libkbdfile-test08 ptest | ||
5 | failure | ||
6 | |||
7 | Replace ABS_DATADIR with DATADIR and append i386 to dirpath. | ||
8 | |||
9 | Upstream-Status: Inappropriate [OE specific] | ||
10 | |||
11 | This OE specific patch applies to kbd v2.2.0 for now, the upstream | ||
12 | made drastic changes since v2.2.0, in fact they got rid of ABS_DATADIR | ||
13 | in commit 5b6df5c along with a series of other commits which may or | ||
14 | may not fix this issue. We will find out in future releases. | ||
15 | |||
16 | Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com> | ||
17 | --- | ||
18 | tests/libkbdfile-test08.c | 6 +++--- | ||
19 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
20 | |||
21 | diff --git a/tests/libkbdfile-test08.c b/tests/libkbdfile-test08.c | ||
22 | index bf41707..5e287f1 100644 | ||
23 | --- a/tests/libkbdfile-test08.c | ||
24 | +++ b/tests/libkbdfile-test08.c | ||
25 | @@ -14,14 +14,14 @@ main(int __attribute__((unused)) argc, char **argv) | ||
26 | if (!fp) | ||
27 | kbd_error(EXIT_FAILURE, 0, "unable to create kbdfile"); | ||
28 | |||
29 | - const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/**", 0 }; | ||
30 | + const char *const dirpath[] = { "", DATADIR "/findfile/test_0/keymaps/i386/**", 0 }; | ||
31 | const char *const suffixes[] = { "", ".map", ".kmap", 0 }; | ||
32 | |||
33 | - const char *expect = ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; | ||
34 | + const char *expect = DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0.map"; | ||
35 | |||
36 | int rc = 0; | ||
37 | |||
38 | - rc = kbdfile_find((char *)(ABS_DATADIR "/findfile/test_0/keymaps/i386/qwerty/test0"), (char **) dirpath, (char **) suffixes, fp); | ||
39 | + rc = kbdfile_find((char *)"test0", (char **) dirpath, (char **) suffixes, fp); | ||
40 | |||
41 | if (rc != 0) | ||
42 | kbd_error(EXIT_FAILURE, 0, "unable to find file"); | ||
43 | -- | ||
44 | 2.24.1 | ||
45 | |||