From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155362384243064832 X-Received: by 2002:ac2:55b6:0:b0:4a4:6ec2:2a0e with SMTP id y22-20020ac255b6000000b004a46ec22a0emr3958504lfg.161.1665994901346; Mon, 17 Oct 2022 01:21:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3590:b0:494:6c7d:cf65 with SMTP id m16-20020a056512359000b004946c7dcf65ls567776lfr.2.-pod-prod-gmail; Mon, 17 Oct 2022 01:21:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5qoEOlVVnngNu6uZ3cG5aY27V+4mffmGHQO4MeTMsehNFuS+iQm7YhL3zsrmAHTwev5sPD X-Received: by 2002:a05:6512:3b28:b0:4a2:6e0b:54c7 with SMTP id f40-20020a0565123b2800b004a26e0b54c7mr3850896lfv.79.1665994899781; Mon, 17 Oct 2022 01:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665994899; cv=none; d=google.com; s=arc-20160816; b=khIs5kIGLRgeVXYo6c7Isv3pB7OkVfWzygs+PMyWKhl7UV3vHkxwdrLhN+ZLH0qajv zQ/wZ9w03wP0mjdur4MjiCGRNVYxL9Pj5FGI4PrSCwhp/CB0flfjdvvNJflYASQvv65u mQ5xqC4poqgqDrOVU1BAKi20TiORGCw7ku8Fu1dz6bsfnP143jD8p9ePIkQPseKHnMVP YKOFZTYM+qBeQKOPhrxcT0z0SYckvn4XU6+MxpOY0Mwg/7PpckYRyZwxvyfecALcCnqT ktH0+8nXjjplCZOORe0U9jUCh+fmRDVIwHT4QAYztLFpYYJM9gM77gNxE4NP6tdVz57M KMog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=0dt3CnEKwnpb8aZziWxrMhwBWimuXndDJqH97QfrHrw=; b=qAKVzlqtJqisKPJDNFTaom6Y+O1kuBjpvuy22NVarkXsksXDvTZmjVDko/QzEwusp1 aQvHa3EXJATUhslKZsOmi7anmhae6Z8BmJFmYf7c99s2wKyntI7QtJDVcMtky8PGWyXd J2Z5abMKmyqZuvtulrhkGAPlEQtDEJVC41SIeNCLOT9V/z0q2Enl/cViqxo4UcMUettP DZyyuiu+pYNHwl9qsLb/g0X3jje7GhEoSvcJW2q3nY+8rKiUw/+Ss0v6fegZdIKGpGog CqH3ARnkP12YA129oK9VPcj6kI9GkQEadCfyqrpu+VviY1yot9gFcS1EIyUzmzwjRTXB 9bIw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id s5-20020a056512314500b004a469aa668dsi72800lfi.8.2022.10.17.01.21.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Oct 2022 01:21:39 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from home.localnet (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 29H8Lcpm014939 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Oct 2022 10:21:38 +0200 From: Uladzimir Bely To: "isar-users@googlegroups.com" , "Bezdeka, Florian" Subject: Re: [PATCH] Fix cache-deb-src on raspberry targets Date: Mon, 17 Oct 2022 11:21:33 +0300 Message-ID: <2075603.9o76ZdvQCi@home> In-Reply-To: References: <20221017062027.3610-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: UWHkjzerlEcR In the email from Monday, 17 October 2022 10:36:54 +03 user Bezdeka, Florian wrote: > 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 > I doubt. This patch just fixes cache-deb-src functionality in case of "host" and "target" distros are different (e.g. "debian-*" and "raspios-*"). > > > > Signed-off-by: Uladzimir Bely > > --- > > > > 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 > > > > -- Uladzimir Bely