public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Alexander Smirnov <asmirnov@ilbers.de>
To: isar-users@googlegroups.com
Cc: Alexander Smirnov <asmirnov@ilbers.de>
Subject: [PATCH] debootstrap: Add fallback apt cache support
Date: Fri, 11 May 2018 18:35:38 +0300	[thread overview]
Message-ID: <20180511153538.13665-1-asmirnov@ilbers.de> (raw)

Add apt config file to switch caching mechanism from MMap to array-based.
This needed to provide possibility to build fresh Isar suites on old hosts.
For example, building Isar stretch on jessie host fails with the following
error:

  Hit:1 http://security.debian.org stretch/updates InRelease
  Ign:2 http://ftp.de.debian.org/debian stretch InRelease
  Hit:3 http://ftp.de.debian.org/debian stretch-updates InRelease
  Hit:4 http://ftp.de.debian.org/debian stretch Release
  E: Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. Current value: 25165824. (man 5 apt.conf)
  qemu: uncaught target signal 11 (Segmentation fault) - core dumped
  Segmentation fault

Now Isar performs the following:
1. Checking if user attempts to build stretch on old kernels
2. Temporarly installing this apt config file.
3. Removing this file after image rootfs creation

So this file will not go to target rootfs.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta-isar/recipes-core/images/isar-image-base.bb        |  2 ++
 .../isar-bootstrap/files/isar-apt-fallback.conf         |  4 ++++
 meta/recipes-core/isar-bootstrap/isar-bootstrap.bb      | 17 ++++++++++++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf

diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb
index 00e926a..d65b1f1 100644
--- a/meta-isar/recipes-core/images/isar-image-base.bb
+++ b/meta-isar/recipes-core/images/isar-image-base.bb
@@ -53,4 +53,6 @@ do_rootfs() {
     sudo rmdir ${IMAGE_ROOTFS}/isar-apt
     sudo umount -l ${IMAGE_ROOTFS}/dev
     sudo umount -l ${IMAGE_ROOTFS}/proc
+    [ -e "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" ] && \
+        sudo rm "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf" || true
 }
diff --git a/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf b/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf
new file mode 100644
index 0000000..12ddbea
--- /dev/null
+++ b/meta/recipes-core/isar-bootstrap/files/isar-apt-fallback.conf
@@ -0,0 +1,4 @@
+# Switch apt caching mechanism from mmap to array-based.
+# This helps to build fresh Isar suites on old hosts.
+
+APT::Cache-Fallback "1";
diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
index a38dd88..a3a3a2b 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
@@ -10,7 +10,9 @@ Description = "Minimal debian root file system"
 LICENSE = "gpl-2.0"
 LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe"
 FILESPATH_prepend := "${THISDIR}/files:"
-SRC_URI = "file://isar-apt.conf"
+SRC_URI = " \
+    file://isar-apt.conf \
+    file://isar-apt-fallback.conf"
 PV = "1.0"
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
@@ -165,6 +167,13 @@ do_bootstrap() {
 }
 addtask bootstrap before do_build after do_apt_config_prepare
 
+def get_host_release():
+    import platform
+    rel = platform.release()
+    return rel
+
+HOST_KERN_VER = "${@get_host_release().split('.')[0]}"
+
 do_apt_config_install[stamp-extra-info] = "${DISTRO}-${DISTRO_ARCH}"
 do_apt_config_install() {
     sudo mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d"
@@ -177,6 +186,12 @@ do_apt_config_install() {
     sudo mkdir -p "${ROOTFSDIR}/etc/apt/apt.conf.d"
     sudo install -v -m644 "${WORKDIR}/isar-apt.conf" \
                           "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar.conf"
+
+    if [ "${@get_distro_suite(d)}" = "stretch" ] && [ "${HOST_KERN_VER}" -lt "4" ]; then
+        sudo install -v -m644 "${WORKDIR}/isar-apt-fallback.conf" \
+                              "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf"
+    fi
+
 }
 addtask apt_config_install before do_build after do_bootstrap
 
-- 
2.1.4


             reply	other threads:[~2018-05-11 15:36 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-11 15:35 Alexander Smirnov [this message]
2018-05-14  9:27 ` Claudius Heine
2018-05-14  9:40   ` Alexander Smirnov
2018-05-14 10:33     ` Claudius Heine
2018-05-14 11:11       ` Alexander Smirnov
2018-05-14 11:25         ` Claudius Heine

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=20180511153538.13665-1-asmirnov@ilbers.de \
    --to=asmirnov@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /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