diff options
Diffstat (limited to 'poky/scripts')
-rwxr-xr-x | poky/scripts/contrib/patchreview.py | 46 | ||||
-rw-r--r-- | poky/scripts/lib/devtool/deploy.py | 2 | ||||
-rwxr-xr-x | poky/scripts/runqemu | 5 |
3 files changed, 37 insertions, 16 deletions
diff --git a/poky/scripts/contrib/patchreview.py b/poky/scripts/contrib/patchreview.py index a4d5ba686..072166504 100755 --- a/poky/scripts/contrib/patchreview.py +++ b/poky/scripts/contrib/patchreview.py @@ -5,6 +5,7 @@ # - test suite # - validate signed-off-by +status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied") class Result: # Whether the patch has an Upstream-Status or not @@ -35,25 +36,26 @@ def blame_patch(patch): "--format=%s (%aN <%aE>)", "--", patch)).decode("utf-8").splitlines() -def patchreview(patches): - import re +def patchreview(path, patches): + import re, os.path # General pattern: start of line, optional whitespace, tag with optional # hyphen or spaces, maybe a colon, some whitespace, then the value, all case # insensitive. sob_re = re.compile(r"^[\t ]*(Signed[-_ ]off[-_ ]by:?)[\t ]*(.+)", re.IGNORECASE | re.MULTILINE) status_re = re.compile(r"^[\t ]*(Upstream[-_ ]Status:?)[\t ]*(\w*)", re.IGNORECASE | re.MULTILINE) - status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied") cve_tag_re = re.compile(r"^[\t ]*(CVE:)[\t ]*(.*)", re.IGNORECASE | re.MULTILINE) cve_re = re.compile(r"cve-[0-9]{4}-[0-9]{4,6}", re.IGNORECASE) results = {} for patch in patches: + + fullpath = os.path.join(path, patch) result = Result() - results[patch] = result + results[fullpath] = result - content = open(patch, encoding='ascii', errors='ignore').read() + content = open(fullpath, encoding='ascii', errors='ignore').read() # Find the Signed-off-by tag match = sob_re.search(content) @@ -122,6 +124,8 @@ def analyse(results, want_blame=False, verbose=True): missing_status += 1 if r.malformed_upstream_status or r.unknown_upstream_status: malformed_status += 1 + # Count patches with no status as pending + pending_patches +=1 if r.missing_cve: missing_cve += 1 if r.upstream_status == "pending": @@ -132,7 +136,6 @@ def analyse(results, want_blame=False, verbose=True): need_blame = True if verbose: print("Missing Signed-off-by tag (%s)" % patch) - if r.malformed_sob: need_blame = True if verbose: @@ -198,14 +201,35 @@ if __name__ == "__main__": args.add_argument("-b", "--blame", action="store_true", help="show blame for malformed patches") args.add_argument("-v", "--verbose", action="store_true", help="show per-patch results") args.add_argument("-g", "--histogram", action="store_true", help="show patch histogram") - args.add_argument("directory", nargs="?", help="directory to scan") + args.add_argument("-j", "--json", help="update JSON") + args.add_argument("directory", help="directory to scan") args = args.parse_args() - if args.directory: - os.chdir(args.directory) - patches = subprocess.check_output(("git", "ls-files", "recipes-*/**/*.patch", "recipes-*/**/*.diff")).decode("utf-8").split() - results = patchreview(patches) + patches = subprocess.check_output(("git", "-C", args.directory, "ls-files", "recipes-*/**/*.patch", "recipes-*/**/*.diff")).decode("utf-8").split() + results = patchreview(args.directory, patches) analyse(results, want_blame=args.blame, verbose=args.verbose) + + if args.json: + import json, os.path, collections + if os.path.isfile(args.json): + data = json.load(open(args.json)) + else: + data = [] + + row = collections.Counter() + row["total"] = len(results) + row["date"] = subprocess.check_output(["git", "-C", args.directory, "show", "-s", "--pretty=format:%cd", "--date=format:%s"]).decode("utf-8").strip() + for r in results.values(): + if r.upstream_status in status_values: + row[r.upstream_status] += 1 + if r.malformed_upstream_status or r.missing_upstream_status: + row['malformed-upstream-status'] += 1 + if r.malformed_sob or r.missing_sob: + row['malformed-sob'] += 1 + + data.append(row) + json.dump(data, open(args.json, "w")) + if args.histogram: print() histogram(results) diff --git a/poky/scripts/lib/devtool/deploy.py b/poky/scripts/lib/devtool/deploy.py index 52e261d56..886004b5d 100644 --- a/poky/scripts/lib/devtool/deploy.py +++ b/poky/scripts/lib/devtool/deploy.py @@ -184,7 +184,7 @@ def deploy(args, config, basepath, workspace): exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or '']) oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'), - rd.getVar('base_libdir')) + rd.getVar('base_libdir'), rd) filelist = [] ftotalsize = 0 diff --git a/poky/scripts/runqemu b/poky/scripts/runqemu index 295c8b1b6..08f4cfe4c 100755 --- a/poky/scripts/runqemu +++ b/poky/scripts/runqemu @@ -474,14 +474,11 @@ class BaseConfig(object): "Try 'runqemu help' on how to use it" % \ (unknown_arg, arg)) # Check to make sure it is a valid machine - if unknown_arg: - if self.get('MACHINE') == unknown_arg: - return + if unknown_arg and self.get('MACHINE') != unknown_arg: if self.get('DEPLOY_DIR_IMAGE'): machine = os.path.basename(self.get('DEPLOY_DIR_IMAGE')) if unknown_arg == machine: self.set("MACHINE", machine) - return self.check_arg_machine(unknown_arg) |