From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6816610675337461760 X-Received: by 2002:a5d:4306:: with SMTP id h6mr2785164wrq.234.1587115865015; Fri, 17 Apr 2020 02:31:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f2cf:: with SMTP id d15ls1693474wrp.8.gmail; Fri, 17 Apr 2020 02:31:04 -0700 (PDT) X-Google-Smtp-Source: APiQypJduOpcq9E0TNaiSNs+uAKl06I2raOdYNhnvpO7JHc8J1LyJX/R+OLEUjGMKLNp1UaiEV97 X-Received: by 2002:adf:9d83:: with SMTP id p3mr3041317wre.142.1587115864328; Fri, 17 Apr 2020 02:31:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587115864; cv=none; d=google.com; s=arc-20160816; b=heJFN82xE3/oZhlK+5lVdOLYFU1ehe4PGBBNGsSmDhfQa9dTzq/XTqND26wyITBPQh Xc3jpvtzSK+N6N88MGYvd4HfZ2xtfwzmVLZn5Ml7R9kjeyYxe1ZEWPF53ungyoJ2wwl4 vyqewK38anfvjFkJuPOE6fAzZye3/Dy9J2NlL1Uu82Jgi5htI55mqwQGcRsy9yB2YcYJ Ky4cAhMXap9YyDMwpuwM2L0gXQMl87cHR1UXJKcyDneeNWyKuXD9XbKwTkBkcLl4OX2x pOnnLdK4JYOOghm/agxW1cToUHZ+xvN346qbLuKN65L5zMqA8vG8EBET49jpea8sjJSS rnTw== 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=jRv0mV9Ld1Zun0xJ4jhDbvubSB0vzGsoawUgnpIfhC4=; b=J0xJxZFsYUUc2ZYMh90gDM0wSzH3DO0PX3DtI/1rlyQV/2oiF28rnOgi5bdXeh8A8i SbDvge6FGYKcP21PR21C8BmbC2zsCkraTNTy/PKtO66h6z2hvnvNktlpWV+wIVIriaoQ K/U2hODR+SR+EXCQnMIfesDYYu1Ktwazv6vknXQqs4rMD1KnvuDp4ANN51K20H35DdlZ eYojoGmnYOQYr9foUC85BMGYQhfbKwCLvr1sB+k6Tw8Om22X2MlsfwjCqJ6k4xmbbyd4 66ZHudFIOfKNulMYK5AjNt002dT3Pa2fyl27Pu+dgaUN+XWIiIQzlHhmzGKa+Mk7QV5J CTTg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=FMCJnYvo; 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 s22si364356wme.0.2020.04.17.02.31.04 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 17 Apr 2020 02:31:04 -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=FMCJnYvo; 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 x25so2244280wmc.0 for ; Fri, 17 Apr 2020 02:31:04 -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=jRv0mV9Ld1Zun0xJ4jhDbvubSB0vzGsoawUgnpIfhC4=; b=FMCJnYvoqL4/9BZJpKsDnC4h66sPQdcR7WrysdsOWBC2xTF1gy+u/UxJCFa3sT6KPz 601YUfN8hChPAApC806boF8WRkCSlR46RGVkOHDrHO0xxXiGMlSfWPm4uBicDJOAgUNM zkALgJsQwx3nZZg/6tdZP6hJuyo7pFqOVRo0P9nIXG1h0ovvQ8CvqLzOD1LNT6bPKuNB MOW0hisBfJ8wnUQSujHvNyvENm9pQa0LiN+o4FW7jMcDQxL2brNVOMNm4We5ifSaC1tA 2fWrkHqDigdeMbzeD3yNs9UEJ4PSNqo9Z7VazMz2Wn+1H4CDgjBc0zucuL6cSZLjEJKC 9E1g== 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=jRv0mV9Ld1Zun0xJ4jhDbvubSB0vzGsoawUgnpIfhC4=; b=ZPWRjPHcAPDOq+Pfcq4BBtrP3GkV3o31ukAws0gvepFHBCFyM5EVGx4gTjt2mowmiN iTNFs6fePC0eNatbeSzZTXqM5vD/q39qbzRP0kE12CdittNwhio8KjMiOiMTzAoj/aoG nSwpdnHfOLHMZYybiKWO6q9gXjMw3R2FXUFNs/fWMCDFpFQNH3igf91GtFA/nWTqRhh2 w0jguUOxGu4JkmFm8WM9VCux/3WU9diUFk8TOBLxv4BDqFeMGE1/+gEocBXpqpm6ekz7 ud02ncZdQi9eqiwrYCJxp4kW1V/5b8yrsq6pmQNrw0RjzkGItLJ35vALgHHoATCK7xhe KAfA== X-Gm-Message-State: AGi0PubTslhaXSbqoy+St/FXEbHMpmsLK8T9rAu0Xyp5MO0p11O06xz/ SAPgiEVLvX8PYWuR8K89cSubhYiBt+4= X-Received: by 2002:a05:600c:a:: with SMTP id g10mr2444046wmc.153.1587115863703; Fri, 17 Apr 2020 02:31:03 -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.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Apr 2020 02:31:03 -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 05/13] deb-dl-dir: Download files only belonging to the current image Date: Fri, 17 Apr 2020 15:00:32 +0530 Message-Id: <20200417093040.15130-6-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: zQjD3hjr4Ki7 Avoid downloading deb-srcs for debs cached from other image builds. One way to ensure that is to see if the package is present in the dpkg status file. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 9399741..b3f4842 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,15 @@ 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 )" + [ -z "${output}" ] && return 1 || return 0 +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" @@ -18,6 +27,7 @@ debsrc_download() { mount --bind "${DEBSRCDIR}" "${rootfs}/deb-src" EOSUDO find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do + check_in_rootfs "${package}" || continue local src="$( dpkg-deb --show --showformat '${Source}' "${package}" )" # If the binary package version and source package version are different, then the # source package version will be present inside "()" of the Source field. -- 2.17.1