From: "Bezdeka, Florian" <florian.bezdeka@siemens.com>
To: "ubely@ilbers.de" <ubely@ilbers.de>,
"isar-users@googlegroups.com" <isar-users@googlegroups.com>
Subject: Re: [PATCH] Fix cache-deb-src on raspberry targets
Date: Mon, 17 Oct 2022 07:36:54 +0000 [thread overview]
Message-ID: <e9106d8d680578e39f86f4e0444e4908c9e3b8d0.camel@siemens.com> (raw)
In-Reply-To: <20221017062027.3610-1-ubely@ilbers.de>
On Mon, 2022-10-17 at 08:20 +0200, Uladzimir Bely wrote:
> Enabling cross-imager (commit 442c2a14) resulted in placing some
> host (e.g. debian-bullseye) packages in target (raspios-bullseye)
> download directories. So, `debsrc_download` function couldn't find
> sources for these host (cross) packages on target mirrors.
>
> This patch fixes the issue by using correct download directory
> for the packages used by the imager.
Any chance that this fixes [1] (as well)?
[1] https://groups.google.com/g/isar-users/c/GB4KRe6V6ME
>
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
> meta/classes/image-tools-extension.bbclass | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass
> index e13d4a3f..ecd4365b 100644
> --- a/meta/classes/image-tools-extension.bbclass
> +++ b/meta/classes/image-tools-extension.bbclass
> @@ -19,10 +19,15 @@ do_install_imager_deps() {
> exit
> fi
>
> + distro="${DISTRO}"
> + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then
> + distro="${HOST_DISTRO}"
> + fi
> +
> buildchroot_do_mounts
>
> E="${@ isar_export_proxies(d)}"
> - deb_dl_dir_import ${BUILDCHROOT_DIR} ${DISTRO}
> + deb_dl_dir_import ${BUILDCHROOT_DIR} ${distro}
> sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \
> apt-get update \
> -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \
> @@ -32,7 +37,7 @@ do_install_imager_deps() {
> --allow-unauthenticated --allow-downgrades --download-only install \
> ${IMAGER_INSTALL}'
>
> - deb_dl_dir_export ${BUILDCHROOT_DIR} ${DISTRO}
> + deb_dl_dir_export ${BUILDCHROOT_DIR} ${distro}
> sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \
> apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \
> --allow-unauthenticated --allow-downgrades install \
> --
> 2.20.1
>
next prev parent reply other threads:[~2022-10-17 7:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-17 6:20 Uladzimir Bely
2022-10-17 7:36 ` Bezdeka, Florian [this message]
2022-10-17 8:21 ` Uladzimir Bely
2022-10-24 10:39 ` Anton Mikanovich
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=e9106d8d680578e39f86f4e0444e4908c9e3b8d0.camel@siemens.com \
--to=florian.bezdeka@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=ubely@ilbers.de \
/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