From 002f7b9f038b86b793b8e0558bcd17ad58372767 Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Mon, 4 Dec 2017 04:22:03 -0500 Subject: ltp: remove ltp-staticdev package The nm01 testcase runtime depends on a static library, and ltp-staticdev package is entirely pointless, so remove it and add the static libraries to ltp main package and skip the "staticdev" checks. Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- meta/recipes-extended/ltp/ltp_20170929.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-extended/ltp/ltp_20170929.bb b/meta/recipes-extended/ltp/ltp_20170929.bb index 8a870b36ac..aaa7c93fe3 100644 --- a/meta/recipes-extended/ltp/ltp_20170929.bb +++ b/meta/recipes-extended/ltp/ltp_20170929.bb @@ -106,15 +106,13 @@ RDEPENDS_${PN} = "\ which \ " -FILES_${PN}-staticdev += "/opt/ltp/lib/libmem.a /opt/ltp/testcases/data/nm01/lib.a" - -FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/*" +FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/* /opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a" # Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" # However, test_arch_stripped is already stripped, so... -INSANE_SKIP_${PN} += "already-stripped" +INSANE_SKIP_${PN} += "already-stripped staticdev" # Avoid file dependency scans, as LTP checks for things that may or may not # exist on the running system. For instance it has specific checks for -- cgit 1.2.3-korg