[oe-commits] [openembedded-core] 11/36: kbd: fix ptest can NOT run issue

git at git.openembedded.org git at git.openembedded.org
Mon Dec 30 08:48:16 UTC 2019


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 2fb86f46baed43316086ce10de635c326e073c2d
Author: Kai Kang <kai.kang at windriver.com>
AuthorDate: Tue Dec 24 09:54:49 2019 +0800

    kbd: fix ptest can NOT run issue
    
    After kbd updated to 2.2.0, it fails to run ptest:
    
    | make: *** No rule to make target 'libkbdfile-test01.c', needed by 'libkbdfile-test01'.
    
    Update sed expression to fix such kind of issues. And also make target
    dumpkeys-bkeymap and dumpkeys-bkeymap which are required by ptest.
    
    Signed-off-by: Kai Kang <kai.kang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-core/kbd/kbd_2.2.0.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/kbd/kbd_2.2.0.bb b/meta/recipes-core/kbd/kbd_2.2.0.bb
index f252161..88041bc 100644
--- a/meta/recipes-core/kbd/kbd_2.2.0.bb
+++ b/meta/recipes-core/kbd/kbd_2.2.0.bb
@@ -29,7 +29,7 @@ PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
 PACKAGECONFIG[tests] = "--enable-tests, --disable-tests, libcheck"
 
 do_compile_ptest() {
-    oe_runmake -C ${B}/tests dumpkeys-fulltable alt-is-meta
+    oe_runmake -C ${B}/tests alt-is-meta dumpkeys-bkeymap dumpkeys-fulltable dumpkeys-mktable
 }
 
 do_install_ptest() {
@@ -42,7 +42,7 @@ do_install_ptest() {
 	-e 's:${RECIPE_SYSROOT}::g' \
 	-e 's:${S}/config/missing::g' \
 	-e 's:${WORKDIR}::g' \
-	-e '/libkeymap_.*_SOURCES =/d' -e '/$(EXEEXT):/,/^$/d' ${D}${PTEST_PATH}/tests/Makefile
+	-e '/^lib.*_SOURCES =/d' -e '/$(EXEEXT):/,/^$/d' ${D}${PTEST_PATH}/tests/Makefile
 
     find ${B}/tests -executable -exec install {} ${D}${PTEST_PATH}/tests \;
     find ${S}/tests \( -name \*.map -o -name \*.bin -o -name \*.output \) -exec install {} ${D}${PTEST_PATH}/tests \;

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list