From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7128378901610364928 X-Received: by 2002:a17:90b:3e89:b0:1f5:6029:1bf4 with SMTP id rj9-20020a17090b3e8900b001f560291bf4mr7488692pjb.222.1659705088400; Fri, 05 Aug 2022 06:11:28 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a63:6b81:0:b0:41b:f780:ec79 with SMTP id g123-20020a636b81000000b0041bf780ec79ls2384322pgc.1.-pod-prod-gmail; Fri, 05 Aug 2022 06:11:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR7mdRLbWRqTRyVXrepGYZ196d2ZeoWTwUYGEZUgTx7wtRbxsB6a3ywpLNDaixLwkEVU4hJf X-Received: by 2002:a05:6a00:2485:b0:52e:ca57:5018 with SMTP id c5-20020a056a00248500b0052eca575018mr2013631pfv.43.1659705087560; Fri, 05 Aug 2022 06:11:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659705087; cv=none; d=google.com; s=arc-20160816; b=U0wuDNqpbD6L1UyXWsyhTYjkLDU7lsqZKcePZfSyZe0lZlpK9EJ3R5OIjtBq9qKuYy xkaU35ZryD1+edVdRjTXobiFV7TcJeIt8RqpiT6WgLXFJWrDI41bTDQB9kErfxi3m7aS oD6nb9V9Y4HxZRs5zfliI3hlchFJcsSkL9rvq5oGJvGGdX5NWNGymvQGmFMvbZe0K+oc bG7gnvKpKz1OobgUo0ktBHmC/ejcUl07rmzSIFTgqM6aJ8xXRz7mR/l1IIF6DfNyV3vY i3Z7o7JqNEqLZHQ40cKWxH4pZikhWP8nSrxv/cvuq1cQNfbWfmH4VX27mvQl3IZ+QFIp EWmw== 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=/uONTtenTOz0Aezy+/t9SWEDaQGHLedFYwX8WjCpZ5E=; b=NiiQxkHqi1Idw/r47bkR3T+23mJXXiKCv+6Rr+QmN8aHPA4dEXT8Qv2gOvqfuRNJ31 OhXTu9YBH+wFCCCflNq8gW/dkQPsWK3ALNIB/Ca217c/Z6MRSl8EXT6BAUQn/HvzQQ+t 1aj0DQrbPGfBXxJMDnXbOxopQYL41NGf4MysrzOZSjqzOm04PCsDLNyyQCxXLxpIphzC 673y5aW0IvfmM8xfVwvLx+gSZ3/ylbhDubM+lHd46NezZSlPYpQQYvCnLrYyQKKIAX/E sKNQcepwlTlUaNRWZIE03ndl9m6yKrXsgeA4kodKyhEBBjzMoFWiQMVOURdyq9rzpomE op2g== 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 nh14-20020a17090b364e00b001f4f57cec93si320449pjb.1.2022.08.05.06.11.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Aug 2022 06:11:27 -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 alena-nb.promwad.com (mm-183-76-214-37.mgts.dynamic.pppoe.byfly.by [37.214.76.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 275DAhI4009685 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 5 Aug 2022 15:11:10 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4 18/21] isar-sstate: adopt sstate maintenance script Date: Fri, 5 Aug 2022 16:10:32 +0300 Message-Id: <20220805131035.22844-19-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220805131035.22844-1-amikan@ilbers.de> References: <20220805131035.22844-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: qWiMxRPlnBgo Fix sstate maintenance helper script to work with updated Bitbake siginfo data format. Signed-off-by: Anton Mikanovich --- scripts/isar-sstate | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/isar-sstate b/scripts/isar-sstate index 3a1945e..2b0addf 100755 --- a/scripts/isar-sstate +++ b/scripts/isar-sstate @@ -126,7 +126,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 @@ -808,20 +808,17 @@ 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: - try: - sigdata_raw = pickle.Unpickler(f) - sigdata = sigdata_raw.load() - except: - # invalid file or format... never mind - continue + 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