From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:aca:5b04:: with SMTP id p4mr938716oib.105.1586250503997; Tue, 07 Apr 2020 02:08:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:fd02:: with SMTP id b2ls1134548oii.2.gmail; Tue, 07 Apr 2020 02:08:23 -0700 (PDT) X-Google-Smtp-Source: APiQypIH1DHWWzwjTMdQWGywGxOsV5X/Pbqho5LlV4y+lGgCOwutVzFb8dsTutIFpblk24dAX75/ X-Received: by 2002:a05:6808:605:: with SMTP id y5mr933615oih.172.1586250503627; Tue, 07 Apr 2020 02:08:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586250503; cv=none; d=google.com; s=arc-20160816; b=DPMTJOIUFfFVUVEaiJ/ZUr6PnAGldedlcxD+EGbwZRdwEVMMAHpo9P3YPNhNA6Ui+H SdVINxq6O2KreJonKwpdHyxyrTUbYT+cp5bfIS7SgZKBb60wXK37f9FAj4aJuP4qJ+c2 TGqYGXumHOY6c75VZyMWhPji18uVO4sHQWH5V0tuDQM4wyPbMt7i+ktyGfWxHZAxj/Fr r2BPhReGCRmk0ZzMpsaKKRRRs1ZQKweo0n87R/+POsPtr0nCGtdbooC/apBFs48MmOl8 HOkYPasqMBQ17eixeiF6RoYnth4jA1ibFTp+D5jct6noLhaTD/+pxq6KG1QqK397ZqML pg8A== 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=8VyCenJhCCuPTa/JfAlLUp8aiMzuLQt95/a4ZNXeNV4=; b=AjNkDyK2uwRjtPWTCL8QNp/NBb5zAVzVZtUdCYYHcsyCV8TvRrVrzt1minZWcoOqv2 vQmLB6tCsFzaQCP6C7Z+jPlnkge0SARWXwDUNBplzJqj9RrCKvkj4KMsgXp6E+rUqA16 uunogVJm8sJ9j1dzaaGiY4s6qsCp0gRX6YYwjJ85VQG5rIWa9o3jRMB0zrkFYYiZVSDx XyGlOT9fqrn6woRURlO4/Z4dbmMs/enWyIYqZkYy+GCXqVjAENoH6mFBE/zefJ6RvXIE gEwdZv3gE8g8OYKzqqvNLCV5zDVnjQqe7JbrSSVyJqIbsgsfxYTM8wGP9lxfSWA8pYlt hxBA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="EwVM6cP/"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::744 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-qk1-x744.google.com (mail-qk1-x744.google.com. [2607:f8b0:4864:20::744]) by gmr-mx.google.com with ESMTPS id a3si124582otf.2.2020.04.07.02.08.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 07 Apr 2020 02:08:23 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::744 as permitted sender) client-ip=2607:f8b0:4864:20::744; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b="EwVM6cP/"; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::744 as permitted sender) smtp.mailfrom=vijaikumar.kanagarajan@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: by mail-qk1-x744.google.com with SMTP id o18so863078qko.12 for ; Tue, 07 Apr 2020 02:08:23 -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=8VyCenJhCCuPTa/JfAlLUp8aiMzuLQt95/a4ZNXeNV4=; b=EwVM6cP/N5yaH7yNqH6zNu9hXTns7eZxjddHmkcrtVrlrcVAre2GU+vZVLscKgYCop KtcIE9XpgdUrSObl2JMw+WxE//Z437rGvKmHCNxiHaRQv9r60V2XF3CCyXn6XNHfE8IH NlDhs0XKLX2cHC7JcljVSNB9M3nqs+7J5BODJjPB6sNyhZdt+bNEjAv7BwW95dNT9q33 9Hz+MNSu9sF7Z8ziMvaxSvsOMnBSbdyRpniN/Gp3RrFLrvC6ZQC8YzD6p60mEZ30QbZ0 sWibyComIyh+aAjhkiHJ3iiQeg7F3z5erN2GkAmDOdl4vGl8RWZxGdyD627b91jFnOmy 08Iw== 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=8VyCenJhCCuPTa/JfAlLUp8aiMzuLQt95/a4ZNXeNV4=; b=tK1EUeTXZAQGlwacOoVQXu4G69xaCgIToM/+1IxPbrSA0zjdbMYFFHQxR0Dbt6Aj4j IWp8QyZZqdpOI9cuRvUCzzKe7l3z0ofiVkBY50krg0ZMDPiilLWrfxAWxfO7iULiMIM5 dlZ6KssOH9jVcBS4r/0YOEDe8SZSZIQj8g/IRcMcK/U3Pg3qsiPYnZJ6bagywh7ykGg0 eWmeUr4bERCx7/QCw+GXTHA27VzdsE3xE/Iez2gxPSnYMdxLqHpQP2kkQ+9PEEjEobTF ctndzj7AB8Efw+Su8jzB4oywKeoLxTA8e6nbSiKlFBhr6LgLvxW6Qosl4CHudM36zdtq nDNg== X-Gm-Message-State: AGi0PuarxwIZ4t2pQvPYG1cA0MNXmSssG+2szSdcMaq4cvgP4wbW2fAn zpIM1yv44aRqKIMXjn1a9dY/lGTJpFV3Ups5lMzOnZo1 X-Received: by 2002:a37:9b8a:: with SMTP id d132mr1163017qke.286.1586250502994; Tue, 07 Apr 2020 02:08:22 -0700 (PDT) MIME-Version: 1.0 References: <20200403130551.2158-1-Vijaikumar_Kanagarajan@mentor.com> <20200403130551.2158-2-Vijaikumar_Kanagarajan@mentor.com> <95fef6ff-5434-fd54-3b7f-9a656a725297@siemens.com> In-Reply-To: From: vijai kumar Date: Tue, 7 Apr 2020 14:38:11 +0530 Message-ID: Subject: Re: [PATCH v4 2/2] meta: cache deb srcs as part of postprocessing To: Jan Kiszka Cc: isar-users , Vijai Kumar K Content-Type: text/plain; charset="UTF-8" X-TUID: FtGlQVfo+n6v On Tue, Apr 7, 2020 at 2:08 PM Jan Kiszka wrote: > > On 07.04.20 09:59, vijai kumar wrote: > > On Tue, Apr 7, 2020 at 12:34 PM Jan Kiszka wrote: > >> > >> On 07.04.20 08:58, vijai kumar wrote: > >>> On Tue, Apr 7, 2020 at 12:14 PM Jan Kiszka wrote: > >>>> > >>>> On 03.04.20 15:05, Vijai Kumar K wrote: > >>>>> 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 > >>>>> + > >>>>> + 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 > >>>>> + > >>>>> + find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do > >>>>> + 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}" > >>>> > >>>> How did you construct this apt-get command? I'm trying to match it > >>>> against the man page of apt-get but there is no reference to "download-src". > >>> > >>> download-src is just the script name. > >>> The shell script call is in below format to pass the args. > >>> > >>> sh -c ''