From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a17:906:4351:: with SMTP id z17mr976395ejm.346.1586248715330; Tue, 07 Apr 2020 01:38:35 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c818:: with SMTP id a24ls2249052edt.4.gmail; Tue, 07 Apr 2020 01:38:34 -0700 (PDT) X-Google-Smtp-Source: APiQypK87mlpWqeSmIyOyYZDQ3YrXzo/elydLW3U70dEq2JiTwYl7mirKtxDJn8UoGIOrift+Dzy X-Received: by 2002:aa7:d315:: with SMTP id p21mr989838edq.80.1586248714441; Tue, 07 Apr 2020 01:38:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586248714; cv=none; d=google.com; s=arc-20160816; b=TjaYf7Jzjr5HjMkKPJPcsoPIxLpE6SHadaOsEHa2rREK4iUUvp+wNtflfsX+WKvue3 ZwZyFVgIChBhYFvjtPvV9tfbYMvJ7uqWWnhc0kb8E7F1VnJbcsFdPaodhg8jBYvdx8+6 Fuez8p5Xl7mI6Oh/zQCz+nLhBz76gFk4Ng2+StPC94s/c9pDnIOtOIbn04PiY+3eG3CS cLMsevkADCznUW9kryxp+9ytRBjU+JVklJxr1bdYzMtAG+Siwz7nQl5WfDHazDUlA+7Z 1FmSQsM7cWXNdDJA4SKSzpGzDS42b1eQnlN4oy86IugXdFLSNA30mz393PhMSOP7VtzL WoXA== 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:cc:to:subject; bh=4dn7aUASfA+I+w301UTR34SkBiSJUsQHTUY+EfP+v1c=; b=xeDUkMVEK//uJgT8TkLHT3LPEIgVb9wG6REc01sSb2Nsc6iB6wNiMQohgM3MaC/EBb rjtS1YuOFWiQDvgcUMgZgf0AA2uZSLY3jAzOfsei/OLVknYV/5zqDFueIuGC/AtKR2Fd D2E6pleIpiTh0724TtQ0nHziquVmHbDVAcsTVVjduj1K78xvS0PiPX+aCSiczJrFYheZ fDeJWyNz67nl5RkUnlidwXNl5Qj1s+EpZIgzy6ZcOD6ALodTyXW7XDAPzR+zNRtBOZKQ 4cwIDCTyHTangWWNUzmuqj9fJzEFBEkYVsv9Lhs4f8qJ6wvjCwtsaGeodUeMeazR9E1D QO2Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id k14si156858ejb.1.2020.04.07.01.38.34 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 01:38:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 0378cX20026057 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Apr 2020 10:38:33 +0200 Received: from [139.22.39.199] ([139.22.39.199]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0378cW0I019097; Tue, 7 Apr 2020 10:38:33 +0200 Subject: Re: [PATCH v4 2/2] meta: cache deb srcs as part of postprocessing To: vijai kumar Cc: isar-users , Vijai Kumar K References: <20200403130551.2158-1-Vijaikumar_Kanagarajan@mentor.com> <20200403130551.2158-2-Vijaikumar_Kanagarajan@mentor.com> <95fef6ff-5434-fd54-3b7f-9a656a725297@siemens.com> From: Jan Kiszka Message-ID: Date: Tue, 7 Apr 2020 10:38:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: viJFHIk6fcC9 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 ''