From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6752900179667451904 X-Received: by 2002:ac2:55a3:: with SMTP id y3mr11709441lfg.108.1572282096707; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:93:: with SMTP id 141ls1950701lfa.12.gmail; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqywjcw3g6TU73gK3345FuZa+BEGKoOisMYIAGlOmtu2mopHJjyjDOyxNcbhI7W+st8z3985 X-Received: by 2002:a19:7d85:: with SMTP id y127mr11747796lfc.160.1572282096072; Mon, 28 Oct 2019 10:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572282096; cv=none; d=google.com; s=arc-20160816; b=K+IiUnuyErYZ0lQCriYMaNs7quGEYlMaJkUFgP1S+3VDcoatcM83GrNoyyjiD4zH0G Oz+mNs7dELWn3IRk2ut9KSXhD4vnYyeI3lmYi5w4EHhEUq/38gyoLJ6S6lhI91j2tOz4 dcDzUNL91fBlnisuptwuctQWt6dKQQgnlsls4+ChzQML2j/KHK9C1n+surDnQ2vVmsOQ gO4TIuh3O4b0BZUvKf/ebomoSc0cL1C/V6SZuPj5ujkPK+3q3SbviDaXxDlU/Zldm+No oBMruGDuRtu5xG9CQ1S1ETweKNCIpXqHuBuNweR8K5XrgVw7w6/gipVm3qoWA7EfGlok Vi1A== 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=ShlJO9oeYq1jYxRQSqbJshjv2hAPsCuJ/id5RCp6MIM=; b=YG0VHFXsm70fRHcHaausWmkjrHN+kgIZ+jeEfEt32kurC/mvTquETgVU/T0YS5T3MR tM/T9BCLwXeGne/rUz3vcz4rz6zumZI3av+yqb6a2N688ewoFEoi2DyMPmp5AOEeZP6H lym4RhLYw5gl0Bwj0kyRq4vV8X3jleTV0qe4hWAapOr+9XK2JcgsJE1kTLEtC3MvyKIH qfUkTGJ3rz15XXyazTdmOKxIoVddiEH3xkOJZXW5UB3vHGnu6BwPgnefVXeqIrYIlczH Kx9gLZvv67gH61GSFuOea+KIgtW/S1upuB6oC6FhGn57Xfg0yFUZjOOnxV7piLI91wIC GBmA== 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 y6si603390lji.0.2019.10.28.10.01.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2019 10:01:36 -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 mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id x9SH1ZaU019169 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Oct 2019 18:01:35 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.244]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id x9SH1YPJ025390; Mon, 28 Oct 2019 18:01:35 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 13/17] base-apt: rework base-apt population Date: Mon, 28 Oct 2019 18:01:28 +0100 Message-Id: <20191028170132.28072-14-henning.schild@siemens.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191028170132.28072-1-henning.schild@siemens.com> References: <20191028170132.28072-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: ykY9+oKtLLZI 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 3013edf..fb4f0c8 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, m5sums could be compared to ensure, that 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.23.0