From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:a2e:9186:: with SMTP id f6mr418228ljg.85.1587115871023; Fri, 17 Apr 2020 02:31:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a550:: with SMTP id e16ls294645ljn.6.gmail; Fri, 17 Apr 2020 02:31:10 -0700 (PDT) X-Google-Smtp-Source: APiQypL90mzw0q6Ep3Y1/ERWPevF8NTGkCHWIPXQ9g5M365Y9cxsLDhMhDwEYr7tcPtNIzezBaUm X-Received: by 2002:a05:651c:3ce:: with SMTP id f14mr1587961ljp.98.1587115870155; Fri, 17 Apr 2020 02:31:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115870; cv=none; d=google.com; s=arc-20160816; b=MJtjiVqGBUj6GBRXmyISV3ldypQu+65b/oF1p4Qd9ZrL2AmTan7gJHt1CFmSvlUmJM 9iv0zqeZVj+uzXBBqoPj2hCsteJlQ3M6EnS6I9sckD6AD348XqBfwfH2zNBlXpBQZleR /+ak7m6pPexRBBA9jt/pZz7xYnJdr/Lo8Fk9j7+3PZYCXPVKCc/BwwDpt/Q0uBxLJ07i rcv0n8IdAcKXYg58Y/5orxlERwzUKwYGsOgiRbzQPrRDgshCnj4JOgE4nMnMvlHW80yx d3yaBeutVl+cmFSWL6675oqR+u5XRznZlcAf+E/V6orKL8PdVjls00ccHko5g/IlOdBi zzNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=BUd9gBFmB9ute6nHxLQh+EOtNXiWLaPR00qguNCuFxc=; b=oRRlOXGI5EBiIQaGgoV7yvOTBa8yAc+HixLwlRrmfOQswjd1VwjK4X5e8z9AnkT8iT Ds12pOlGLaB6pfgWVjK/hZjaU3ftniYJdx2awN1S+cQfyyDVrzU/0m0g6chVw0q6nqjU bA8DfmkmT5ti8kGrlymBAemkk/2z4dgwRyNYetaDnSq2XTq0dXJgs5Lr4ay+Cpc3lrxD tp6pAR22LstuBAaIrvJ2S0F9xKSkByVGUAu3hsWPYMaJKb9w6XHe/MIZ5K15I35S4uLG llveEnwjP04ylo3+XSAg3UmWGTfs66EKJNKKTS66raWkSCK2qeSaG/LcZ1mRVS9rD2sI sn/Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DHFsH3tR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com. [2a00:1450:4864:20::344]) by gmr-mx.google.com with ESMTPS id s22si1040372ljp.0.2020.04.17.02.31.10 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:31:10 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) client-ip=2a00:1450:4864:20::344; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=DHFsH3tR; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::344 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x344.google.com with SMTP id x4so2234033wmj.1 for ; Fri, 17 Apr 2020 02:31:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BUd9gBFmB9ute6nHxLQh+EOtNXiWLaPR00qguNCuFxc=; b=DHFsH3tRL3Ir13UuhUGTzjwnFppuzcTTBj9I8UAKdrY+vjEG0/cj/SGxQdcs+Qe6oX 9MoBGOomsysSLKvCZr63gPOOZXAxrIwrj+gJoBH+kuh735A1U4YNezvWL+HzBd4fxe+s oHa8nuzBfLeQbOb97CnZ9D97Qw2ZJ2Pzwikzyx7qdEsXgACnKRDfbOgwEKUUPMcyxA7c dwegE91mcg7PbZoHBlB1vzJK9VGhU8fuXnLBQql/nE2Lvl9o+z/H/6kGi5aC7OqWW/bC 25XsgWuQZHwOoQHi6U2xiwHluYx/H9mV0lcXAiX7Vm9tcmloFGi8WkGEH+sN0LyAcNvs 18jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BUd9gBFmB9ute6nHxLQh+EOtNXiWLaPR00qguNCuFxc=; b=JDBXCiaBlfZ57ejxB+a3TXURe5EHqQ3rRDYq8hpf+3tsam6xd/ZClMlTO7b5GCBQUN vKMmTtuAETLSOgbJtzUK0rGAhnT13JTeEndW8dFyFNjqGdW/OBTlE3qR8cvBUQQna/Tp QgOmbR+1dJYtF7mcnVogESaPLHCNGJhRLaF4mt0G3naAD9eoefgI2FbGrLPKK+HNzDCP 6vIML0gnYuGIRq82NiBwaDQlbSNuP/7ytwoLU0TFi1d2qFyPZkd0W4Qku1q7h8clA/dt 87v2Y2+1YbbXg8pe/Z2CISLQXwHznjtOiziJaz8wZf6rnPl3xP3+Jz3PNWhYrLgmIDCJ YPRw== X-Gm-Message-State: AGi0PuYFjyGaUVz8GyHf+m2po05Sqx8qspNxNQ/LytEv+jsLz+2ITGVQ Z9e8uBVL9Xrv5D94qNcLn1Ml4GkTqWQ= X-Received: by 2002:a05:600c:2255:: with SMTP id a21mr2460313wmm.150.1587115869269; Fri, 17 Apr 2020 02:31:09 -0700 (PDT) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id l15sm6836256wmi.48.2020.04.17.02.31.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:31:08 -0700 (PDT) From: Vijai Kumar K X-Google-Original-From: Vijai Kumar K To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, ibr@radix50.net, jan.kiszka@siemens.com, Vijai Kumar K Subject: [PATCH v5 07/13] deb-dl-dir: Fix skipping of removed files Date: Fri, 17 Apr 2020 15:00:34 +0530 Message-Id: <20200417093040.15130-8-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200417093040.15130-1-Vijaikumar_Kanagarajan@mentor.com> X-TUID: 4P+gcNv/b2aJ 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 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index d53d4ae..2567183 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -7,10 +7,13 @@ inherit repository check_in_rootfs() { 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}" )" + 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}" ] && return 1 || return 0 } -- 2.17.1