From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6771003123014041600 X-Received: by 2002:adf:81e3:: with SMTP id 90mr28052410wra.23.1580226197013; Tue, 28 Jan 2020 07:43:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ebc5:: with SMTP id v5ls9512026wrn.8.gmail; Tue, 28 Jan 2020 07:43:16 -0800 (PST) X-Google-Smtp-Source: APXvYqx3elrWQBXQ2QEnLse0t6kWz8zqDk3404n/Z3/FPnz7ZZ+F/40FOaJRuPNHeVJDmMnGYHHT X-Received: by 2002:adf:90e1:: with SMTP id i88mr30366798wri.95.1580226196362; Tue, 28 Jan 2020 07:43:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580226196; cv=none; d=google.com; s=arc-20160816; b=PmmprVOyqAeqBAzvLwXDLt/VUXTDZZluR6yVQpS1kFRK4pz/zZjsDq81K1fZFF+I7z NyfcrHby+U67R3eGK5g01w/tER9qnQQgTzbE7SdkPGPOPl8cFXUbIbg5RmdKFgbjPDpA Xc6CHxSLZZ2pkePGjv3sCMl80DcpSgm6DWdOsNUrSLepdCTrVjPYOIG7AsyYaP6VEvv3 BPUAxLB3wtbLcVTJIorD3xHpCFdST7o7WGk6jMX6hFH7mFWlq3PhQ1evAWqeXk+gjI9q PXtRGVUa8MqyYOwGN/Dar9XXxUGzTzxgA+ix09iXl/XRRAGc7Z3stVei3O1JSLJQG1tm J83w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lwwZEaW9sCBuLBvLdbEqT9WftjuCMsThXGI2rhIrJnE=; b=TBogMw7qqsds6UPlqWQEaIq3rc+XBO2dgixoocHeIVV5itKCpS5mM3E7y8/jqcxKBs TG8aaoP+wBU/f9xYRxXouYjLSDS44LS+G7/0FaCYsu99RTwKISoOmAdnW2oxcLNYKRxP oOzJX8AsgycnM7+rhaawAI5Io1pA0WHpndC/PTAqQA5tTEJ0u0168EmTU9L7ZKrps7Dg 5vkerfPo4p+cVByIvdv/PC/VxK/l1+ojEkbGB6V67IPVSzWBp6iQnUjz7CEwokhNyN8k oJzvQSO8fNDooAEsXSNXJTWAkIYxuptEmLc4lUMNDxxUwE4pdVfKxSyKfhgXl9nu3uSa x+/Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PMDbEC8E; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com. [2a00:1450:4864:20::32e]) by gmr-mx.google.com with ESMTPS id w11si136330wmk.0.2020.01.28.07.43.16 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Jan 2020 07:43:16 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) client-ip=2a00:1450:4864:20::32e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PMDbEC8E; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2a00:1450:4864:20::32e as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-wm1-x32e.google.com with SMTP id f129so3077050wmf.2 for ; Tue, 28 Jan 2020 07:43:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lwwZEaW9sCBuLBvLdbEqT9WftjuCMsThXGI2rhIrJnE=; b=PMDbEC8EL1kpqz/OJB9zlPwTZqzPpFb79w7nujCbSaDXzClbvOHGT/78nnCfOJu/Tw xMG532t1JvGBhXXrOPA72r8sPLzWyHLzCAOh7Y/goxNTenXTCjgsVK+c+ltQNXuoMcwJ ax6HeyY4lsga14L8D3T7uQ87HSVDbSmQDRkfPHSY2UluhUBJTmhPNsrh79eyTi/XrmHr 0JmGr6EU/iV7UW+ePJx7dHbTe2h3hIEJBHDNA25s2vd+qD3tBVoLvo2GAaa72qfl9byD AFbFPcymCKq+nG+8Bp1uglR8ycazjArcY0dJAZb7wxxEazhiURklShsbZvqA9kfxzzj1 ZcSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lwwZEaW9sCBuLBvLdbEqT9WftjuCMsThXGI2rhIrJnE=; b=kPyuWGIlk4MvYKIUoWdocGQyHvbKkZQRCj35p0gqPUARLVtUQ3KcJqjfhoAw6bZrM1 If5k+TgtyT+L8Zw/YbEWjidvLyd5QBAz9c5bkIR2N5NhWksCkoK/vmJgbqmhM7ftmA9b eV+gSJY4K8iHBpuR5rhRRF4wVv0yeaFvfjVgAI4TPVkXRhu2zk57z2KIhTp6YbBAHqxR m9FYdPb20unUS1BaDRMMgUCTkZiCHCwDhQ2RT/mOe4YJEmVgjEhXF39TGJUPMF8zjDOf 8k/iU0HZ51/Y8hwSsaEwooTFhne92ivJU3gJ0Ea+LDwjtQCqThV/cJYXYAkcl+M22dCI /j6w== X-Gm-Message-State: APjAAAWYkULBtSa7FDxR5hg3uD6aegbZHRwxxv+WYwcdCi0v/YEirTsO yBN9Qi+E/Qd7pt/N3IGgQtkq6mmuo5Y= X-Received: by 2002:a1c:7205:: with SMTP id n5mr6005105wmc.9.1580226195861; Tue, 28 Jan 2020 07:43:15 -0800 (PST) Return-Path: Received: from oxygen.mgc.mentorg.com (nat-sch.mentorg.com. [139.181.36.34]) by smtp.gmail.com with ESMTPSA id u8sm3601200wmm.15.2020.01.28.07.43.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jan 2020 07:43:15 -0800 (PST) From: Vijai Kumar K To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v3 15/26] base-apt: rework base-apt population Date: Tue, 28 Jan 2020 21:12:02 +0530 Message-Id: <20200128154213.22353-16-vijaikumar.kanagarajan@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> References: <20200128154312.337e61f6@md1za8fc.ad001.siemens.net> <20200128154213.22353-1-vijaikumar.kanagarajan@gmail.com> X-TUID: iLwV5QC546Dz 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.17.1