From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7122396060964618240 X-Received: by 2002:a05:6512:3409:b0:489:fd59:a78f with SMTP id i9-20020a056512340900b00489fd59a78fmr19209573lfr.654.1658312059548; Wed, 20 Jul 2022 03:14:19 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4e83:0:b0:47f:a27f:43c5 with SMTP id o3-20020ac24e83000000b0047fa27f43c5ls2274lfr.0.-pod-prod-gmail; Wed, 20 Jul 2022 03:14:18 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t+FrAhUtGyWRpy7hpBnF1DgloktJ11iVd7DJpGPwf+/1aBVWx7BoRZ8azwoBCXZWQJdK8O X-Received: by 2002:a05:6512:22d1:b0:48a:39e8:7d2b with SMTP id g17-20020a05651222d100b0048a39e87d2bmr8293011lfu.607.1658312058403; Wed, 20 Jul 2022 03:14:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658312058; cv=none; d=google.com; s=arc-20160816; b=uZ7lNbZTL/Hhlw3pQk5oNdtK7ZlbW2iIrsMYLEyxdL08ngRa+XYy+yBO4yKjVBtuve 6QjzrW9ro7MovE3uCVxsrCFTuuihZ4N3PZWvzvNlAOyGGg20J0PcsbNW3LVtSVU3Z/S3 66Z4GsbsXT67+YolKn+Zmj7rdWZJ1uB1Xo1fGYKJTKtKLSfHwcacpshlpPBcJPiv8pK6 KRJx+a6qIzoQK9c7MnGyTNEv+bBEmniv8yJZgTASYFcLnJ8mUNoAJ35DipXLl4pawIei aEd6DFdfcR3LwbxiPPLZn7twvDH7N2hS3oyz3fqaG1vuy4akWi9kczQ3o81mUYOg3145 AioQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:message-id:date :subject:cc:to:from:dkim-signature; bh=3bw9KdwB5JbYvEwpWzWfsANincg3M7/tyhm9GkXwXYs=; b=0boYNtqTHFuK7MJho9ruTJQu2n5uT3aRkCYuT87EKuoQayvsTYcPWCBj0SZFCrdFO4 1e2Rtje3O11rBfuOH3X7okIccKCVfAiq/KgIVxknGDcIDmq4rwj26+QP9bIQewCj8gfT rWO8Q5Q8+kBXMuoFOYJbUw5+C/LoU325xNQAWle7qpNM/K3KaIYYjOgYxVljSHtLVug5 1ATFNwkiX7Sqi9mvf8RBj8htnWumKW+nHsxDZi/XEc6SqwRc+ZvHNdhOF7S2sfrmbfFr u6qwQ9zbjeC12W2wcx2rZ8VG9C9psMneWtO4prZDsh8a5BvYaJkb7ZsHUGVfVcLOq1dI 6JJw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=D3slYYKT; spf=pass (google.com: domain of fm-72506-20220720101417e4f209ca1c8ef73250-llgxqs@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20220720101417e4f209ca1c8ef73250-LlgxQS@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id h11-20020a05651c124b00b0025d68fb563esi481621ljh.6.2022.07.20.03.14.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Jul 2022 03:14:18 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220720101417e4f209ca1c8ef73250-llgxqs@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=D3slYYKT; spf=pass (google.com: domain of fm-72506-20220720101417e4f209ca1c8ef73250-llgxqs@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-72506-20220720101417e4f209ca1c8ef73250-LlgxQS@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20220720101417e4f209ca1c8ef73250 for ; Wed, 20 Jul 2022 12:14:17 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc; bh=3bw9KdwB5JbYvEwpWzWfsANincg3M7/tyhm9GkXwXYs=; b=D3slYYKTKYSdJ/VgHndEkEJflU5Cr99VBfMOQLsg21bZXsXVFYZHGY0xd7EaHSqXOc4TbV aAnHZ1Yt60TCYi2l52kbu/PTEcONLcnw7D7mFzj0TCy9EgJwQ16sYnUlKkEb5895/VKJQJTQ qMzgCAbR1J+bhTKTpRc/Tv8BiGy4c=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] fix: locate generated debs in WORKDIR Date: Wed, 20 Jul 2022 12:14:08 +0200 Message-Id: <20220720101408.3844070-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: p3Nqi+uf0L/E This patch is an addendum to c69716c. It fixes locating the generated debs for deb_clean and sstate. Signed-off-by: Felix Moessbauer --- meta/classes/dpkg-base.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 79c1ce1c..64f0c26b 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -258,15 +258,15 @@ SSTATEPOSTINSTFUNCS += "dpkg_build_sstate_finalize" dpkg_build_sstate_prepare() { # this runs in SSTATE_BUILDDIR, which will be deleted automatically - if [ -n "$(find ${S}/.. -maxdepth 1 -name '*.deb' -print -quit)" ]; then - cp -f ${S}/../*.deb -t . + if [ -n "$(find ${WORKDIR} -maxdepth 1 -name '*.deb' -print -quit)" ]; then + cp -f ${WORKDIR}/*.deb -t . fi } dpkg_build_sstate_finalize() { # this runs in SSTATE_INSTDIR if [ -n "$(find . -maxdepth 1 -name '*.deb' -print -quit)" ]; then - mv -f ./*.deb -t ${S}/.. + mv -f ./*.deb -t ${WORKDIR}/ fi } @@ -282,7 +282,7 @@ do_dpkg_build[depends] = "${SCHROOT_DEP}" CLEANFUNCS += "deb_clean" deb_clean() { - DEBS=$( find ${S}/.. -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] ) + DEBS=$( find ${WORKDIR} -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] ) if [ -n "${DEBS}" ]; then for d in ${DEBS}; do repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ -- 2.30.2