From: Cedric Hombourger <cedric.hombourger@siemens.com>
To: isar-users@googlegroups.com
Cc: Cedric Hombourger <cedric.hombourger@siemens.com>
Subject: [PATCH] dpkg: use find to create symlinks to downloaded .deb files vs ln -sf wildcard
Date: Mon, 26 Feb 2024 10:55:17 +0100 [thread overview]
Message-ID: <20240226095517.66032-1-cedric.hombourger@siemens.com> (raw)
If no .deb files were downloaded from remote feeds, use of "ln -sf *.deb" will
create a dangling symlink named "*.deb" in the target directory and will be a
broken link and make the cp command used in the finished-build-commands fail.
Use "find <dir> -exec ln -t <target> -sf {} +" to create symlinks instead of
"ln -sf wildcard". For consistency and optimization, the find command used to
copy newly downloaded .deb files from the sbuild env back to the build env is
also changed to use the "{} +" -exec flavor (instead of "{} ;" which spawns
one cp command for each single match). The issue of a dangling symlink named
"*.deb" was found while building against file:// sources and no remote feeds.
Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
---
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 0578977d..3fa9f604 100644
--- a/meta/classes/dpkg.bbclass
+++ b/meta/classes/dpkg.bbclass
@@ -120,10 +120,10 @@ dpkg_runbuild() {
--chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \
--chroot-setup-commands="rm -f /var/log/dpkg.log" \
--chroot-setup-commands="mkdir -p ${deb_dir}" \
- --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \
+ --chroot-setup-commands="find ${ext_deb_dir} -maxdepth 1 -name '*.deb' -exec ln -t ${deb_dir}/ -sf {} +" \
--chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \
--finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \
- --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} \;" \
+ --finished-build-commands="find ${deb_dir} -maxdepth 1 -type f -name '*.deb' -print -exec cp ${CP_FLAGS} -t ${ext_deb_dir}/ {} +" \
--finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \
--debbuildopts="--source-option=-I" \
--build-dir=${WORKDIR} --dist="isar" ${DSC_FILE}
--
2.39.2
next reply other threads:[~2024-02-26 9:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 9:55 Cedric Hombourger [this message]
2024-02-26 10:08 ` cedric.hombourger
2024-02-27 9:10 ` Uladzimir Bely
2024-02-27 9:46 ` cedric.hombourger
2024-02-27 11:40 ` Uladzimir Bely
2024-02-28 9:09 ` Baurzhan Ismagulov
2024-02-29 13:17 ` Uladzimir Bely
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=20240226095517.66032-1-cedric.hombourger@siemens.com \
--to=cedric.hombourger@siemens.com \
--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