From patchwork Thu Nov 26 08:28:11 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: 244 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp1569338oou; Thu, 26 Nov 2020 10:29:04 -0800 (PST) X-Received: by 2002:a1c:c304:: with SMTP id t4mr3955154wmf.53.1606415344410; Thu, 26 Nov 2020 10:29:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606415344; cv=pass; d=google.com; s=arc-20160816; b=kAiPJ1QyPxxPbVseu9VfRnWmsmBEelg0lyBN8kK6NK8Et+SKSJOYtS4y1L1Aq4hW9x D7htGoqAVrIq9V5ljpGyKwPaRxq+nC7GCILuL6b8Tx38s8b0lZcmRVh/QT6IV/MZhahz BG9xkMZMa/WGOe/zVde+tNVVaaa+7a/aCyPSWY6fsY0SfKlkFXkktX4YQw8hg2ks2fFn L0Sn0Q82b/4csldallsXovkdP4IfZ/wGZVOkwO7p56LtO+4IevRfpdo6BdlqM3gsOMqc VFokSxFJXF6R9ZNkowQ5IqwG6zVutFjqvz17pF3yyZ1dXy4+uLf1tiERWnM1ki0NtJjn RvCg== 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=rW5sDMn2+4Fc8rU5s5T4fLubju5BwU8M1DDxuCzeo8c=; b=BoMwtCYF9RNctV1AV8f1M3r0U0gh753Rwu2/vdUFn1SWgOrS2kx3lIavhKctSz93Sk EpNPHzZ8TCxGM40wZyq0/ZoJRWyGOJ3WjCEBjioPe826CV1EsJ5AlAedtOVzRYUWQ55C TUaydZxx2G+8Sf/8HbF1ldb2VH6wBCbBIg+ohOrRxFIzhVvRooOmkG6Nkn1fHp3SQ2jn x1OnIyWbJBh624LJqI1fOsGBxi0j4es+5uHqR1aqi2oJZpesYNeuyPMLY8kx84AvQVZi LQUZT9Xvc0DurAK4dz0YM7cJc0Vp94ktLFcxQ7FqeB59+0wPQYwmkTg7V/fokTtZTRnL SI0g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=fsNDP+4m; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb37h776qkgqeu23ctvi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB37H776QKGQEU23CTVI@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 p10sor3246269wrw.43.2020.11.26.10.29.04 (Google Transport Security); Thu, 26 Nov 2020 10:29:04 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb37h776qkgqeu23ctvi@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=fsNDP+4m; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb37h776qkgqeu23ctvi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB37H776QKGQEU23CTVI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606415344; cv=pass; d=google.com; s=arc-20160816; b=gv4CBJxqriYk0H+TI07eDaW5r/RUAMRD+FSiqdqQdhoCLYi2pP1MvZLQ/vi0sAcu2u b+NlyIM8olBui0jO1TFUsE5IN2qdnnWKf1Oib5bfoUHtY4Dpds/EeE+8nvjdcpm8zaWd J3/9Y7D+URVHRs7XpEN+EeweagaNyRFCw/r3VcVtOiM3EhDSKVL+un3YKXjDan4pz0Jh BIxrl6Xm5ftMNUvbAOGkgJHgnsSJdFQ4IJv+yXClkjevjHQJTkGDxBXvkBe82Sl2fzZy rCNGGuB3zQx7gW6adE7YImaGFtMKvrQqHTCIRMmeBxUkSeu33a8TKloXSgVJDnecz0cK 03PQ== 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=rW5sDMn2+4Fc8rU5s5T4fLubju5BwU8M1DDxuCzeo8c=; b=JYhX9TI6oI+YI43Jdz/McsBfxanG4VwDHGXXey6q4olYHTYB1eLtxnjrkg89t1FZCv JOwp4EdK1kgrEIMN7JaWQknoNWtW6hB3b0b8ZMlaBDVGVpD4TPf7jJCTyJSaXSL7TH0N Sl+0GvzSBQAWO4Kq9I3y19E8hXrWQKJhJMh89Hbk9ZucT7gEiv06UnQ5POqc3YNnyxgU 3Aa9dFlDolVb/2V1Lx8cuY4j4nFZR+gO6WtUmB8mJAHEuXM3TVKLePkKxROVM78xE6wg iqGVJwkgME9WowHemVK3T9q+bO3WDcjNAepBx2gUMLTEQN1pTxlOoDLlJOgzotflAnxp k61Q== 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=rW5sDMn2+4Fc8rU5s5T4fLubju5BwU8M1DDxuCzeo8c=; b=fsNDP+4mv54MrTOj6ZFGJfveTLb30cFI6fXedsz3vsALWcU+tOIMS7BQGD8sIfA224 rHcHpIgj+0QjvJXdX2nc6RIJO6FfXaf8NCaXgM4Y0uMmvD3uqw4lfmiYoUf4wZAFR2yn mHoMea1QhSPGtJ1ojJrT51U1ghNk7X+phlTE9927oed7D8UAKSefgQ8OGwC867AMuOos GDleh2d9jwaWP4NxrQ9x69JYDGJnUkVhrLHco+En1Nojr9tvNr59kkGNEiZ7GYjI+rah B9p80g+JsVKf62ABAcG5HfY4UPcoX5H3MHVEccHwnP2aZBb9I6vaW/p5/UBl9DDJdJRM yW0A== 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=rW5sDMn2+4Fc8rU5s5T4fLubju5BwU8M1DDxuCzeo8c=; b=CmekQtr+kEO4+NJpPjZpjytYMcSxiK0BD8A/CEQ9gYvkZtLqVxV6ORmtQ/emK820yQ p+/KkCShIqcRNNZHnybg7Ds348Qg2dwnuKsCStlcNKxZt/g+Zn6y2bRRPdY5FBw2C5DC N3slwXY5+80M4toWRanbrCCbdl9b0k3Kzp8Dakwvpb2YMO34HJBLow2qEW6GoOe9ZO0p AjuGRQf6K/iXmMCVLXBYF7oKtZOkFTGvovJKxU7GOGIPEYKlrcYvsO5I7IFb1zIJ3sXK xYap11Q2MQtIng3oNFo6YARgXIQIJlHvMnzJ/OsHmkCNkH1nRBOW9yZ+m4wD+d2xW2yL t2hA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5336FQZ+Au6f2RC1MVhxAiy40zUGxTxNSj8S4e8QbMr2Ge7oQYKK sdWo3DZNUrH6Yj/t0nXkLBM= X-Google-Smtp-Source: ABdhPJzkUIkVPRMMalP6h2+YXVqm6C+qqR+4X4jR+G9d9qs0+aLCRUKU7SVkMtj/O8LS8dWwz2X8xw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr5547529wrt.312.1606415344125; Thu, 26 Nov 2020 10:29:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a4c2:: with SMTP id n185ls1357672wme.2.canary-gmail; Thu, 26 Nov 2020 10:29:03 -0800 (PST) X-Received: by 2002:a1c:808d:: with SMTP id b135mr4672215wmd.45.1606415343351; Thu, 26 Nov 2020 10:29:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606415343; cv=none; d=google.com; s=arc-20160816; b=o5rzTulR/JL8YFsxX49bUzqag3A3seR9TWOLWKCzOFUTwkx+F1eXDynWW6XBeBWdQx HlQPN7TlfkbYDjhfVMNa7644ZrqtFU2hDQk6gVM15UH4vJuEG/kFySaDT2c69TBVvprU lrh/ziq7W0zn9WNKbasjaSudCOd818eTyShnnSoOJFTt9t24EM5OlXvKPwO16vSfio2X BLiz3wnpV4LBA5PcPESHk3U7PREYF2fKiXxOFttGOBc8wnizbL2kNmeoylo9IqPvxsWt 9XXpP+8fp5+9odZlmJzt+CCXCJ9rvOyuGfcwJXjyhTY3jnQw+2Ol9Fl9+0bRy8ZlyLj6 IFIg== 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=nnvtzJhMc7REDutJqhVZ622UWfcDQ+xCPG2UXd5Ej6A=; b=REW3bioEL1FVGVQfTgrFbHFpwynA6jBg9eBHQXcWQaWEv+uYXnzgXbhdA7sm28WZ3I AAJyGkHE73Pv1KYaXjoxUPudcp/KGyt5cY5gGHusaGdAHUjKElh/NlvOgCR3uvZ/9zRa xxJSZg/tv9u4ZS0VK4eDNTdstQiZWvEKuFB0ruKOsROa05p1m7fCMukyVT/6Xutw7QzT /zpqX4fDLYmsT07bvbzU/yIHGcrhwARGxig6EgVbjv95ELR/qLe/oGWgWGbicNMBp1aN /rLDSiLol5i6eDm7xEdgV7Hc+ZJO9yCWQOes2c2JH5R37nuHj9qgVjGHT+Ghu+HD4UDQ bV4Q== 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 y187si226499wmd.1.2020.11.26.10.29.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Nov 2020 10:29:03 -0800 (PST) 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: kANV+D5EosgT+Wjer7igmQEDX9QxNt3bImqyzK/+mAXA65XnV+nCOrCFRdKIZ+eFjKPGqb1jo4 LrLJVWCGvHHaLuDtxGAx++jVa9Qye87dKZYhH8BxIAdLt0i4+0Q0Y9aIIGZTD8lw9exx2I4+sv 66YnEDcPaOt9JpfKhDyxyUk4DqMUjQXAsk/HwoBpn1rN2f5E9oxsxOJU1jGPYwB9KVacjNjJUR qPu3o+1vm8ByPntndxjSoyq7tUPohhrMYXrefmI2BqcKeOxMbWGqwY2cV92D8o1FmHJM+dKRIX 6QQ= X-IronPort-AV: E=Sophos;i="5.78,372,1599552000"; d="scan'208";a="55644677" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 26 Nov 2020 10:29:02 -0800 IronPort-SDR: EbtxfevqnDUKnUmS+VoyzPOMx1sVuXqtocERArTRvBdfSr3zNePq9f/QazpxBgEodMwnD4TSST nApcJzVA+swiCq2noNBWryjV3uDiFFpLYbra5sl24jQIwDvlum5EKIcSQcJ1TylGXYVCKTCPfu 0kgb2IW/zJgXeczIsY1E5R7vaCgkyBZlUK6zee8Ur5W+Q6LRmyTDKTPj4SW53m0gqa2GN3VjAc EKFqnwKM9I9FUvZHoyOMPDtt/oOcIpkXqEGUCIFoftuQqY3jWDa6XAELuW6Lv/lp3TKS3vFRmN +nk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v10 07/14] deb-dl-dir: Fix skipping of removed files Date: Thu, 26 Nov 2020 23:58:11 +0530 Message-ID: <20201126182818.7261-8-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201126182818.7261-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201126182818.7261-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.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?1684448575961491291?= X-GMAIL-MSGID: =?utf-8?q?1684448575961491291?= 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 64d1823..29bf45b 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}" ] }