From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:a2e:988d:: with SMTP id b13mr7810340ljj.217.1584779530898; Sat, 21 Mar 2020 01:32:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5494:: with SMTP id t20ls129969lfk.1.gmail; Sat, 21 Mar 2020 01:32:10 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu7A70cIw7Rc8QzjBYV3HhKx6CEfApH15gXEwx429gXNmnLn400LtDE9Og01CzB02BejpOj X-Received: by 2002:ac2:4c85:: with SMTP id d5mr7572578lfl.94.1584779530461; Sat, 21 Mar 2020 01:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584779530; cv=none; d=google.com; s=arc-20160816; b=1FuhOGy7D6DOaNJ2MjOKVXUSKukyL1KZntjPN+n+q/l/aiSWiDYvyak8krsIwIqecr 6X9/RXJJg4DyNEAekD2+FD6Tl/VGRImA09AeGG1gR3tJsAHVEXkLF7ETOyRdSzy00/FS h/5IIpNA0JF3ZTsr+oR2qR9dW+L2YNc8M4pzZcQeIlkDVpsf5US5bQjpTbef1QB4yU2/ 4pzb7ug/3OZ11j+VVuPH1Q3R/inRIPwwicPR40uJrJ0SN5DetQoupYtE0kgdmlaAiMCT kfhA0sPzAAlcaVQqHV1Vr7EwTqg818tGLEj9Fp5J1aLzFVs8hG0tFhkgrqu4pTQNpO1h 85CQ== 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=2zeRhMorBMyOQOnLnNfIOMHa5iUUEPiQyhRRJnnrM7E=; b=URroSr7FW3dBE8MjyW6a2hqnzBfNKJT+8Sn+rgfy4yaMXMZl3ih6iP70nZfAiXrb3P l9IM0K/U/CklWoJSyfdB+jeviBrUCab8B0++dOwr5efVyY4GpyFMXtY5On3YemQNNvll lJAc7CHmIxMBgXjfsiz5STB4DViPgdA0Mj/Sr0mV90GXpgjiz7pxodwHftmx0TmAHy2u 9emcqmKvABZIi9fIfK/71ifUV0Bf8nvkOytKXshG8lTKFZy1ubipx4HiRozElRtMTwSk KyHeTbblVJlXlbec/AnwcnBsH7OYQGIfiu+lBTOFprJ7DTZcrUaNZQQhy6MNqB+uiHVg ZaxQ== 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 a21si589554lff.3.2020.03.21.01.32.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Mar 2020 01:32:10 -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 02L8W9UX009712 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 21 Mar 2020 09:32:09 +0100 Received: from localhost.localdomain ([139.22.32.253]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 02L8VuGg021533; Sat, 21 Mar 2020 09:32:08 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Vijai Kumar K , Baurzhan Ismagulov , Jan Kiszka , Henning Schild Subject: [PATCHv7 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Date: Sat, 21 Mar 2020 09:31:47 +0100 Message-Id: <20200321083148.26160-29-henning.schild@siemens.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200321083148.26160-1-henning.schild@siemens.com> References: <20200321083148.26160-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 467fINdt0bMa 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 d50140a2..6d4e253e 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