From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7084101336361336832 X-Received: by 2002:a05:6000:1689:b0:204:19f5:541f with SMTP id y9-20020a056000168900b0020419f5541fmr13168878wrd.704.1649395873872; Thu, 07 Apr 2022 22:31:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls777595wrr.0.gmail; Thu, 07 Apr 2022 22:31:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKKHiWpLo6pontIdYlnxcF/oeEWG05spcb6avtOYwIKsvo21ETciFZyN81fttw9LAh2S37 X-Received: by 2002:adf:f80f:0:b0:207:99f3:eea5 with SMTP id s15-20020adff80f000000b0020799f3eea5mr172571wrp.260.1649395872911; Thu, 07 Apr 2022 22:31:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649395872; cv=none; d=google.com; s=arc-20160816; b=dQV8Pg0AvNjpd5WXXfkWuDAcJLdWOV/CJisOV1IlN+HS2JVmAFsOvcjfhkuLgKLYUa UbsrgIZHezn7hE0EIIhcpKSWKFLz/DNAKlbmToT3Uam5DNdmxqZNyn1nhSYc2FHScFu9 G1vMZSsUzLg3bWe++8Gpm1f6m1+X9Ogu7EZzv3ChcdgFaGNm3Ro9VZ5lcxf6/bDOFmpG tPDXajKg9gQuHxtX7d2YApHVtnNrp4uHx0qToEZfGWyHgZdCN1VZdcPiCrsCFw5eb+YW ZFnSa9gFuJlycXMMCwxobN16XYfuBY6dag/FhZm1KrcyR/KJVLb7FVhF3vifnYQO0TQQ GWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=rF+AskxanBruy6b3OUETmKCFbZoKesmKnOa8loWVRnU=; b=Njo27ypLUfRPgb8w8gFvqEbFZj159Msw6qMx3LQOBECnaius0Ytn+aBFjDLAr813zC ABG7uCO5cNfWf4NWlWMnC4QUULBkIhMOyLt0gYw6i05d7UTvc5tNc/xo4g8FP3SNGHf+ c+ZfMipn4Wl1ntcAH6hMcUlm/23SsIGcMoVhV6GPi9/TxeMePs/9wnqrT4bO2v0M1M39 gDsDaxGzzmStpD5iq1mHIhH8K/84+gtXjr7kmyzCz98tNTrQyRA5p8hW1frBB8js8UF3 sFiiu7QyXpty6ezCycuRq/V2Qx/uysdyF0jshiXbnLyj3MC8Ug3/xHQ0cTW4b1/DHDiQ 6yqw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id c2-20020a05600c0a4200b0038cac42709csi282351wmq.1.2022.04.07.22.31.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Apr 2022 22:31:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 2385VA5N006475 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 8 Apr 2022 07:31:12 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 3/3] deb-dl-dir: grep exact version when caching source package Date: Fri, 8 Apr 2022 07:31:10 +0200 Message-Id: <20220408053110.10416-4-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220408053110.10416-1-ubely@ilbers.de> References: <20220408053110.10416-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: yHmsnpKH7jpw This fixes false-positive detection of package belonging to the current build. For example, version "1:1.2.11.dfsg-2" of zlib1g package matches "... status installed zlib1g:amd64 1:1.2.11.dfsg-2+deb11u1" line in dpkg.log that was left by larger version. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index f49f1c2a..eace5102 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -12,7 +12,7 @@ is_not_part_of_current_build() { # Since we are parsing all the debs in DEBDIR, we can to some extend # try to eliminate some debs that are not part of the current multiconfig # build using the below method. - local output="$( grep -hs "status installed ${package}:${arch} ${version}" \ + local output="$( grep -hs "status installed ${package}:${arch} ${version}$" \ "${IMAGE_ROOTFS}"/var/log/dpkg.log \ "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \ "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )" -- 2.20.1