From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a17:90a:5d93:b0:1f1:b730:11bd with SMTP id t19-20020a17090a5d9300b001f1b73011bdmr15373095pji.105.1658235638630; Tue, 19 Jul 2022 06:00:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:d0:0:b0:419:f140:27ee with SMTP id 199-20020a6300d0000000b00419f14027eels560786pga.9.-pod-prod-gmail; Tue, 19 Jul 2022 06:00:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tRz9IuCk694VVb6Iwu9SWq2LMS1r2Bcq976f4vguZaUlt3TNXzDRuB1rDWFkV62DU7sbAT X-Received: by 2002:a63:e24e:0:b0:416:1b3c:3de8 with SMTP id y14-20020a63e24e000000b004161b3c3de8mr28800055pgj.120.1658235636437; Tue, 19 Jul 2022 06:00:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658235636; cv=none; d=google.com; s=arc-20160816; b=fhM5JtTnxLRywqXE0pHJZhGfXDVHL0O7beqOF4b61KWBYTzWtgO5al6QsZ18V35zB0 VXFm+nOs+eXrZ+F60aM+BP/rZ3WUQjMvTMqgcuQ1FDp4MGAqC7UCt1GdEkQlGO9GHx6F PooDFTxiBKb8oDmd9e140LRgBNVPgv+Uaw5WYvaUfaTMvWJQvh7fDfXbsdta/BY36Ndo 0avPztxynBYw6LPwzx3p1XnB0zRIXAdVu5K1L9nKvt9EuxSnLEXdpkNr/zpQ2NE9hwK3 Hoevr/c8zIUh+4jol6hDLdDtXK+Qf+z0Hl//LkCQcve/my7Ojw4re6YdqhOYbYzUZIYy VOoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=XLjQGXY/0q4zm5bDy6jhDrUCcMUyH9OniiI0eRyd0Yo=; b=eRsOacDBJS2le8hhax6tYelCbItN2lxY5yvyjrw9OCOfPpP30Sq6ZHl7FjrBsHtAEi RH00L91QDRgXD5CUdd9izFbplkE1k8+/KkJoUhUNzcelMPmRlGbKw4HbMdxihbQ9sA+G uHAAw+jJxI5VaxK5Q2n0D+hecrKfbsdc+4/HKR6GrQXZjQqqvpO1ssLR8hdOxRiOpWG/ iTdYNj+Aa6c+itBsK9LKKiYV5QV+rthe/phksf5KOWxDYs+DKEGHSwkMBPXW4m/oks9q RQsiuZRvJVtLTO5cdADa+VdAGdoQ6+KZ3j6nYg6/Y74N9ndrusWtUku5ZUq4/FqLj23I A8Iw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id d3-20020a170903230300b0016c4b1fc65bsi528221plh.3.2022.07.19.06.00.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jul 2022 06:00:36 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-181-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.181] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26JD07Md015247 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Jul 2022 15:00:34 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3 18/20] isar-sstate: adopt sstate maintenance script Date: Tue, 19 Jul 2022 15:59:58 +0300 Message-Id: <20220719130000.15943-19-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220719130000.15943-1-amikan@ilbers.de> References: <20220719130000.15943-1-amikan@ilbers.de> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: /hDMzVzDxIOo Fix sstate maintenance helper script to work with updated Bitbake siginfo data format. Signed-off-by: Anton Mikanovich --- scripts/isar-sstate | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index 8ea85ed..cb2d2d0 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -124,7 +124,7 @@ import shutil import sys from tempfile import NamedTemporaryFile import time -import pickle +import json sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', 'bitbake', 'lib')) from bb.siggen import compare_sigfiles @@ -802,16 +802,18 @@ def sstate_lint(target, verbose, sources_dir, build_dir, exit_code, **kwargs): hits_other = 0 for sig in cache_sigs.values(): sig_file = target.download(sig.path) - with open(sig_file, 'rb') as f: - sigdata_raw = pickle.Unpickler(f) - sigdata = sigdata_raw.load() + + with bb.compress.zstd.open(sig_file, "rt", encoding="utf-8", num_threads=1) as f: + sigdata = json.load(f, object_hook=bb.siggen.SetDecoder) + + bb.siggen.handle_renames(sigdata) pn_issues = [] for name, val in sigdata['varvals'].items(): if not name[0].isupper(): continue - if sigdata['basewhitelist'] and name in sigdata['basewhitelist'] or \ - sigdata['taskwhitelist'] and name in sigdata['taskwhitelist'] or \ + if sigdata['basehash_ignore_vars'] and name in sigdata['basehash_ignore_vars'] or \ + sigdata['taskhash_ignore_tasks'] and name in sigdata['taskhash_ignore_tasks'] or \ name in ADDITIONAL_IGNORED_VARNAMES: continue if not val or not val[0] == '/': -- 2.17.1