From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a37:5c44:: with SMTP id q65mr32864197qkb.454.1587052686687; Thu, 16 Apr 2020 08:58:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:994:: with SMTP id dt20ls1009687qvb.7.gmail; Thu, 16 Apr 2020 08:58:06 -0700 (PDT) X-Google-Smtp-Source: APiQypJjXB+/I2D8Mg8R6pRH/WWkNwDn37m1JJeRExvU4S4MWGFWzc3deaXlRGQ6D8qcEofcHTCS X-Received: by 2002:a0c:f50a:: with SMTP id j10mr10259159qvm.172.1587052686240; Thu, 16 Apr 2020 08:58:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587052686; cv=none; d=google.com; s=arc-20160816; b=JWWDDNMHC/1TCsJdYfHkG2wr+VSKdIMEKhLEaW+E6LzPOXVZxDlylcJnawOVmKqo7Y BMaGwWFL8YrrtoHvA+J5rZXiedwDScwD6EUXoPWitc39faxT8RTwrdk833wg/iqOHoxG sp4qXD6c/SIyKjK0EQdPDJ2sFcIZQycfzJhffYrYVMEqqXsO2X8uQAOqaVRIi+mCh3yY hkC+BiBxo1Zcdv2exrTCgW3jcgPj5Y1rhbAHkltBcXzlxsD9URVjvNMIxOiP5guogaLP qKh53a63Cw2K40novbUJ/0FiYvwgidB8jdkQTff8NgEErP9tHwut8K0UjaR/EkH4yxPz SDIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature; bh=TXYCnb1T3GaiZXQ4Y12BrM4EgtPMhkORZhZQfK7r44Y=; b=shnt2QYzqAYFOF7vOD47L7RZjY9ndSnR02KI8XQsAUx2Q4EDHUkKzVJ0fchNA6TbSW YpRlMLDNSFba9lucBGjt7v8Z4+acsmRUXi7L4XiNMuac554XNBln6j9qwCYyjEyawltU fqErmX4brnPUGILacF+xZASaeQpgmfYMOCmzk+Gq/tL33taTWEgAYr+D7/pQj9X8Eimj RghfcOt5hoEuDaoWJWF0rBhRncT+DllSdbRIV3EfCD+hIWiKlqgCcNTlEiIxH3lyXf1R zyWxBYMMKcMUuzeu1wJJohAr8upB3wZ0p4yGYarQvRlgTN4jkVNeFf2p5Bt9ucfuJSd0 vUjQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=L8TTWR8Q; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::844 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com. [2607:f8b0:4864:20::844]) by gmr-mx.google.com with ESMTPS id x11si1264107qka.4.2020.04.16.08.58.06 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 16 Apr 2020 08:58:06 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::844 as permitted sender) client-ip=2607:f8b0:4864:20::844; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=L8TTWR8Q; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::844 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qt1-x844.google.com with SMTP id w29so16382180qtv.3 for ; Thu, 16 Apr 2020 08:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=TXYCnb1T3GaiZXQ4Y12BrM4EgtPMhkORZhZQfK7r44Y=; b=L8TTWR8QWwBOdOkNz/is626RqFtu3hTynkHwAJf6W/J99GoelCIsG5ora46mS29MNN llE9u4CDRKfz0rEDYuL6H4C9pLi2s+zMBMbpWqION4MDBoU5hc7CcYM4wxh5oZc9viYI +QPn/B/F2N4jp8jOoDbfwRsWCGPAUPcmInQGpvsbhAbv6n0o8/rGm4h7LqAT275rF1mZ 3WgBT3qF9GPS14TkvW5NxkckBN/eTTWtpzfLeVG4EaIpbZJUh98j9Br624++16PyKbkG AlCMCGeUXqnSqBITGxmFJA0ZME7aUkCDaudqsXU/oB8OgY6y1MqpNfhPm8me7ZDwJvvF aOLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=TXYCnb1T3GaiZXQ4Y12BrM4EgtPMhkORZhZQfK7r44Y=; b=TmFJ0v9tJWadWnkWWOIGbBJfb/7bZikZ8ED3RjOlowtMyED4Tfr6Dz96a2szbIJ8en 88sAc/O6TvIzpM7C3NIXVUTeU69YUoh0SqWVQKwiRFrbtN34m3mtD4VXvlZ+qu4wxZQ5 CpZySFgPnucbz9t6HLk+fajAehf193IZcpLmuyknGdWcZICOyatl56qGKtj0vugylioC qf+5aTfZE1+SNf5Jjj2HlggIXIIFcoR7taOjMGtc9HiPMNE4IB5jVxqBowVzyA8Cd2b7 FImuwlKJ07YfKuTbHml3EZiYNDAqKpy6hVTaa5Jvwy6TNncvzm2wauQgiPl+HKeJoMUx q4oA== X-Gm-Message-State: AGi0PubV7VotdkhiiyPJzSM9SMwBM5oJqsB0J8y+GCKjV9pvZuiPJVqM tCfSvZXGhQI3pitTsJ13oxpo4zV67jjVWi4IFcQ= X-Received: by 2002:ac8:4809:: with SMTP id g9mr15398722qtq.33.1587052685700; Thu, 16 Apr 2020 08:58:05 -0700 (PDT) MIME-Version: 1.0 References: <20200403130551.2158-1-Vijaikumar_Kanagarajan@mentor.com> <20200403130551.2158-2-Vijaikumar_Kanagarajan@mentor.com> <20200408120427.366b3968@md1za8fc.ad001.siemens.net> <20200408143008.6e2caa90@md1za8fc.ad001.siemens.net> <20200415201957.66ec3eed@md1za8fc.ad001.siemens.net> In-Reply-To: <20200415201957.66ec3eed@md1za8fc.ad001.siemens.net> From: vijai kumar Date: Thu, 16 Apr 2020 21:27:54 +0530 Message-ID: Subject: Re: [PATCH v4 2/2] meta: cache deb srcs as part of postprocessing To: Henning Schild Cc: isar-users , Vijai Kumar K Content-Type: text/plain; charset="UTF-8" X-TUID: k+4qzadgIJQS On Wed, Apr 15, 2020 at 11:50 PM Henning Schild wrote: > > On Wed, 15 Apr 2020 17:59:12 +0530 > vijai kumar wrote: > > > On Wed, Apr 8, 2020 at 6:00 PM Henning Schild > > wrote: > > > > > > Am Wed, 8 Apr 2020 16:07:15 +0530 > > > schrieb vijai kumar : > > > > > > > On Wed, Apr 8, 2020 at 3:34 PM Henning Schild > > > > wrote: > > > > > > > > > > Am Fri, 3 Apr 2020 18:35:51 +0530 > > > > > schrieb Vijai Kumar K : > > > > > > > > > > > Collect the deb sources of the corresponding deb binaries > > > > > > cached in DEBDIR as part of postprocess for those to be later > > > > > > included into the final base-apt by do_cache. > > > > > > > > > > > > Signed-off-by: Vijai Kumar K > > > > > > --- > > > > > > meta/classes/image.bbclass | 2 +- > > > > > > meta/classes/rootfs.bbclass | 46 > > > > > > +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 > > > > > > insertions(+), 1 deletion(-) > > > > > > > > > > > > diff --git a/meta/classes/image.bbclass > > > > > > b/meta/classes/image.bbclass index 9fa58f8..1c7a527 100644 > > > > > > --- a/meta/classes/image.bbclass > > > > > > +++ b/meta/classes/image.bbclass > > > > > > @@ -60,7 +60,7 @@ image_do_mounts() { > > > > > > } > > > > > > > > > > > > ROOTFSDIR = "${IMAGE_ROOTFS}" > > > > > > -ROOTFS_FEATURES += "copy-package-cache clean-package-cache > > > > > > generate-manifest" +ROOTFS_FEATURES += "copy-package-cache > > > > > > clean-package-cache generate-manifest cache-deb-src" > > > > > > ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" > > > > > > ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" > > > > > > diff --git a/meta/classes/rootfs.bbclass > > > > > > b/meta/classes/rootfs.bbclass index 8bb003d..7bfdfc9 100644 > > > > > > --- a/meta/classes/rootfs.bbclass > > > > > > +++ b/meta/classes/rootfs.bbclass > > > > > > @@ -201,6 +201,52 @@ rootfs_generate_manifest () { > > > > > > ${ROOTFS_MANIFEST_DEPLOY_DIR}/"${PF}".manifest > > > > > > } > > > > > > > > > > > > +ROOTFS_POSTPROCESS_COMMAND += > > > > > > "${@bb.utils.contains('ROOTFS_FEATURES', 'cache-deb-src', > > > > > > 'cache_deb_src', '', d)}" +cache_deb_src() { > > > > > > + if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > > > > > > + return 0 > > > > > > + fi > > > > > > > > > > Should the source packages not all end up in the cache, so they > > > > > can and probably should be fetched from there. > > > > > > > > Sorry. But I am not able to understand this. Can you please > > > > explain it again? > > > > > > A first build without the cache will fetch all sources and drop them > > > into "${DEBSRCDIR}"/"${DISTRO}", just the the apt:// fetcher does. > > > A second build with an enabled cache will place all those src-pkgs > > > in base-apt (see populate_base_apt repo_add_srcpackage loop). > > > > > > So a second run of this function here should be able to fetch all > > > those srcs-pkgs from base-apt. And it would be a good idea to > > > actually do that to prove that everything is available offline. > > > > > > Note that for real offline BB_NO_NETWORK would be required. And that > > > "guard" should still be able to download from base-apt. Thinking > > > about it again ... i think you do not need the guard. If all > > > src-pkgs are available offline this function will never access the > > > internet, if it still tries the invalid proxy "guard" from > > > isar_export_proxies will trigger. > > > > > > I think it boils down to removing the > > > [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ] && exit 0 > > > and passing the ci offline/cache test > > > > > > > > > > > > > > + mkdir -p "${DEBSRCDIR}"/"${DISTRO}" > > > > > > + > > > > > > + sudo -s <<'EOSUDO' > > > > > > + cp -L /etc/resolv.conf '${ROOTFSDIR}/etc' > > > > > > + mkdir -p '${ROOTFSDIR}/deb-src' > > > > > > + mountpoint -q '${ROOTFSDIR}/deb-src' || \ > > > > > > + mount --bind '${DEBSRCDIR}' '${ROOTFSDIR}/deb-src' > > > > > > +EOSUDO > > > > > > + > > > > > > + sudo -E chroot ${ROOTFSDIR} /usr/bin/apt-get update > > > > > > Why is that in here? Doing this in the image is not allowed, only > > > for isar-apt! > > > > Hi Henning, > > > > I am sorry. But why is it not allowed? Am I missing any side effects > > of this call? > > Thanks for asking, please keep doing that when things are unclear. Sure. Definitely. > > An "update" stores a copy of the "view on the repo world" in the image. > It is essentially a copy of the Packages.gz or Sources.gz of all repos. > That information changes over time on the servers, while they still > (hopefully) offer to download packages referenced in older version of > those indexes. > > Isar relies on that. It fetches all indexes exactly once and later > downloads packages found in the cached versions. Once you update an > index the "view of the world" moves away from "the state of the image". > > On a living debian system you would always upgrade packages after > update-ing the indexes. In an "installer" - like Isar - you probably do > not want those dynamics. > > So in order to keep "the state of the image" and "the view of the > world" in sync we never "apt-get update" ... except for isar-apt which > is a repo we can/do control. > > If a build takes a really long time, there is a slim chance that we can > not actually fetch packages found in our old indexes because upstream > does not provide them anymore. I have not seen real evidence of that > potential problem. It could however manifest if we have a long running > build ... arm without cross ... and do additional fetches in postinst > ... like you are implementing. > But whatever you can not fetch in the end, is probably not worth > fetching because it is not what was used to construct your image. Thank you for the explanation Henning. It would be good if this information is documented somewhere. ;) Best, Vijai Kumar K > > Henning > > > Thanks, > > Vijai Kumar K > > > > > > > > > > > + find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read > > > > > > package; do > > > > > > You are reading this without grabbing the lock. In multiconfig other > > > images might be filling that directory as you read it. And you > > > might be calling dpkg-deb on half copied files. > > > > > > Try deb_dl_dir_import and looping over /var/cache/apt/archives/ ... > > > in which case you will find yourself dealing with isar-apt packages > > > that you need to skip. > > > In fact you should use the manifest as input to not download > > > packages installed in other images with the same distro but without > > > the feature. > > > > > > Yeahh multiconfig! > > > > > > Henning > > > > > > > > > + local src="$( dpkg-deb --show --showformat > > > > > > '${Source}' "${package}" )" > > > > > > + # If the binary package version and source package > > > > > > version are different, then the > > > > > > + # source package version will be present inside "()" > > > > > > of the Source field. > > > > > > + local version="$( echo "$src" | cut -sd "(" -f2 | > > > > > > cut -sd ")" -f1 )" > > > > > > + if [ -z ${version} ]; then > > > > > > + version="$( dpkg-deb --show --showformat > > > > > > '${Version}' "${package}" )" > > > > > > + fi > > > > > > + # Now strip any version information that might be > > > > > > available. > > > > > > + src="$( echo "$src" | cut -d' ' -f1 )" > > > > > > + # If there is no source field, then the source > > > > > > package has the same name as the > > > > > > + # binary package. > > > > > > + if [ -z "${src}" ];then > > > > > > + src="$( dpkg-deb --show --showformat '${Package}' > > > > > > "${package}" )" > > > > > > + fi > > > > > > + > > > > > > + sudo -E chroot --userspec=$( id -u ):$( id -g ) > > > > > > ${ROOTFSDIR} \ > > > > > > + sh -c 'mkdir -p "/deb-src/${1}/${2}" && cd > > > > > > "/deb-src/${1}/${2}" && \ > > > > > > + apt-get -y --download-only --only-source > > > > > > source "$2"="$3"' \ > > > > > > + download-src "${DISTRO}" "${src}" > > > > > > "${version}" > > > > > > + done > > > > > > > > > > Looks like we are going online without proxy configuration > > > > > here. It also needs a BB_NO_NETWORK guard. > > > > > > > > Will take care of that. > > > > > > > > > > > > > > And i would suggest to generate the list of things you want to > > > > > fetch, factor out the fetcher from dpkg-base and reuse is > > > > > instead of copying it. > > > > > > > > Sure. I will have a look into how I can reuse that part. > > > > > > > > > > > > > > And i would personally like a new series of patches to be sent > > > > > without "in-reply-to". Maybe its my client but i find these > > > > > deeply nested threads very hard to follow. > > > > > > > > No Problem. Will send the next series separately. > > > > > > > > Thanks, > > > > Vijai Kumar K > > > > > > > > > > > > > > Henning > > > > > > > > > > > + sudo -s <<'EOSUDO' > > > > > > + mountpoint -q '${ROOTFSDIR}/deb-src' && \ > > > > > > + umount -l ${ROOTFSDIR}/deb-src > > > > > > + rm -rf '${ROOTFSDIR}/etc/resolv.conf' > > > > > > +EOSUDO > > > > > > +} > > > > > > + > > > > > > do_rootfs_postprocess[vardeps] = > > > > > > "${ROOTFS_POSTPROCESS_COMMAND}" python > > > > > > do_rootfs_postprocess() { # Take care that its correctly > > > > > > mounted: > > > > > > > > >