From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7279128154668531712 X-Received: by 2002:a05:6512:450:b0:500:8ecb:509 with SMTP id y16-20020a056512045000b005008ecb0509mr1863501lfk.15.1694804095592; Fri, 15 Sep 2023 11:54:55 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:ce10:0:b0:51b:d432:a176 with SMTP id d16-20020aa7ce10000000b0051bd432a176ls197251edv.2.-pod-prod-00-eu; Fri, 15 Sep 2023 11:54:54 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvN1Z4o64cEQxgsjbUCvxck35lhDPMSh9bUMCuJrfAxlDYe/lxXMk+y8b9PW3rmCTrSE2M X-Received: by 2002:aa7:d297:0:b0:525:6abd:2755 with SMTP id w23-20020aa7d297000000b005256abd2755mr3443576edq.16.1694804093929; Fri, 15 Sep 2023 11:54:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694804093; cv=none; d=google.com; s=arc-20160816; b=Gcp6p+EMl6bnYgDLZzUwepJsGzP3ZLHccaURYQEWwRPAqEazqEnWBRnzjKbzWJtSdB 7IjNUjCdJB1CcLBwUJCRVyTJ+3Ewt7MFX1eX7+jNymKEXyQqzVx/8+zkVECR6bXw+h+n VBvxaANkmAH//kJmXA/p37Jr9ymY5awOddufVASex11XpwondPFMGUhU7+JcJ+/K8AML +pRXROiy1+NsBOugltdGy+vYizZ0hcJut7r6UqQfmZDR8Zn5cybtuOxDUQE5H6GuQ2jS GFLpbBEWZcBmOf4k5lkQJDUQHEiRw8i6fxX8ha4o0znsULFbvGi6++AUVMO9yLXruPpK ca2g== 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=b1PzIw2Mh+L+5U29VPJkZBDrnjc48MMe90OU7zqLqys=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=gRKLR7ehQYHiFdc3axvFD697eTnW5w6aeyBFwJEi1Ppa70yPS/mr0mKdYDbkAbiRYo oviQjL2vrp2WbXCORMcHoluulwf1MNXL3Ejas/7SqT5VtVsxxzvXSL09W9uUaPXomTrM WffgqYv2AgMS0pyl2dQrVKT1L1olaLbXtIkVkdGsuHCUap+DnH5An/C3p2/NA1/ZvGkj JTHJLAE1oHYtXvuAymI4PfMTehNhZ+sYZ416f3WOSf6/4/QRKaAf1EHT/gHxrMwXIHrM FhEpjmwmJSM8/ZzHHdY6lgj4uvuZxE4tRdY96ZPDiNvww90q5WVDBegU9NytcpaNjhYw kWKA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g14-20020a056402320e00b00530b66cee61si44434eda.0.2023.09.15.11.54.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Sep 2023 11:54:53 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 38FIsopW026150 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Sep 2023 20:54:53 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH 2/5] dpkg: Limit dsc searching by workdir Date: Fri, 15 Sep 2023 21:54:36 +0300 Message-Id: <20230915185439.2954192-3-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230915185439.2954192-1-amikan@ilbers.de> References: <20230915185439.2954192-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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: Eah3gXY88SZn If local isar-apt copy has dsc file for current package it should be ignored. This also prevent from any issues if source dir will have matched files in it. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index c596adbf..90d717ca 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -97,9 +97,9 @@ dpkg_runbuild() { # Create a .dsc file from source directory to use it with sbuild DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) - find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -delete + find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -delete sh -c "cd ${WORKDIR}; dpkg-source -q -b ${PPS}" - DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -print) + DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ --host=${PACKAGE_ARCH} --build=${BUILD_HOST_ARCH} ${profiles} \ -- 2.34.1