From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7155362384243064832 X-Received: by 2002:a05:600c:2255:b0:3c4:6c57:3d19 with SMTP id a21-20020a05600c225500b003c46c573d19mr6266398wmm.92.1665987629528; Sun, 16 Oct 2022 23:20:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:69e:b0:22e:5d8a:c92d with SMTP id bo30-20020a056000069e00b0022e5d8ac92dls16944872wrb.1.-pod-prod-gmail; Sun, 16 Oct 2022 23:20:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7z4MwE3Ihf6iGUcf/tAt6khiANhcUwbJubsk76BttQbWuLK8fWNVDvTowdwBH7K/8H698u X-Received: by 2002:a5d:598c:0:b0:22e:3b2a:acaa with SMTP id n12-20020a5d598c000000b0022e3b2aacaamr5120990wri.451.1665987628309; Sun, 16 Oct 2022 23:20:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665987628; cv=none; d=google.com; s=arc-20160816; b=JicDNlOkZODa1ng3j3bLa1SBHO3udjJBBLwkDIWomoY9TZWsrkJyEqThjHN4WMADRV NlNCBDNghehHzDu1hec42Yl9CSCyXmU1iiLJeFI7yvbeIoo4l0ra3CE91MOPbNPQxxA/ 7yJBFJnBXmWHRev6Sw/VuOmFfUb4A1/UF0gblb5uSfhQTJB8JIJ2xGP+2XclvmFAucYS a5NPjKP4wfIxXwuMrXWGgXduKzVElPTA6ZoyEfsKhH39rQIQDpqJlfY8tGzsqK/PT+hR l2+/x9qXQno0rSoexoiWebjDXX9mtM8vUmrkZyEIa4+dSXZDAmwcpC9nOcb1LpmJAtBJ fW0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=n/hHrSeQ+qLpY9opKHb1LSahvr40b9Z+bgeQResnZpg=; b=R6StnGZ0oxoJIeRmdPvWFoH7MZaNpPGL+R4ix2OUrSxiXfJxDHgzAmv4YWNRqScrgO RRMThilk//4NMglGA9FYYu6YnamhNwCKR+UhFdCA8Zbh/FvEpp5fuSrE1y4pJLpXs253 UixOZ9KFDuRGF/B5CJZPCtEKxi4WcvdrMWHTtJN69YY8Bw+pvgiUzRMLzWabOWSR+kIm oeEHm2ehSAkDhRoez2ppGxD2SpYUJb9WTB9ewqafUoft4CSahkb//BfsJvWV8Z5x3A40 BuqY4rvElv9U6vHJqjaf5aAUrjxSuk3aCackNSwIbf7KljWw6jlLhx+vS9bS5TgExvh/ 5jjg== 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 a1-20020a05600c348100b003c6c0197f3dsi658240wmq.2.2022.10.16.23.20.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Oct 2022 23:20:28 -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 baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 29H6KRnN014476 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 17 Oct 2022 08:20:27 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Fix cache-deb-src on raspberry targets Date: Mon, 17 Oct 2022 08:20:27 +0200 Message-Id: <20221017062027.3610-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: dUXpMkJPh4NO 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. 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