From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:ec4c:: with SMTP id w12mr9148281wrn.240.1585230222713; Thu, 26 Mar 2020 06:43:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f5cc:: with SMTP id k12ls2820402wrp.6.gmail; Thu, 26 Mar 2020 06:43:42 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuDNU8QXgnGbeHsIwPx44ya7PVACsSmw8Lny4dL1ebjnUpV1oT5L4XT4StPnZAe3Na4OI5Y X-Received: by 2002:adf:b35d:: with SMTP id k29mr9618988wrd.239.1585230222241; Thu, 26 Mar 2020 06:43:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585230222; cv=none; d=google.com; s=arc-20160816; b=Q8z5EtZUHl8UB1bBTAuw9odEk2AQi4iSlX/YXCriewf6B3RXkWL1GnohqnQY1tdGp6 VFhirmK9XlUfepLvuAmR7m1ZjKyqiFKZRIn2mG0kdp1oVZsykOf+CPeuxYjMHncSlpsH DY58jmwj5Uy1bJ3xKPE7jbTgILtu8q5Eqjy4aSLqHLUMiVm1zu2hpznqznhcpbkvFQed rVs9apvs6WuJp3ycxNzegWUiqqMPpnbtQ0VU/LDEujCXQeUq/dGZgjIsHPCBe9D7P+X3 NWFw+CuMBy2puSkY3LIHA8em6Ayx4LYowNzs1ytwV99SY8SAMmti37qxNl9uxDo/OKFj osQA== 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=50lKO1nuGEznUYPsfeoIbtZqtUq3iOoQG3fsK5oExxM=; b=ymnwg8szmZ9KUog25wXoSDAzNb7pE/boKsjIWl4FMzpElv9hBF74kwe/dOS7V4UYVk 9y+xy1dKimkSLB4LECa2JlLl/WuTo+FNuRVVN8iPcrWHj1E38Oa04nF3Wv8OQFszj3PU MK9HVgF5dQWpROARY19rbl6HRN5t0vppR/moNG6IDf++1LCmadWHtXgUhjkbczDTAGMJ HVb1JSqIs0RcaY4a2i2myzQLaV426bjkkOdVjCidUgN7UCbU8AwBcqO2oBG1tVOW8Swh tcHQcLeQO2Cnuqhc2TTWzwzSsas1vh7z6Bxbt6Xtz/S0D8+SfWxUbbJHEp3Ggs/D5EGa hPgw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id d6si103307wrq.3.2020.03.26.06.43.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Mar 2020 06:43:42 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 02QDhfdr023674 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 26 Mar 2020 14:43:41 +0100 Received: from localhost.localdomain ([167.87.11.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02QDhSC0031897; Thu, 26 Mar 2020 14:43:41 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv8 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Date: Thu, 26 Mar 2020 14:43:24 +0100 Message-Id: <20200326134325.8672-29-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200326134325.8672-1-henning.schild@siemens.com> References: <20200326134325.8672-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 2hqyh15vMBbx 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 6831b11..e996703 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -32,8 +32,12 @@ deb_dl_dir_export() { while read p; do # skip files from a previous export [ -f "${pc}/${p##*/}" ] && continue - repo_contains_package "${REPO_ISAR_DIR}"/"${DISTRO}" "${p}" && \ - 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