From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003121820762112 X-Received: by 2002:adf:bc87:: with SMTP id g7mr30771329wrh.121.1576497016114; Mon, 16 Dec 2019 03:50:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f403:: with SMTP id g3ls6238969wro.3.gmail; Mon, 16 Dec 2019 03:50:15 -0800 (PST) X-Google-Smtp-Source: APXvYqx3FIlo+C10xlQo2o3na0AIoWN8aIHBHnN6c5/MrVwju8lVHyMEJ/Ycu3FJKO+0hjQK9FzX X-Received: by 2002:adf:db41:: with SMTP id f1mr30498789wrj.392.1576497015771; Mon, 16 Dec 2019 03:50:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576497015; cv=none; d=google.com; s=arc-20160816; b=r9Tf2r9bbVu3L11uqTa7TyFyBA1rwjp3E/8ImiqhjnTT6CWWFOKDzpAqvwYvp78k02 h5Uaphz0pzjuovNs2beyyxQmPF/iLfuo8YPZTgpCDheL9Wki1Zra0aW+ViNbTL8XhUHy GolmNY2kbq3pTvJ4LTJZlATqr05joaA6qr+PjWEsTcU1hdkHF1/zuOTCythNhEx74pLr F1i5Uil3E+Bd/ZbYmvXgHtt+vBkHScpcn/cetjsGVTdSusxZPohhX7VGotlqFC+mFiQd XwB0EKT/pkpj3RbFvO3l5Kl9FNfvj/KvCQ+snZ/w0Bg/RXNEulXlcOtioh7v0e6wU87M l/kQ== 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=C8cnBWVEg73dNl53DcU4OX5bv/8WuPJ4baVsnrmDxXQ=; b=GwnAN7vAw++PdDP517GkY9Tbqt8GSHPqVBmvc65ptPrkYJon7PEECTyUjGedLr7rir RmnOOhFX4n3LphY1OqvyAi9aUXFpnEYwjus9mgoVcHDTIIStzfj/R8pMouo9A9foMofY if67fJ3m1nJupwcazHTDJO9uGNTpooa43IgpPfp4gmrTJQKFRqHq8sD0reYAX7d4iLc2 OSv0fRC6AxPvbrt86z/Xqz7kKR/R9SE2TPMqJwoqI1m92bVJKvNjEZBVY0VWGoJHcPqC PBfF3fSm6yMOJR8A9dVyw3fKe+LSnqIUX6Vkr6i41B2fdUEVQ0dcsVNQbRIGjad2UAn5 ONhw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id x5si712843wmk.1.2019.12.16.03.50.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 03:50:15 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id xBGBoEgU003898 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 16 Dec 2019 12:50:15 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.101]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBGBoDWa009084; Mon, 16 Dec 2019 12:50:14 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Jan Kiszka , Baurzhan Ismagulov , chombourger@gmail.com, Henning Schild Subject: [PATCHv2 15/25] base-apt: rework base-apt population Date: Mon, 16 Dec 2019 12:50:01 +0100 Message-Id: <20191216115011.17664-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216115011.17664-1-henning.schild@siemens.com> References: <20191216115011.17664-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: YLPDoUr3pcNn 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 db25adc..18d43aa 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