diff options
author | Mingde (Matthew) Zeng <matthew.zeng@windriver.com> | 2020-01-22 15:20:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:48:08 +0000 |
commit | 1e709614b5d2d0b27b981dc622cb949ef43b241f (patch) | |
tree | b840b9aaa508714c268a0a0469f3da2864c482aa /meta/recipes-core/kbd/kbd_2.2.0.bb | |
parent | a708aa347dbd36a7090d4ab14cf000ae8289f11e (diff) | |
download | poky-1e709614b5d2d0b27b981dc622cb949ef43b241f.tar.gz |
kbd: make libkbdfile-test08 ptest work for multilib
This patch fixes kbd ptest libkbdfile-test08 failure in 64-bit images.
```sh
root@intel-x86-64:/usr/lib64/kbd/ptest# ./run-ptest
make: Entering directory '/usr/lib64/kbd/ptest/tests'
make[1]: Entering directory '/usr/lib64/kbd/ptest/tests'
PASS: libkbdfile-test01
PASS: libkbdfile-test02
PASS: libkbdfile-test03
PASS: libkbdfile-test04
PASS: libkbdfile-test05
PASS: libkbdfile-test06
PASS: libkbdfile-test07
FAIL: libkbdfile-test08
PASS: libkbdfile-test09
...
```
`DATADIR` and `ABS_DATADIR` are compile flags defined in
./kbd/tests/Makefile.am. `DATADIR` is the relative directory of
kbd, i.e `./kbd/ptest/tests` whereas `ABS_DATADIR` is the full
directory path, i.e `/usr/lib/kbd/ptest/tests`. The latter has a
problem when building ptests for a 64-bit image, because the tests
folder is located at `/usr/lib64/kbd/ptest/tests` instead.
Therefore `ABS_DATADIR` is changed to `DATADIR`, also consistent with
what *every other* kbd test is doing.
The test searches DATADIR recursively for a file named `test0.map`,
but it finds the wrong file at
`/findfile/test_0/keymaps/test0.map`,
while it actually needs
`/findfile/test_0/keymaps/i386/qwerty/test0.map`.
Thus appending `/i386` to `dirpath` so that `libkbdfile-test08.c`
finds the right test file.
(From OE-Core rev: bdcda2c4ff3c96f686b8bd30cd17361ff3722a0f)
Signed-off-by: Matthew Zeng<Matthew.Zeng@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/kbd/kbd_2.2.0.bb')
-rw-r--r-- | meta/recipes-core/kbd/kbd_2.2.0.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb index df9b0bb90b..e13cea7634 100644 --- a/meta/recipes-core/kbd/kbd_2.2.0.bb +++ b/meta/recipes-core/kbd/kbd_2.2.0.bb | |||
@@ -16,6 +16,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ | |||
16 | file://run-ptest \ | 16 | file://run-ptest \ |
17 | ${@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)} \ |
18 | file://0001-analyze.l-add-missing-string-format.patch \ | 18 | file://0001-analyze.l-add-missing-string-format.patch \ |
19 | file://0001-Use-DATADIR-and-append-i386-to-fix-libkbdfile-test08.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc" | 22 | SRC_URI[md5sum] = "d1d7ae0b5fb875dc082731e09cd0c8bc" |