From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a19:4a57:: with SMTP id x84mr356145lfa.258.1601446069316; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7e02:: with SMTP id z2ls121090ljc.2.gmail; Tue, 29 Sep 2020 23:07:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWDl/0e31y8ghFlOWnH9mzXLznsw//KzLo/Zp8eKKXZ+eG3CpK7C+LT82AHW0O05L51kGt X-Received: by 2002:a2e:b530:: with SMTP id z16mr397212ljm.143.1601446068034; Tue, 29 Sep 2020 23:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446068; cv=none; d=google.com; s=arc-20160816; b=tg9IZBgZusCgCT7D6RhQEcfa/A5MvIl7755aZIw7W4N5Xls5v7IVBc/N0ui9x+0tlc 2ZfPenhmvzCR74aKp/dc3AOdsDSv9phMYQOwne6idwDO4T7OGddAiXLH7DpAtKWBLj+y d3JVlzC5e6XpsI/npUWyz+/pyUEi+VseiX8dtIii3YCmZV6gQ4AP7lQxfltfYx6FMG7P 07pu9u/UP2T7jkH4V/9BCZZFGmdEdppct+MU7YY33qN/2ykZaa6iYie10QIdBlJIVdjD QKorhi0mXCrVGkpsVSwwBiN/YWTEysoGQBFpbAPBlsSkQ48F/NYwkerbcw6oknYoNgHb yXCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=waF/cg0xZ8LCRUZtxCRDXkKPva0/PrQwMXUieUs+908=; b=N+rdI4z3Ho082M+tiVrI2tNXuSmcYytVg5Ti1ZfM7Ft2qZMtDdA0N4Wmb8vgaMK0/7 ciGsod8UY1tpXE8Syd4ICTkLbD7xQi5gM2PB357u4uaJcV8SK6cV9+eI2pe8MPO+koih N7cRylgZcW/M58qQSJVemfSlqDcZB904AkxH3HXumQarl8a9UEB00j7L0E8f8XiU6Hb8 HSfjTAtJcH99cYV9o6f5tdwbxV/Jx1vzAH6Qde+inETMRqSg/5fixZlaPbmzzFf7/f9u 0rPqEka3igOjm1KXNeDFZsu1qffeizGhxrbblB/ZefC4f2+d5YlwNTkjUjyQuSbLJ9ZB dWJQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Return-Path: Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id q20si14430lji.2.2020.09.29.23.07.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:47 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com IronPort-SDR: 9+mEpgsJr7iNvm5xwc8FZagkGu0bYiGpy9Rj66fbNNvCSN5y5IeHPMqZf1/xJ+RXiiSdJsxh8J LBBbZRdQd4VktaxBK2HjtTO2usN/yKre44SplctxSM0QlsVXs8/un5J3GbkzOf2YWlu1bd32JH T6HV32xqh0l75yPE3ZACHUZZhpm01Cs/35iujJjAkU8s1Q7rd+3HUxGykuNQ4AQedXHu3hO+uI zrLjRhAeubuw4ESzTfML8wVS9aHvWK9H/ASrAOdMc3PvPZc5Y683FnXQjerzzul2A1Dg7tRwKG +t4= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53547884" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:45 -0800 IronPort-SDR: acTowwyZPVTX7q65phY3d0srlOZaAoLQjheVrzPAwa0jeYPLtM6WIU6b2/Q8ZYPpUDUCAbCM3b eJjgNzbcDtcf5cINWqW8Jr3TwuqKwj1JslnyXGzPVEuD+nNPe4QZr8iyOv4M2Z4zajBT8aA5i7 So1Kevmugp09WTwc9rhxiYPahW7akvuqq3hFHtNQp+WSKb5+dR6A65wcXwC1iJxu3+c3jqQdse aEhY2Zc//zHhRlJyhsrSokr/1xSTYhz0uwOwtIVBaofxQXKe5QTuXwyMqYPQvz06tdFV1886z/ lAY= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 07/13] deb-dl-dir: Fix skipping of removed files Date: Wed, 30 Sep 2020 11:37:01 +0530 Message-ID: <20200930060707.12785-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-TUID: 5ZnVm+vFQDV0 Some packages are installed and then removed, like localepurge from image-locales-extension.bbclass. Those information would not be available in dpkg status file. Use dpkg log instead to see if the package has been used on the target. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index b2d94e7..a94fb10 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -7,10 +7,16 @@ inherit repository is_not_part_of_current_build() { local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )" - local output="$( grep -hs "^Package: ${package}" \ - "${IMAGE_ROOTFS}"/var/lib/dpkg/status \ - "${BUILDCHROOT_HOST_DIR}"/var/lib/dpkg/status \ - "${BUILDCHROOT_TARGET_DIR}"/var/lib/dpkg/status )" + local arch="$( dpkg-deb --show --showformat '${Architecture}' "${1}" )" + local version="$( dpkg-deb --show --showformat '${Version}' "${1}" )" + # 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}" \ + "${IMAGE_ROOTFS}"/var/log/dpkg.log \ + "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \ + "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )" + [ -z "${output}" ] } -- 2.17.1