From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7120476383164235776 X-Received: by 2002:a05:6a00:189e:b0:52a:c147:ee70 with SMTP id x30-20020a056a00189e00b0052ac147ee70mr12074503pfh.61.1657865124571; Thu, 14 Jul 2022 23:05:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:e94c:b0:16a:417b:6d1 with SMTP id b12-20020a170902e94c00b0016a417b06d1ls6481678pll.1.gmail; Thu, 14 Jul 2022 23:05:23 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tdebAGvvkuf/ABbjlt/UlfxRj3b424GoN7cVzLLMWK1XzoNS8PevmGMqckZgd4ufzn7yuO X-Received: by 2002:a17:902:b402:b0:16c:3cab:5910 with SMTP id x2-20020a170902b40200b0016c3cab5910mr12059185plr.96.1657865123644; Thu, 14 Jul 2022 23:05:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657865123; cv=none; d=google.com; s=arc-20160816; b=gNjQKCfPNTvFuAmaGy7XfOV9zTpzfOzukoj5OQaoV/ItEFE3SRH5nPAyJURfhu/SPN q3y0yi6JpQyVajbOaqXeX3HOITTMP5KISr72kfLvKHFP+JMRhNMVVkPShBYN7KlNsG0B G83QbSbStfJSF6la4IctWzpTmqFkrT1oTwoDV1A289V9p5tUHofqBKdGw+YsFbGkFROM IRzA4J/WaBaerPPjfSnkOfLIh22PwamCSbDws8U9WaBPxt+M1gIeZivw7o+mlr/qwTlV JocGHOyig5fqcg5vppEUImcw4TMK/uX3FktEyaBTCUUiDx4awkXVWFET7LvUXknP1NoC f11A== 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=KJnkjmtEWkmT6rNz0PCjNm+0BYOObDANmvbIF8xEpHgXhrZYh+eT1MVrtwpHoTzjHB PCohqOfDoxWk+rCUJo7Zs5VEa+RhRI9HPtndlLGKJII2Ar0PHnNcM1/oYAe4qCVHEhCz vjLVYLMideEch24njBmm6ilMV+dDY/QRj27hEXSlCVJlBIYU3/Iv7M1lnpGFL1hb+p39 yw+E57CmmGDvJ0CsesGxQ0Jwn0Pdvits624C4Mj1B80MNbjzaQFiUQGqr9iWboXa8rrT rqlhTKOTMBJO8UF54sQEDC9u5inOT9vz4g4lAtxJ+O4gQTSrzyYKlt8spTWinSIY8BO2 xTLg== 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 s14-20020aa78bce000000b00528c2078042si127468pfd.6.2022.07.14.23.05.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 23:05:23 -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-137-75-214-37.mgts.dynamic.pppoe.byfly.by [37.214.75.137] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26F64pLJ026837 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Jul 2022 08:05:21 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 18/18] isar-sstate: adopt sstate maintenance script Date: Fri, 15 Jul 2022 09:04:42 +0300 Message-Id: <20220715060442.18063-19-amikan@ilbers.de> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220715060442.18063-1-amikan@ilbers.de> References: <20220715060442.18063-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: N/NvxFGyVsWJ 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