From patchwork Tue Nov 24 22:02:54 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: 197 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp150608oou; Wed, 25 Nov 2020 00:03:49 -0800 (PST) X-Received: by 2002:a25:b987:: with SMTP id r7mr2934309ybg.166.1606291428934; Wed, 25 Nov 2020 00:03:48 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606291428; cv=pass; d=google.com; s=arc-20160816; b=HDvC10yWh+4uN9ZRJijzHyKGZ5jzgitvztHpZq/Ud4JhSi8Nj5wsuUAxT0kTfkWj6K jwolNsO1THEELO+JXgNv5JV/MlUtEZj83OmnsvwGTd5L+CZhZDkKPPlcuYg63Qatg6s3 ki+rV6kIjBQ0jfaj96WdJz5z0DFZIohJS7N63Qz2LOnysqMI/JzOHLTja4J3AQ4jpoS2 LHztMJnzOmcVLm5DmUiR42w/yfhErVCXxkxIrf2zLk7wwkXqbB7ml0hvMZSD6p69VVtt oo/rhvBhfxE6hU9+54OWiFmzd62pPohPU47Weyx2ZATsUo/Rr41nVlrU7KyrvKINGTgv RVfA== 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=eLWGmKfMMRxJ2goJIO0bqN3B80WQaozYGML/FZMP+aY=; b=gwZ8soNOVEBDQVeWAaSThZPmeVf4526575vQuWGctuGq5rgSIhd+K1OfefAW1dZDi3 iMAY1edJgo2n8ylt1ESdav8o4Nxuu8CVdi/sIOljpNby6L8t1Uc+zNSzPsvww5HHmhQC 2rXB/xZrw763vssqhtCuFROAAIJpHhJsR8PIodr+OlqZI2ll/bSZjtnS2ht/HzfvXsVY OZu+VjpQ4zrgfTr+E2ZgqrnO0QjaLVD12iPOzgiW7fZrak4FcdoUieQEv39Y+Kj68//x EsgAwCWPyCiNK33IvButYC+ILEkF44mcJcyAqx3A0THyt3AWatOvpojY/OiXSZpgQcxc KLNA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=BriWloqL; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbze77d6qkgqelatk6hy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZE77D6QKGQELATK6HY@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 f22sor401649ybj.41.2020.11.25.00.03.48 (Google Transport Security); Wed, 25 Nov 2020 00:03:48 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbze77d6qkgqelatk6hy@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=BriWloqL; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbze77d6qkgqelatk6hy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZE77D6QKGQELATK6HY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606291428; cv=pass; d=google.com; s=arc-20160816; b=w/yI/ZCJFTpgXEPd6EGkzFiD63/ZykZ+w8tN9lUfALsBVirue9YuA5xd3BPD8KQuMN e/kXpWCUGAvGrNp3SPXvif8Plpi/odR7Xy+mcGUhpNVY+g8/B7EEc2l76or5Gwx7cw++ cQ2L5ONT7ZM1loZE2PhU8C/mzBip/egWIOEmnYTTCnM2NWyJKl0oxJccDgQvDtTA/xm3 lKsnI8LshHiiDot8w4s6usfjq0/07L1P6WQRL7YnHA1XpPy9BNoaRguuSg/13quHg/7P Lhn4cz2M+BslEba19vk688/dEy+nOky8AkzfJYEIjXQY67d3aZZqiG/gj3S8CZ7A6e2R yr0g== 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=eLWGmKfMMRxJ2goJIO0bqN3B80WQaozYGML/FZMP+aY=; b=sRcXIYHBPSSmFsNvHP53/nxtG8tvavBnIjHmnaDr+J3p5KNEqqbzt3pHXjyE6J2uaJ AEyl448FEWynQxfD2staMfgZBvHtGYjHE5u821NBf8WDOVmSIOAfGHZg/+sAVNuwRqK+ u1Z58vN/MsjINcrtIXt0X8hfm3OAIGJBl6kh0TeCYXGVnBtK7Dhii10oMzsDiO5MDHSC RmcInWM+VMrLMLkXxxYO15LYH0vzenYmaGoIroDi9Ll0JPlnHAEc3g2gSxhWIcE+l3Wh YEfmvuQEeUp0z1Af2bpkpr5V9KEfpWGjcuTMuXbkXwshrQjQXX00zOpfL7faXgqpYul5 JD/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 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=eLWGmKfMMRxJ2goJIO0bqN3B80WQaozYGML/FZMP+aY=; b=BriWloqL02m6w/gp9z1Wn7ppmQwhb4tc8HCAqKUgKRnX9DNGWgvSEBf4YBkJiQO5Ov 26DUwJB96FfiYJ82rAA88RAR7MYgVKfJVvHOZP2xcufxVAH68ExjrizJe3LjpymjY91r 3vJANo6fDliHxcR+lktQCbC2ahIl+RLoDvrhWqhoU2D2Cx4kDhbX15YPnGGGhth/imqE +qw19DJyGIkPVse3Kj2cx4H1x3qFEitNxNxsAeSb1FAxpPCGxT3Km2Nh5gJ/TIZ9He/3 CQRBtzb0WILFwHnCW5xkQ2wgFmTWXldDJr33hFCzJ3bhKIxR5DiXZ8vWVa+TDK1PguVg hTQA== 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=eLWGmKfMMRxJ2goJIO0bqN3B80WQaozYGML/FZMP+aY=; b=S9Rjq+XNetkPkFNwZzuD4N+LCGDWLsCfOuefCukpC0AO71aIABe9XKMlpjS7RojZU5 SvgaNRERVVvgq8J/JY5DZnf2cRINWp1DXc5bNM6q0v3ccPkvqtpkKguCBbB21T0sL0Ta 3QkbKk7Jci7GN2gSYqyA0fK5PrqQ44XzGCEuS+PbN9rwsKuO9v21TyMflsNDxr6d2EDD Ks6lms/6xvn+aO+F1kXl53qWZaAMIli5MywMVG9yxmG2mqLIGvx1/aiXvUVnrmCDGUCC o9RNHw8bCfRviomfcubXsVAa6AFGSksHzoFewyb/RCimWo6+FRREXfqbLyY/PiAQ3zJX SVXg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533X18mcN3XMGj3TME6p8alSaHc8MvLhsXBI7lp1b5HnHBd37Wuk qJZozTAIOkw6NxgQq4GJ9Ps= X-Google-Smtp-Source: ABdhPJwInYyWi7RoVSsTTsNctZ4krSZi9X9LYRVh9cD9bd/r41rQr46dahYe1y2m9fEeyHrLF8JDcA== X-Received: by 2002:a25:cf56:: with SMTP id f83mr2194466ybg.54.1606291428778; Wed, 25 Nov 2020 00:03:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:344b:: with SMTP id b72ls819932yba.1.gmail; Wed, 25 Nov 2020 00:03:48 -0800 (PST) X-Received: by 2002:a25:ca8f:: with SMTP id a137mr2796130ybg.59.1606291428428; Wed, 25 Nov 2020 00:03:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606291428; cv=none; d=google.com; s=arc-20160816; b=h+LGvL1Wd0BB30e0JawpJpM3FmH2h8R0gybEhzYFiQzJ28xuF7JQEVfFlUJtSs8cMK SIqH3UVNt33wIbL39PrXfYvXH9mjTsVZTLqHyA4x1k8pAUdoGwofg+1Tlxw6nlIB4cTy +tBdtlYLkTZByJwzaGXq04sBmJj0EC1/Fm/IF5E25LjNWStwGvo6PpdO9uvwoLt9WyKk /HO8Sq8gxtp0nQSJ3wPYS55E8mBCXfWVL7bcenBmkUk6yIdfIXBt7CUgWCSCJZAE3ht2 5FisTEKVTsSbC1+qZv/b3dzFbjLHtSYDdw5Cqt1QRcu/pt8DOnQ4GPILXAzBrnfURyK3 4xRA== 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=e7OeW0yS0dCLrPIAHHf5RwZp9boDCT/uavaU0PQM24HWKn2GUUy1paAHgPllBjrv3M 4VCn1c8jXDRzdOyXDL13ogO0qODw6ctgvrGt4PMA0q/HBETg4MngWnptak22bNM1NvGk /WqTJ3tMJt6+0x9tF3EMQpS8+pUzji58UKDKFrVswLqh51rDC0p+q5JYvgNLHsk5QwlJ z091ebfhMI2XW9xTqor4e+sb5Dpa8NuvHXvBG+WuSQjjDwx5yQkPpUueJ/JCfcDcXKcS joRUr+ZDMBiElnu4mb2XxseQjKmSRyGfX4EzaUWFJe7eiG5tELuyAFusGWG5AGajj/us ifzQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 199si77218ybd.5.2020.11.25.00.03.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 00:03:48 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: VsyuJ7Xk/3hUIsMG3hVKLfrpNCHfbCcfDhayrbOlwVOdcJdSSxb/AS0v7uhCVrVLZbVWWoq+Sc c9l5FeZn7gPeN4P2rW9xTTypV0rqY0RwFr96gS6ZzkAnbiZsfMV2TGzZgcsmO2jBeaSPXCyVJI ausCCWNNTY5l8WEgnFCqtPcKPbYB3cNvrpsFZQRAGcEqp9fU5UeQd0LAxt+dLIrXeEoh4/ViGm k7ZOFgeVgR3AiAT1wgGQv3qTzAbzo2OluZPZjO35BUCyDiCa1nfdmz9UCrKnag6r4KH1ZMpa7F /v4= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="57762485" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 25 Nov 2020 00:03:47 -0800 IronPort-SDR: YxFhX0O9sBj2cNHrGQa3oQ9JXG3jnLFxUDuvUi2N2jerVYKEFNjnVHayLbM9pB9S30gCKUcoz7 dzL8uU/egpskTUdjN3HAclpeqzjNe4ktfcH03HOu+qHp0oSJBfFmiX+dc1qwLT8g099prWHya5 TAs1eVf8KpPubaUXR2EiW9ZyFEktGao2qaSDwv74KDR5CccEeCFXGNRNl+OtNlapRAPSVQRdg+ DHudFBj2W8Xn2Cu+N+BG8hk1HCI4U01vdzQ3nD5EhPtSLi4wOoVGpi8sLoZZ4gzReyQ/dswxZb Ao4= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v7 07/14] deb-dl-dir: Fix skipping of removed files Date: Wed, 25 Nov 2020 13:32:54 +0530 Message-ID: <20201125080301.15818-8-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125080301.15818-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-04.mgc.mentorg.com (147.34.90.204) 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.129.153 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?1684318641800695697?= X-GMAIL-MSGID: =?utf-8?q?1684318641800695697?= 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}" ] }