From 3576399ed163cb3136ee1a2077622035d2033158 Mon Sep 17 00:00:00 2001 From: Chong Lu Date: Mon, 27 Oct 2014 13:24:23 +0800 Subject: kmod: fix debuginfo is missing in shared library INHIBIT_PACKAGE_STRIP variable will make debuginfo lose in shared library. The test cases of kmod contain kernel modules for many different architectures, strip and arch gets confused and throws errors. Pack kernel modules in test cases to avoid strip command failed. Signed-off-by: Chong Lu Signed-off-by: Ross Burton --- meta/recipes-kernel/kmod/kmod/run-ptest | 2 ++ meta/recipes-kernel/kmod/kmod_git.bb | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kmod/kmod/run-ptest b/meta/recipes-kernel/kmod/kmod/run-ptest index 37adec3d2f..598dd2cb5f 100755 --- a/meta/recipes-kernel/kmod/kmod/run-ptest +++ b/meta/recipes-kernel/kmod/kmod/run-ptest @@ -1,3 +1,5 @@ #!/bin/sh touch testsuite/stamp-rootfs +tar xf testmodule.tar make -k runtest-TESTS 2>/dev/null| grep -e ^PASS -e ^FAIL +find testsuite -name *.ko -exec rm -f {} \; diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb index d4c21a4387..08dd81569c 100644 --- a/meta/recipes-kernel/kmod/kmod_git.bb +++ b/meta/recipes-kernel/kmod/kmod_git.bb @@ -34,6 +34,10 @@ do_install_append () { # install depmod.d file for search/ dir install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" + if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + find testsuite -name *.ko -exec tar rf testmodule.tar {} \; + find testsuite -name *.ko -exec rm -f {} \; + fi } do_compile_prepend() { @@ -44,7 +48,10 @@ do_compile_ptest () { oe_runmake buildtest-TESTS rootfs } -INHIBIT_PACKAGE_STRIP = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "1", "0", d)}" +do_install_ptest () { + install testmodule.tar ${D}${PTEST_PATH} +} + INSANE_SKIP_${PN}-ptest = "arch" inherit update-alternatives -- cgit 1.2.3-korg