From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6878157486786871296 X-Received: by 2002:a25:a4a1:: with SMTP id g30mr3396910ybi.195.1606291428901; 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-Google-Smtp-Source: ABdhPJycg4pq++ZeKNJy7hWpUDSUL5e8QphC88RPwrR7XcUDHIqG6y4xVuezHsj2WpvtP/QbpKkP 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 Return-Path: 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; 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 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 Content-Type: text/plain Return-Path: Vijaikumar_Kanagarajan@mentor.com 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-TUID: L9MeK1bk9FUG 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