diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/insane.bbclass | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 3a0efa3ad6..1d76ae7c1d 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -458,10 +458,6 @@ def package_qa_check_buildpaths(path, name, d, elf, messages): | |||
458 | if os.path.islink(path): | 458 | if os.path.islink(path): |
459 | return | 459 | return |
460 | 460 | ||
461 | # Ignore ipk and deb's CONTROL dir | ||
462 | if path.find(name + "/CONTROL/") != -1 or path.find(name + "/DEBIAN/") != -1: | ||
463 | return | ||
464 | |||
465 | tmpdir = bytes(d.getVar('TMPDIR'), encoding="utf-8") | 461 | tmpdir = bytes(d.getVar('TMPDIR'), encoding="utf-8") |
466 | with open(path, 'rb') as f: | 462 | with open(path, 'rb') as f: |
467 | file_content = f.read() | 463 | file_content = f.read() |
@@ -1023,7 +1019,14 @@ python do_package_qa () { | |||
1023 | pkgfiles = {} | 1019 | pkgfiles = {} |
1024 | for pkg in packages: | 1020 | for pkg in packages: |
1025 | pkgfiles[pkg] = [] | 1021 | pkgfiles[pkg] = [] |
1026 | for walkroot, dirs, files in os.walk(os.path.join(pkgdest, pkg)): | 1022 | pkgdir = os.path.join(pkgdest, pkg) |
1023 | for walkroot, dirs, files in os.walk(pkgdir): | ||
1024 | # Don't walk into top-level CONTROL or DEBIAN directories as these | ||
1025 | # are temporary directories created by do_package. | ||
1026 | if walkroot == pkgdir: | ||
1027 | for control in ("CONTROL", "DEBIAN"): | ||
1028 | if control in dirs: | ||
1029 | dirs.remove(control) | ||
1027 | for file in files: | 1030 | for file in files: |
1028 | pkgfiles[pkg].append(os.path.join(walkroot, file)) | 1031 | pkgfiles[pkg].append(os.path.join(walkroot, file)) |
1029 | 1032 | ||