From patchwork Tue Sep 29 22:07:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 99 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809458ooj; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) X-Received: by 2002:ac2:419a:: with SMTP id z26mr277927lfh.537.1601446069593; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446069; cv=pass; d=google.com; s=arc-20160816; b=mMolJY8j3D+KNM0mc+HNdNXmgPUAv6Sj+bFv65DT92geZesEpMck/+lyA6QeA1sOzu n6gJ0QpvvEaPXveJuhHdesUJYNM7JmM9t2ZMC3QMDpSO1eJCiQWH4jOwMxqGxcxeoRlw J+GTApVfAP2SR4j4t/I6p7OwqaS1xn6uCX8KMfSx6Ja5+VRNuBtITSUnoQWgXE4yuTzY gZPpZHRTLgk6DaydhEY9bumwnlt9ZuK3oZSulU0RvcXIBEWKZ2EW3ulnTS/bN7y2spe4 v95Cu8LkRR/duTKdZNF8yGgqsQ6fkt8ii7UGA9A38qaX0ZzW3nqCFJsaiFFZz90iMjXB 9Pjg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=BJzkTgvz0j587Yn+E/pp/btAgGUf+5zyzlGL64UvrIz4+Bs1AtmJgbpkYcCKhOiwDx YjYQ8lfTAE4t4XfQ3b1be0kLjIZjET5vLnCRY63W7nMTXodpX9yR5y/xQATRifpP5znp tobsNW739Y/4kmVuv0mQtVGZTKjJjDEZyG2CaQ2DtuITMqPeCKNa5tPFJffrfLI5b8N4 by+ZrHFgtSDf4HaFJBpjFlBfRiRvSJei6X4CdG71F6S9FMGNOo6PqvRYcZXEv7bDeNkH r8ll752PPdvVWpMafdtMK8WgoYvVg5iMksEAWVYWAqYB2DVwXXpbp57Wx1q5Oq35Su8u +84g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SgbzSYPh; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNOB2D5QKGQE2AYFVSY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id t15sor122399lfb.168.2020.09.29.23.07.49 (Google Transport Security); Tue, 29 Sep 2020 23:07:49 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SgbzSYPh; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNOB2D5QKGQE2AYFVSY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446069; cv=pass; d=google.com; s=arc-20160816; b=n5dcm/BLgl6z6WINr9vobvsYRjYW2bmQkHmBCBXxEEC/Elj4HQqiTNKnv6m919px7Y zAf898cW5hA5dqOG0cOYlwot/RBnvt7plsBpa7Q1F+KrbFiOAl1d3ENrKTQOt+DBtzdB 8Viq74Zrsyfsad1mvHi7YY+Zrt3aZeb/btPQKcYSSRRlEqCAIoy2QvAgGjuOfuiX7hEV b9xH8cJXIAut23ipORn8st8F2LrKDxMD9kJE5HUufENvzinL0/WLAj4qF+lToJg5+8SJ A9S2N1pLIgThZl18MuEh8LBrG5eeP67xynGUJyJWvS6w/T5pfVAAiIYTRWzsk2xEekN+ e3gQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=DokNwK6gZeYkwXCjhFgiTXfnPcv5f+maaW6wle4DEQ1wea5FNxwAwQd8ROZPdeB0RN bhqL5nFk3cIn2ZD5KUxRWuQxtJPfpSqCLpAgKpzbLDMr5ZHIXrF0m9n4xNx/WA3SaDWu ZmGOy1ibVajxhBKsIQvx7kcr24bL6WJKVGMgb6gpyQOKE3PQsMMHILIAVlJIBFRzW2sW A/o1y8SB5kbEagf+dgBeKD3nlppw7SVZASEOfPzg/cGWjohTjDpf53RvQ4kp+DJ+T0hz JzlEzyabkqdRJzTkNQPrwe15FKcn7evZVCUY55rxfOCLyQz55fPI6Uvm/92SPOXUulbg F5kA== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=SgbzSYPh1lwwWgwTfE+lsHfxmoBF41DHARIJCiHwbxx4+WeQ06Qp11hRRh6JywiaA6 DiWH/GVkG5xD8yrOJeZ1aya+zud0OrYXz7ZQMKFZJDA8WdQpa1wiSEPLy2MP3/qEraAo lbu2tRSmrqJwui10PCZcA8J6o36j3WsGorODHTdWGedt3m0fdHUhAv2gtNabI9Vlp08N Q9byijdVBUc1YtOeu+SpOiU64c970mZjN4RsBlbCTlneZPQNpQFtInf5QwRe13aezWvE O8UAnjSWDk/2OepAYavtZlcLaZqdntbkls2MLl37zZWAuAIpnP9oTvdxGHeul5sgnj/q V3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=dgyXVO49gg/q6yDTAIinXfUAeGHpDFvT5pK/EwU+QrRO5lMbgA4aGvWW1Cve1fxsHs JScoa4Yey3vUxcIC+qZbT445DVCA4G9Z8T+oZECHvwE7xcdvE78QbdaAXQz/2sJxf4SG sJxRPe6XjHm9k7lHUL6mCwWK0MWOp1u2xxp6G0rseXF2UY2NriCrBp4JqZAxLkBStsk2 xWBXLkGYoPWZT+2Q7aQUZr2gL0seygGgO9jARX6MIfJTd9Duz5sHvEVyEX+Qajdvk5F7 Rvg9H9UWIpDtJAT617Xr2wYIuAJZwCs21eEmeqfLaV+Hd+m4B1JFu1hOxIZhjrFGEA4P JA9g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532hEupnNEIXfJnJFGuI2+B1n6Xccx6LeicQ6pPAb/ZjbnZ2j+hH PHpzft8Gw4EmWMsOo985tzU= X-Google-Smtp-Source: ABdhPJzwPkd1qNsMPL9r01O8RB3Fx4q6bVR92hrQfKcrZGOLXKABOu8J8M5gtYSDWuxD876W3DOmWQ== X-Received: by 2002:a05:6512:2101:: with SMTP id q1mr333839lfr.157.1601446069245; 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-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 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; 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 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-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1679237913633404172?= X-GMAIL-MSGID: =?utf-8?q?1679237913633404172?= 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}" ] }