Re: [PATCH] dpkg: use find to create symlinks to downloaded .deb files vs ln -sf wildcard

["cedric.hombourger@siemens.com" <cedric.hombourger@siemens.com>]

On Mon, 2024-02-26 at 10:55 +0100, Cedric Hombourger wrote:
> 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.

Please consider this patch for 0.10. Currently doing some integration
tests against Isar's HEAD. This issue with the broken symlink named
"*.deb" is causing offline builds of our product to fail. Our hope is
for our next release to be based on a pristine 0.10 Isar release and we
will therefore strive to provide timely feedback and/or patches to the
various -rcX tags until 0.10

> 
> 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}