From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6554347564595937280 X-Received: by 2002:a37:581:: with SMTP id 123-v6mr13870501qkf.50.1526290844510; Mon, 14 May 2018 02:40:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:72c3:: with SMTP id o3-v6ls6984648qtp.5.gmail; Mon, 14 May 2018 02:40:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpI2qy73AQ7CGF5JvK4wiqBZDqNrnVh2mZAQMckvQqPTb/gxozVhQCexCn8ZZ5z+ApJzwzL X-Received: by 2002:ac8:43d5:: with SMTP id w21-v6mr15668198qtn.0.1526290843938; Mon, 14 May 2018 02:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526290843; cv=none; d=google.com; s=arc-20160816; b=hdxeSh70yma6X7e2giCCG2IGkHWLQR/t33gIporEx/aEbpKxyg9gw5u1Aj8e3eChSb b2nwqdJrlfpQD2BgjE+LYf3DqzWvqibcDUsoa7IAKn/qvio/z58PG3aIhXwkDFDSscZh IrlSjJubNnJffotNlKanPQIksEg6AgypT6hRMypwFwUO2FaENjlzSRz03OAupRoyUF1D ggj021ru5G67h0y2+spdE1dGLrhAbMt/ei1Xgh2KwTlreiOmXK/vhxOQ1GOnB0ZH2UrB u3rOrGtV1CwJ3PI09Jws7bq8KGgPCNZhRKbu1ssh13T9hu/Px5+Tn1jmgNmlsAul1ALr eNVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:from:references:to:subject :arc-authentication-results; bh=3TWiu9qDeqUkMO5C3UJC4g/n5huVC8s2Dq3rdQ6lcXc=; b=jDJmdD0hxfnSTUkQbGXJFIfX4olgL4QP8kpXl+tvhkB2SARIDm0DaagoQVXuZDmAc3 ubwf8AVYvLml5VbvmCPwXC1QgUzun4LAcCl6093FnyvxGwU+05+mdjY7tS+DUM4detYr ubZNhjh9VPBHDvKtzOL0tLUGTLHZhJFskX9r2nqkr9UBOHEtZdr4+3jN7bQUlx0212uD UdQpCMuf9pN4Rrxro3HuBSWu96iJMrcuqGiEVf3+iVrYVz+Y9SBPL320yHrF+uQXWkss GdzYIkw6OnXFakDFgMpRrFW8gcplcdpzOyeLfDGMw+iJ+/XtEYMnTm1Bp7qticnggb0u vXag== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id m7-v6si816160qtg.2.2018.05.14.02.40.42 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 02:40:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from [10.0.2.15] ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w4E9ebQ1011162 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); Mon, 14 May 2018 11:40:39 +0200 Subject: Re: [PATCH] debootstrap: Add fallback apt cache support To: Claudius Heine , isar-users@googlegroups.com References: <20180511153538.13665-1-asmirnov@ilbers.de> <8de008f9-7bb8-415a-8dcb-08cfa846a701@siemens.com> From: Alexander Smirnov Message-ID: <049f5e59-ac1c-8a76-754a-e2cf0c82f2cc@ilbers.de> Date: Mon, 14 May 2018 12:40:31 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <8de008f9-7bb8-415a-8dcb-08cfa846a701@siemens.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-TUID: l6wlWxbays3/ On 05/14/2018 12:27 PM, Claudius Heine wrote: > Hi Alex, > > so I guess that this patch replaces the 'isar-bootstrap: Increase cache > room' one right? > > On 2018-05-11 17:35, Alexander Smirnov wrote: >> 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 >> --- >>   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 > > Why not just 'sudo rm -f > "${IMAGE_ROOTFS}/etc/apt/apt.conf.d/55isar-fallback.conf"' ? > Matter of taste, I don't like to remove things that don't exist. > >>   } >> 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]}" > If you need this variable in just one place. It might be useful to just > add it there. > I've added the separate variable, because probably some additional version specification could be needed later, like HOST_KERN_MAJOR etc., in this case python inlining could be difficult for reading. But for today I have only one case, so could drop it in v3. Alex >> + >>   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 > > Like this: > >     if [ "${@get_distro_suite(d)}" = "stretch" ] && [ > "${@get_host_release().split('.')[0]}" -lt "4" ]; then > > Or is it useful to overwrite this variable somewhere? > >> +        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 > > Apart from those small nitpicks it looks good, > Claudius >