From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:aa9e:: with SMTP id h30mr30459575wrc.288.1583877406222; Tue, 10 Mar 2020 14:56:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:2c03:: with SMTP id q3ls1355699wmg.0.gmail; Tue, 10 Mar 2020 14:56:45 -0700 (PDT) X-Google-Smtp-Source: ADFU+vs1l2+cM5pohCcG++j7S99whFQXAKfrhJ+eC9SaiZAuqREnaDOxpY+TN9wDI+nGVXnAi7Wv X-Received: by 2002:a1c:2dc7:: with SMTP id t190mr4209455wmt.137.1583877405772; Tue, 10 Mar 2020 14:56:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877405; cv=none; d=google.com; s=arc-20160816; b=nnHnRkyIr3jw7eB8w+TbpsplkpeWTEGiwYmB4NvSS9Huiv3rQIQfUHhe8G71wgFote T2yZgrlB9LeZNRGoONZ9nnqHFlJzWjvOJoZAFnnI1I18D9yK55xbWjB6HstOaAkudYLf uvsjB27JZQ5jY8RHuJimGEdY1QGBIUiI4VUlMOkiW7Q/6BS2SJmKhflwdLDpA2wEJrL2 vI2yfp11PQkZx0EO5WRs8MygNh7SUCYZggwcaHcwmzBzd/GPZ1wAy/fSyGDgxn0ucnOn NtpOCi631mqwu8rgxYEKHraEU7x3Lobjtj3x6oX4i+xqkCi3ys0C54lh86ZsP1QQp9Ew f80w== 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=eJWBbkhJwhpiHuLIBstsgcpSxKmKQlY1+S1iS/eogbjRFGCqQOBirBkv3IAfI8HlgI oDCf4gOk7SEOWHWwg3YxGJczKnacREtdhrm5wLQyggyUo5sRLKuAZvMnvOBEg8jQHA43 Lxlro5FR5VHhyu+ah4613KAvauzp9cvVR0r8H9oAZoGCSKaFYhVBIuyCfC1OCdViaf2m 3lPfFmnqCY5feGZv5JBmZl1ya6j2RGR5dxyGzq2k9FwuqkuSgt1+SeSp0jaZO8p63qEJ 3gLMkl1pm8YkeoGvHULJPXmOKz7yeqCciQploc93k9bHHixMiQYBtvDv0spwgvZgTvbZ 9Mtw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id d14si6840wru.1.2020.03.10.14.56.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:45 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 02ALuj2K012415 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:45 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub5x026985; Tue, 10 Mar 2020 22:56:44 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 15/29] base-apt: rework base-apt population Date: Tue, 10 Mar 2020 22:56:17 +0100 Message-Id: <20200310215631.24859-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200310215631.24859-1-henning.schild@siemens.com> References: <20200310215631.24859-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 6slcEC4NfSo+ 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