diff options
Diffstat (limited to 'yocto-poky/meta/classes/insane.bbclass')
| -rw-r--r-- | yocto-poky/meta/classes/insane.bbclass | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/yocto-poky/meta/classes/insane.bbclass b/yocto-poky/meta/classes/insane.bbclass index 5c8629af1..a77438db5 100644 --- a/yocto-poky/meta/classes/insane.bbclass +++ b/yocto-poky/meta/classes/insane.bbclass @@ -32,7 +32,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \ installed-vs-shipped compile-host-path install-host-path \ pn-overrides infodir build-deps file-rdeps \ unknown-configure-option symlink-to-sysroot multilib \ - invalid-pkgconfig host-user-contaminated \ + invalid-packageconfig host-user-contaminated \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ @@ -86,6 +86,7 @@ def package_qa_get_machine_dict(): "mipsel": ( 8, 0, 0, True, 32), "mips64": ( 8, 0, 0, False, 64), "mips64el": ( 8, 0, 0, True, 64), + "nios2": (113, 0, 0, True, 32), "s390": (22, 0, 0, False, 32), "sh4": (42, 0, 0, True, 32), "sparc": ( 2, 0, 0, False, 32), @@ -166,7 +167,7 @@ def package_qa_get_machine_dict(): def package_qa_clean_path(path,d): """ Remove the common prefix from the path. In this case it is the TMPDIR""" - return path.replace(d.getVar('TMPDIR',True),"") + return path.replace(d.getVar("TMPDIR", True) + "/", "") def package_qa_write_error(type, error, d): logfile = d.getVar('QA_LOGFILE', True) @@ -980,6 +981,7 @@ def package_qa_check_host_user(path, name, d, elf, messages): return dest = d.getVar('PKGDEST', True) + pn = d.getVar('PN', True) home = os.path.join(dest, 'home') if path == home or path.startswith(home + os.sep): return @@ -991,14 +993,15 @@ def package_qa_check_host_user(path, name, d, elf, messages): if exc.errno != errno.ENOENT: raise else: + rootfs_path = path[len(dest):] check_uid = int(d.getVar('HOST_USER_UID', True)) if stat.st_uid == check_uid: - messages["host-user-contaminated"] = "%s is owned by uid %d, which is the same as the user running bitbake. This may be due to host contamination" % (path, check_uid) + messages["host-user-contaminated"] = "%s: %s is owned by uid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, rootfs_path, check_uid) return False check_gid = int(d.getVar('HOST_USER_GID', True)) if stat.st_gid == check_gid: - messages["host-user-contaminated"] = "%s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (path, check_gid) + messages["host-user-contaminated"] = "%s: %s is owned by gid %d, which is the same as the user running bitbake. This may be due to host contamination" % (pn, rootfs_path, check_gid) return False return True @@ -1089,7 +1092,7 @@ python do_package_qa () { # Check package name if not pkgname_pattern.match(package): package_qa_handle_error("pkgname", - "%s doesn't match the [a-z0-9.+-]+ regex\n" % package, d) + "%s doesn't match the [a-z0-9.+-]+ regex" % package, d) path = "%s/%s" % (pkgdest, package) if not package_qa_walk(path, warnchecks, errorchecks, skip, package, d): @@ -1143,7 +1146,7 @@ python do_qa_configure() { if "config.log" in files: if subprocess.call(statement, shell=True) == 0: bb.fatal("""This autoconf log indicates errors, it looked at host include and/or library paths while determining system capabilities. -Rerun configure task after fixing this. The path was '%s'""" % root) +Rerun configure task after fixing this.""") if "configure.ac" in files: configs.append(os.path.join(root,"configure.ac")) @@ -1207,7 +1210,7 @@ Missing inherit gettext?""" % (gt, config)) if pconfig not in pkgconfigflags: pn = d.getVar('PN', True) error_msg = "%s: invalid PACKAGECONFIG: %s" % (pn, pconfig) - package_qa_handle_error("invalid-pkgconfig", error_msg, d) + package_qa_handle_error("invalid-packageconfig", error_msg, d) } python do_qa_unpack() { |