public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH 1/2] dpkg-source: Fix source deployment
Date: Sun, 5 May 2024 22:32:07 +0200	[thread overview]
Message-ID: <d6091740-4f66-4431-b03d-d93471e00fd6@siemens.com> (raw)

From: Jan Kiszka <jan.kiszka@siemens.com>

This failed if S was not a direct subdir of WORKDIR. Align it with
do_dpkg_source.

Furthermore, move -maxdepth before -name to prevent warnings about a
global option specified after a positional one.

Fixes: 38b832ad8248 ("meta: Implement two stage build")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/classes/dpkg-source.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/dpkg-source.bbclass b/meta/classes/dpkg-source.bbclass
index 7fd5d2ed..005eafbe 100644
--- a/meta/classes/dpkg-source.bbclass
+++ b/meta/classes/dpkg-source.bbclass
@@ -21,7 +21,7 @@ do_deploy_source[dirs] = "${S}"
 do_deploy_source() {
     repo_del_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \
         "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${BPN}"
-    find "${S}/../" -name '*\.dsc' -maxdepth 1 | while read package; do
+    find "${WORKDIR}" -maxdepth 1 -name '*\.dsc' | while read package; do
         repo_add_srcpackage "${REPO_ISAR_DIR}"/"${DISTRO}" \
             "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \
             "${DEBDISTRONAME}" \
-- 
2.35.3

             reply	other threads:[~2024-05-05 20:32 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-05 20:32 Jan Kiszka [this message]
2024-05-05 20:32 ` [PATCH 2/2] dpkg-source: Build source package only once Jan Kiszka
2024-05-06  6:29   ` Schmidt, Adriaan
2024-05-06  6:33     ` Jan Kiszka
2024-05-06  8:11   ` Koch, Stefan
2024-05-06  9:06     ` Jan Kiszka
2024-05-13 12:04   ` Anton Mikanovich
2024-05-13 12:08     ` Jan Kiszka
2024-05-10 17:32 ` [PATCH 1/2] dpkg-source: Fix source deployment Jan Kiszka
2024-05-10 17:55   ` Jan Kiszka
2024-05-13  7:29     ` Jan Kiszka
2024-05-13  6:56   ` Jan Kiszka
2024-05-13  7:01     ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d6091740-4f66-4431-b03d-d93471e00fd6@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=amikan@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox