[RFC 1/2] rootfs: download packages with host apt

["'Felix Moessbauer' via isar-users" <isar-users@googlegroups.com>]

The dependency resolving and download are architecture unspecific, hence
they do not need to be emulated. By not emulating them, we follow the
approach of mmdebstrap and significantly speedup this operation.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta/classes-recipe/rootfs.bbclass | 40 ++++++++++++++----------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/meta/classes-recipe/rootfs.bbclass b/meta/classes-recipe/rootfs.bbclass
index e17f711f..6af29b40 100644
--- a/meta/classes-recipe/rootfs.bbclass
+++ b/meta/classes-recipe/rootfs.bbclass
@@ -337,10 +337,12 @@ rootfs_install_pkgs_download[progress] = "custom:rootfs_progress.PkgsDownloadPro
 rootfs_install_pkgs_download[isar-apt-lock] = "release-after"
 rootfs_install_pkgs_download[network] = "${TASK_USE_NETWORK}"
 rootfs_install_pkgs_download() {
-    # download packages using apt in a non-privileged namespace
-    rootfs_cmd --bind "${ROOTFSDIR}/var/cache/apt/archives" /var/cache/apt/archives \
-               ${ROOTFSDIR} \
-               -- /usr/bin/apt-get ${ROOTFS_APT_ARGS} -o Debug::NoLocking=1 --download-only ${ROOTFS_PACKAGES}
+    # download packages using the host apt in a non-privileged namespace.
+    rootfs_cmd --bind "${ROOTFSDIR}" "${ROOTFSDIR}" \
+               -- /usr/bin/apt-get -o APT::Architecture=${ROOTFS_ARCH} \
+                                   -o Dir="${ROOTFSDIR}" \
+                                   ${ROOTFS_APT_ARGS} -o Debug::NoLocking=1 \
+                                   --download-only ${ROOTFS_PACKAGES}
 }
 
 ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT ??= ""
@@ -356,23 +358,19 @@ ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_isar_download"
 rootfs_install_pkgs_isar_download[weight] = "50"
 rootfs_install_pkgs_isar_download[isar-apt-lock] = "acquire-before release-after"
 rootfs_install_pkgs_isar_download() {
-    mkdir -p "${WORKDIR}/dpkg"
-
-    # Use our own dpkg lock files rather than those in the rootfs since we are not root
-    # (this is safe as there are no concurrent apt/dpkg operations for that rootfs)
-    touch "${WORKDIR}/dpkg/lock" "${WORKDIR}/dpkg/lock-frontend"
-
-    # Command apt-get install do not cache packages from local repos
-    # We can obtain non cached package URIs by recalling install command here
-    # No need in export those files to dl_dir, so we can run it right after
-    rootfs_cmd --bind "${ROOTFSDIR}/var/cache/apt/archives" /var/cache/apt/archives \
-               --bind "${WORKDIR}/dpkg/lock" /var/lib/dpkg/lock \
-               --bind "${WORKDIR}/dpkg/lock-frontend" /var/lib/dpkg/lock-frontend \
-               --chdir "/var/cache/apt/archives" \
-               ${ROOTFSDIR} \
-               -- /usr/bin/sh -c "apt-get ${ROOTFS_APT_ARGS} --print-uris ${ROOTFS_PACKAGES} | \
-                                  sed -n \"s|^.*/\\(.*\\)_[^_]*_[^_]*\\.deb'.*|\\1|p\" | \
-                                  xargs -r apt-get download"
+    # apt-get install does not cache packages coming from local repos
+    # (isar-apt). Obtain their URIs by recalling the install command and
+    # download them using the host apt, same as rootfs_install_pkgs_download.
+    # No need to export those files to dl_dir, so we can run it right after.
+    rootfs_cmd --bind "${ROOTFSDIR}" "${ROOTFSDIR}" \
+               --chdir "${ROOTFSDIR}/var/cache/apt/archives" \
+               -- /usr/bin/sh -c "apt-get -o APT::Architecture=${ROOTFS_ARCH} \
+                                           -o \"Dir=${ROOTFSDIR}\" -o Debug::NoLocking=1 \
+                                           ${ROOTFS_APT_ARGS} --print-uris ${ROOTFS_PACKAGES} | \
+                                   sed -n \"s|^.*/\\(.*\\)_[^_]*_[^_]*\\.deb'.*|\\1|p\" | \
+                                   xargs -r apt-get -o APT::Architecture=${ROOTFS_ARCH} \
+                                                    -o \"Dir=${ROOTFSDIR}\" -o Debug::NoLocking=1 \
+                                                   download"
 }
 
 ROOTFS_INSTALL_COMMAND += "${@ 'rootfs_install_clean_files' if (d.getVar('ROOTFS_CLEAN_FILES') or '').strip() else ''}"
-- 
2.53.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260720105228.395364-1-felix.moessbauer%40siemens.com.