diff options
| -rw-r--r-- | meta/classes/insane.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/native.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/ptest.bbclass | 17 |
3 files changed, 11 insertions, 15 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 75db7a2d8a..336beaa061 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -216,7 +216,7 @@ def package_qa_check_dev(path, name, d, elf, messages): Check for ".so" library symlinks in non-dev packages """ - if not name.endswith("-dev") and not name.endswith("-dbg") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path): + if not name.endswith("-dev") and not name.endswith("-dbg") and not name.endswith("-ptest") and not name.startswith("nativesdk-") and path.endswith(".so") and os.path.islink(path): messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) @@ -229,7 +229,7 @@ def package_qa_check_staticdev(path, name, d, elf, messages): libgcc.a, libgcov.a will be skipped in their packages """ - if not name.endswith("-pic") and not name.endswith("-staticdev") and path.endswith(".a") and not path.endswith("_nonshared.a"): + if not name.endswith("-pic") and not name.endswith("-staticdev") and not name.endswith("-ptest") and path.endswith(".a") and not path.endswith("_nonshared.a"): messages.append("non -staticdev package contains static .a library: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) @@ -273,7 +273,7 @@ def package_qa_check_dbg(path, name, d, elf, messages): Check for ".debug" files or directories outside of the dbg package """ - if not "-dbg" in name: + if not "-dbg" in name and not "-ptest" in name: if '.debug' in path.split(os.path.sep): messages.append("non debug package contains .debug directory: %s path %s" % \ (name, package_qa_clean_path(path,d))) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index bfc9e4c7db..cd930f0702 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -50,6 +50,9 @@ TOOLCHAIN_OPTIONS = "" DEPENDS_GETTEXT = "gettext-native" +# Don't build ptest natively +PTEST_ENABLED = "0" + # Don't use site files for native builds export CONFIG_SITE = "" diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass index 6ab5ee411f..37357e8215 100644 --- a/meta/classes/ptest.bbclass +++ b/meta/classes/ptest.bbclass @@ -7,25 +7,18 @@ DESCRIPTION_${PN}-ptest ?= "${DESCRIPTION} \ This package contains a test directory ${PTEST_PATH} for package test purposes." PTEST_PATH ?= "${libdir}/${PN}/ptest" -FILES_${PN}-ptest = "${PTEST_PATH}/*" +FILES_${PN}-ptest = "${PTEST_PATH}" SECTION_${PN}-ptest = "devel" ALLOW_EMPTY_${PN}-ptest = "1" PTEST_ENABLED = "${@base_contains("DISTRO_FEATURES", "ptest", "1", "0", d)}" RDEPENDS_${PN}-ptest_virtclass-native = "" RDEPENDS_${PN}-ptest_virtclass-nativesdk = "" -PACKAGES += "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" - -FILES_${PN}-dbg += "${PTEST_PATH}/.debug \ - ${PTEST_PATH}/*/.debug \ - ${PTEST_PATH}/*/*/.debug \ - ${PTEST_PATH}/*/*/*/.debug \ - ${PTEST_PATH}/*/*/*/*/.debug \ - " +PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" do_configure_ptest_base() { if [ ${PTEST_ENABLED} = 1 ]; then - if [ type -t do_configure_ptest = function ]; then + if [ a$(type -t do_configure_ptest) = afunction ]; then do_configure_ptest fi fi @@ -33,7 +26,7 @@ do_configure_ptest_base() { do_compile_ptest_base() { if [ ${PTEST_ENABLED} = 1 ]; then - if [ type -t do_compile_ptest = function ]; then + if [ a$(type -t do_compile_ptest) = afunction ]; then do_compile_ptest fi fi @@ -46,7 +39,7 @@ do_install_ptest_base() { if grep -q install-ptest: Makefile; then oe_runmake DESTDIR=${D}${PTEST_PATH} install-ptest fi - if [ type -t do_install_ptest = function ]; then + if [ a$(type -t do_install_ptest) = afunction ]; then do_install_ptest fi fi |