From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:dd8a:: with SMTP id x10mr17161595wrl.38.1584779524952; Sat, 21 Mar 2020 01:32:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:a98b:: with SMTP id s133ls4138550wme.3.gmail; Sat, 21 Mar 2020 01:32:04 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtXTmTTnqif1gok5mpbZb0QcLeGqtBidWExFL070/9VxQpd4u03r85JM5XAP5LQLWnQQMlP X-Received: by 2002:a05:600c:618:: with SMTP id o24mr15711617wmm.128.1584779524412; Sat, 21 Mar 2020 01:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779524; cv=none; d=google.com; s=arc-20160816; b=Ib3x1i1IYSMg1TlBRv9sTwYRZgqAV0b5H96K5WvQolRwc7mlVJyEavelHt7r1RAs5O TyjwK3PyLYSOX3QNCy7pBoGb0SwAJPplqoNUJw4vyhntXTf/oZ88C72RwAhpMI7UBWx+ dWJkQzWqvwxlCpaNt1h1a4Ej1xStVVGRE3iNH1TdbUMDKtOB6Gzo2gsr/L9y0HohxD9+ SVE791M5YH7AZNVc/dUQCrGOlBxtBlNHyEtkT9aHCHpaUHE2wBU17XjcByAMOCG1NWeX ru9aqe6y4c7jLIpHLbQIHRM7+RYTf3wbh2ncrhCdpdirkBasB2RWW5sVSp55zKKyp8ti ESoQ== 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=YNcsGeonK9jQNJXwKMMhZS5pcFCF0F1ZVzDaLtWuGsQ=; b=XYTSUpEtpjK7ghQu+RKdd1O8moIu0c1XVBidk2PAMzzyfnPD6zKMRP3MI8ra7zA7fu iZZsY0xT28uAxZTEZJ5r4+mzhuR94wnMzMx0/GQ4lkLhBlO1jAGWqQgVxmuBsFgLlYO6 dRWLXruSX+Jd8zn6g+ooGS3+qQp8b5IecdGco5QoRYIJEqwKMvzdAPN1rA6mgYotnFWd Po+zCIF+VGzLAnzIpxYXf21oKEj/Ohcniqw11b2zHzB0+I7tB/OnSO6OHTPI5Ks+TqzJ GHuESbQFUBXUVtQiCj3RAmnXdXcQod/Dt7vhFjIwvfXE431+/n/Bw9wnqvRh7dcdyJKY htKg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id n9si374147wmi.0.2020.03.21.01.32.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:04 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02L8W3oY009556 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:03 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGT021533; Sat, 21 Mar 2020 09:32:03 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 15/29] base-apt: rework base-apt population Date: Sat, 21 Mar 2020 09:31:34 +0100 Message-Id: <20200321083148.26160-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: SASYJCLVm3FO 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 4be7ad27..7ed28595 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 cff2a8ba..7945e8bc 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