mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
![]() 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> |
||
---|---|---|
bitbake | ||
contrib/artwork | ||
documentation | ||
meta | ||
meta-poky | ||
meta-selftest | ||
meta-skeleton | ||
meta-yocto-bsp | ||
scripts | ||
.gitignore | ||
.templateconf | ||
LICENSE | ||
LICENSE.GPL-2.0-only | ||
LICENSE.MIT | ||
oe-init-build-env | ||
README.hardware | ||
README.OE-Core | ||
README.poky | ||
README.qemu |
QEMU Emulation Targets ====================== To simplify development, the build system supports building images to work with the QEMU emulator in system emulation mode. Several architectures are currently supported in 32 and 64 bit variants: * ARM (qemuarm + qemuarm64) * x86 (qemux86 + qemux86-64) * PowerPC (qemuppc only) * MIPS (qemumips + qemumips64) Use of the QEMU images is covered in the Yocto Project Reference Manual. The appropriate MACHINE variable value corresponding to the target is given in brackets.