From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a7b:cd13:: with SMTP id f19mr4305746wmj.10.1583877412152; Tue, 10 Mar 2020 14:56:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:bd82:: with SMTP id n124ls1319536wmf.2.gmail; Tue, 10 Mar 2020 14:56:51 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu00Lv7WwL5d/vfSSUYoql5A+VYFHrrseQlN3/dH6DlzQFhjAua3lDlGkxYk2UoT6y4lCMa X-Received: by 2002:a1c:5684:: with SMTP id k126mr4135827wmb.181.1583877411535; Tue, 10 Mar 2020 14:56:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583877411; cv=none; d=google.com; s=arc-20160816; b=A9Y5KO6S8tituJqx7IdU4sKbH3FatmbG5Ke9ZU+RgELGjjNDTsZr4LTrW1PeUCAOF0 KHBBe99cWRNvPSAl65LfJ6TwMQ+PvcXXWNgXuUv1JrjgTQTVqqeuzsuVpNkMb0VSu6qQ 1ZQriRhvWKyulKpMCjOXkkABAj/d/jRZRWR3LX/xKbfW0Px2UgyvVMTteunzflDT5n6u HIEAnvz9Vox7EXiXEnTWRpa5pgDplmN3VWDfKljjweV39dxylDrvPqL4d6b2jYVzO9+b K8+mYkLkmhIf39TEv3DaHjV9KNpyKaOwdOfIsxkbz+jj+sUXBCl1wm/qixhAJomkFTu8 MnTg== 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=pOKSuZyX4xyQGNX0/48Tokfd5syuPIQWKdR/kkoyU6A=; b=rNDkQkyb3alDipfZL7cgpjLfLfqU/W7Yk+1KxjTLOT74Aax6/TqrDkp2r5OJ1jMo8C qfXIM7mXOaSj+9tNOSmpgtbLCy+KQA+FHEl/etRMqaba6k0q0ZweNRFx48LUig71Lszm vznOT1hdGLwmiBRMswI/CjF5+XeQlpI228VbmwCYhneaKPUBna3zvjoMFhc/RdGonWKz wpP/J8mem3QkRZhN8lqvl5BCBE7/VKV01JdHwulOpyI1eJsXSVenZa53zaRgmLulciAW JdSDV/pmmFq/umMzXk7QC7nt1xaNbLsSxzzpu+K884tVUY2X0QUG2y/hiAhplee2JLgq 8rfw== 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 c187si1280wme.1.2020.03.10.14.56.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2020 14:56:51 -0700 (PDT) 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 mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 02ALuoaX031020 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 10 Mar 2020 22:56:50 +0100 Received: from localhost.localdomain ([139.22.36.172]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02ALub6C026985; Tue, 10 Mar 2020 22:56:50 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv5 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Date: Tue, 10 Mar 2020 22:56:30 +0100 Message-Id: <20200310215631.24859-29-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: lWK70SgdZlYv From: Henning Schild Fix the logic that excludes packages from isar-apt from the export. The subshell can not reuse our function and runs into "command not found". Signed-off-by: Henning Schild --- meta/classes/deb-dl-dir.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index bcac7dbd..3aeefad7 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -30,10 +30,12 @@ deb_dl_dir_export() { -maxdepth 1 -cnewer "${T}"/deb_dl_dir_import.stamp \ -type f -iname '*\.deb' | \ while read p; do - ret=0 - repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" "${p}" || \ - ret=$? - [ "${ret}" = "0" ] && continue + # can not reuse bitbake function here, this is basically + # "repo_contains_package" + package=$(find "${REPO_ISAR_DIR}"/"${DISTRO}" -name ${p##*/}) + if [ -n "$package" ]; then + cmp --silent "$package" "$p" && continue + fi sudo cp -n "${p}" "${pc}" done sudo chown -R $(id -u):$(id -g) "${pc}" -- 2.24.1