From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a05:651c:110d:: with SMTP id d13mr5433717ljo.134.1585230217984; Thu, 26 Mar 2020 06:43:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5310:: with SMTP id c16ls1190609lfh.1.gmail; Thu, 26 Mar 2020 06:43:37 -0700 (PDT) X-Google-Smtp-Source: ADFU+vsFGAft333uTK6nCtkKJonBdWpaWpxcLEZuAyU5gDkUEh87uB7EnBCSks1KvChMnHep6Tit X-Received: by 2002:a19:c197:: with SMTP id r145mr5829401lff.8.1585230216993; Thu, 26 Mar 2020 06:43:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230216; cv=none; d=google.com; s=arc-20160816; b=ZlT/d97zeNoZZGXgK8d8qYC/Ra01yNtWs1Z77pBZG4RydZr3xI4cyj4x7ro4kH6n4I sCCvf5qMbetHBrUC0WyIHCUbzPu0k5pWHK24CqglEHLHf4jAztrPpXaiZrwSus6uBZXL 4y7WCIoYWYgUcs1eaYTWMEdiDg3JizP0PRR+uj7cyU+hvZlgHmFTVd9fbPvRLN6ZN8QZ 55mY9NtGDAY5fqfS3ZSL1EEn19BuITEqyiAPzesgp4o8s2YXTLkfjgkV+YpBdJfqQcEE JcTklV0o06t5iPFzAFZewnOxsQbyqHupyzWC3fszDExvAqnVaFANTmzgasJhSbaFOUFZ QKwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ASqoc7dcW5Z7AuGpS+KnxbbIvZiz5/SlA8zFFJ9swg0=; b=fspFhnpJ3q9N0hqybinQ5Jsa9EFmbw+6iTteqyjr0RUjU+7/Y9bqSZybuewPCeEbgh Pz5kAhDSBlFWGQdlKpkuR1879wWzlizNZE+UnBcj7WnhMScxq340FVjCH/JkZoZJBnp8 fEWnsfOrdvPlsCpsNK6hF/oPZojap/uSP4nKiLpzzzOGFxYH4gqNf1RzVPFbdpYieAbG 1Lmu9tP9hAdgcYy/INb2Bhk0eh7n2l/tSCYjULQEAxJrDhIql3nUYcPKrMMICEqmN47D XFpbbSev/ZTwfFZE3MxodkuHNt1kpQR48Tif8CFV8PfRMNTXu/LXECG914U72gX+7kjs VqWg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id t17si104883lff.0.2020.03.26.06.43.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:36 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhZap006055 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:35 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSBl031897; Thu, 26 Mar 2020 14:43:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 15/29] base-apt: rework base-apt population Date: Thu, 26 Mar 2020 14:43:11 +0100 Message-Id: <20200326134325.8672-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: KgbOGxHsgmCo From: Henning Schild Just call that function once and make it find the debs and dscs in one run. Signed-off-by: Henning Schild --- meta/classes/base-apt-helper.bbclass | 6 ++---- meta/classes/image-cache-extension.bbclass | 8 +------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/meta/classes/base-apt-helper.bbclass b/meta/classes/base-apt-helper.bbclass index 4be7ad2..7ed2859 100644 --- a/meta/classes/base-apt-helper.bbclass +++ b/meta/classes/base-apt-helper.bbclass @@ -17,9 +17,7 @@ compare_pkg_md5sums() { } populate_base_apt() { - search_dir=$1 - - find $search_dir -name '*.deb' | while read package; do + find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do # NOTE: due to packages stored by reprepro are not modified, we can # use search by filename to check if package is already in repo. In # addition, md5sums are compared to ensure that the package is the @@ -53,7 +51,7 @@ populate_base_apt() { "${package}" done - find $search_dir -name '*.dsc' | while read package; do + find "${DEBSRCDIR}"/"${DISTRO}" -name '*\.dsc' | while read package; do repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ "${BASE_DISTRO_CODENAME}" \ diff --git a/meta/classes/image-cache-extension.bbclass b/meta/classes/image-cache-extension.bbclass index cff2a8b..7945e8b 100644 --- a/meta/classes/image-cache-extension.bbclass +++ b/meta/classes/image-cache-extension.bbclass @@ -21,12 +21,6 @@ do_cache_base_repo() { "Try it without cross-build." fi - if [ -d "${DEBDIR}"/"${DISTRO}" ]; then - populate_base_apt "${DEBDIR}"/"${DISTRO}" - fi - - if [ -d "${DEBSRCDIR}"/"${DISTRO}" ]; then - populate_base_apt "${DEBSRCDIR}"/"${DISTRO}" - fi + populate_base_apt } addtask cache_base_repo after do_rootfs do_install_imager_deps -- 2.24.1