From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a5d:4d06:: with SMTP id z6mr12529557wrt.339.1580481004506; Fri, 31 Jan 2020 06:30:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c452:: with SMTP id l18ls5238665wmi.1.canary-gmail; Fri, 31 Jan 2020 06:30:03 -0800 (PST) X-Google-Smtp-Source: APXvYqyUUZyKFMZcBzNQETxIuAwAFfkpy6eOma2OloJdZ4RbED+DTIWL98b4CUZy9GjNJIe29O+c X-Received: by 2002:a7b:c258:: with SMTP id b24mr12971428wmj.140.1580481003749; Fri, 31 Jan 2020 06:30:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580481003; cv=none; d=google.com; s=arc-20160816; b=NDTnd6FM4QXjAKl2m28ur2vqMwzOTD94Oy6eZ9b9yEj/pp6YpJXsxTx9A+XkGFnpep GnKIYKTn++D4gBdB3amq5TShFGIVpZKi+JaUKAwze8dK4WrPO5/BJy+Vic/MEqelY7cy qZdH+Op3xqpRBqE5IyeIhWl0IEOP31TonESo1rh9wy/px5nDxbpdEQbwG7bV9VT9A9ki Y/uXgCmbB4wjRXGXGF4kQKvv1FaI3j07nwnDfOqihaKloY3JD0sdn7Cl7SoNbV5UtarK KTi2+h+YIVuoQK8IjemjSaiC6+P6M3UC/cIKO49n/hVAMnyY5sy+i0pSZEFedDbOX+Hp on8A== 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=tLAm0vtueMhudRC5yroGcIibnqOglX7osJDtO62JH9w=; b=dB0BrYKbc4gg9loRlQIv7zGihj4cInQC62odUTa59Ko4Le4O9SkckUDE+RQ7uOF8RM oxgP4tg8L6AqhJ22OA7gc7/mDF/3kCm44MVvjcGknZU9rGcwhYNwxXwBgh3zqU7MQX7h I2C7AuCyeoJhCnhFsTQfENkyxFi1Rhgyr+AdAKTCcVUXBkHLAxar7eyKONLROdlw+XVj Dd47fzkIJ+ABh4H/fM0it7szL6dpdxekGwnYgZgvhEzv5S8wMHHeAPgtijfoBKKtVxJ5 IX8EuNLYT2fvJEgAhZvcCpLrt5C57aNyV32Mm530J0XotuTbC3+Q9ZheMh5pyhVwmjq7 BMKQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id t131si324810wmb.1.2020.01.31.06.30.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jan 2020 06:30:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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 lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 00VEU3YV008354 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 31 Jan 2020 15:30:03 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.68.229]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00VEU1RT030231; Fri, 31 Jan 2020 15:30:03 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Henning Schild Subject: [PATCHv4 15/26] base-apt: rework base-apt population Date: Fri, 31 Jan 2020 15:29:49 +0100 Message-Id: <20200131143000.14873-16-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200131143000.14873-1-henning.schild@siemens.com> References: <20200131143000.14873-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 5j4nVJVANLp5 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 db25adca..18d43aa3 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