From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6788114222392803328 X-Received: by 2002:adf:e550:: with SMTP id z16mr11820412wrm.394.1584711654052; Fri, 20 Mar 2020 06:40:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c771:: with SMTP id x17ls3008700wmk.2.canary-gmail; Fri, 20 Mar 2020 06:40:53 -0700 (PDT) X-Google-Smtp-Source: ADFU+vt6zdOC/To5gWZMFaZ/anRcprDXaZmGBYbCuPcO5ELa8CRaA9xeMMGti9OITs7GsMckdHDe X-Received: by 2002:a1c:7405:: with SMTP id p5mr10777786wmc.73.1584711653548; Fri, 20 Mar 2020 06:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584711653; cv=none; d=google.com; s=arc-20160816; b=LQg8ThrxAHdMq1vHw9qhkLxTfoHJRShzgt11dAearsarcztVv9Yc29riMpfAuvJeza PeDQC1+zm5MpgGn4mpNJiXFy7SGMtfHGhjNH0exzFk5KbV+1B77/rpyzOAgg2ICccy+Y Z1xM40LpUDAUACpNKlIj0O8Jzlel34PQh8hCY5ia8elNvPVPpvRjdnNnSW0C0MwNDEy5 8ePahNxIiWv88qwLuQmDyGNuFrjrLlLPjg7YEs0tZ6siBCuKLDsT1EBc+leHT0VAAsvs jHJnyyCIpokCSgCrr9sbVBki3J2HGF/I8B9Jb3VVMloadoaJzDkjPdWpSt31rtvU1uX/ OG1Q== 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:to:from; bh=k6+LU4lse8C/82D45x3ULHJp6XCantlCEfNKtPJUi4Y=; b=jCjVr61z0Fyr1x15StoaxSFEc+Y34keBXHlFwzro656AMJYLmJlhP3WFlRsWoeda8l Qh23lCbMlmjF+nYRdW23aV+nUJKwpa9YLmpYlGX2JzTNraYD/EoiW4d7FfcFP+8y/vAt aLJEaNGE6Z+wUDckCgjPpSEMhNGx73QR2ObCbmzEMlg1KdNPvqCXL+NNqi79xJsEc00W vWP2vmrwIC3dlIo+dqXr6xzC1TrWjAmowkTxjwJ59T5hI9tek7V85vIgiUeGcu41llyq 5iZ4eSRenv59UvPCKLWyKpZcfZLa6AaSb+7Kbob3S59axowsiuxlcYUBMcQyR0p451pO dv+A== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b81si219063wmc.2.2020.03.20.06.40.53 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:40:53 -0700 (PDT) Received-SPF: neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 85.214.156.166 is neither permitted nor denied by best guess record for domain of ibr@radix50.net) smtp.mailfrom=ibr@radix50.net Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 02KDeq0C001068 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 20 Mar 2020 14:40:53 +0100 Received: from yssyq.m.ilbers.de (localhost [127.0.0.1]) by yssyq.m.ilbers.de (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTPS id 02KDduH3017809 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT) for ; Fri, 20 Mar 2020 14:39:56 +0100 Received: (from ibr@localhost) by yssyq.m.ilbers.de (8.15.2/8.15.2/Submit) id 02KDdu9r017808 for isar-users@googlegroups.com; Fri, 20 Mar 2020 14:39:56 +0100 From: Baurzhan Ismagulov To: isar-users@googlegroups.com Subject: [PATCH v6 28/29] meta: deb-dl-dir: fix "command not found" error when excluding pkgs Date: Fri, 20 Mar 2020 14:39:56 +0100 Message-Id: <20200320133956.17766-1-ibr@radix50.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200317090445.12376552@md1za8fc.ad001.siemens.net> References: <20200317090445.12376552@md1za8fc.ad001.siemens.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: pIBYZhb2rELK 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 bcac7db..f9a6a11 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.20.1