sanity.bbclass: allow dash to be used as /bin/sh, but print a warning

[vuplus_openembedded] / classes / packaged-staging.bbclass

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 849f60c..bd7b9ea 100644 (file)
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -109,17 +109,17 @@ def pstage_cleanpackage(pkgname, d):
        pstage_set_pkgmanager(d)
        list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True)
 
-       bb.note("Checking if staging package installed")
+       bb.debug(2, "Checking if staging package installed")
        lf = bb.utils.lockfile(bb.data.expand("${STAGING_DIR}/staging.lock", d))
        ret = os.system("PATH=\"%s\" %s | grep %s" % (path, list_cmd, pkgname))
        if ret == 0:
-               bb.note("Yes. Uninstalling package from staging...")
+               bb.debug(1, "Uninstalling package from staging...")
                removecmd = bb.data.getVar("PSTAGE_REMOVE_CMD", d, 1)
                ret = os.system("PATH=\"%s\" %s %s" % (path, removecmd, pkgname))
                if ret != 0:
                        bb.note("Failure removing staging package")
        else:
-               bb.note("No. Manually removing any installed files")
+               bb.debug(1, "Manually removing any installed files from staging...")
                pstage_manualclean("staging", "STAGING_DIR", d)
                pstage_manualclean("cross", "CROSS_DIR", d)
                pstage_manualclean("deploy", "DEPLOY_DIR", d)
@@ -135,7 +135,7 @@ do_clean_prepend() {
        pstage_cleanpackage(removepkg, d)
 
        stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
-       bb.note("Removing staging package %s" % stagepkg)
+       bb.note("Removing staging package %s" % base_path_out(stagepkg, d))
        os.system('rm -rf ' + stagepkg)
 }