From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a50:b062:: with SMTP id i89mr667171edd.72.1586241896733; Mon, 06 Apr 2020 23:44:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:e71a:: with SMTP id a26ls2001455edn.5.gmail; Mon, 06 Apr 2020 23:44:56 -0700 (PDT) X-Google-Smtp-Source: APiQypJsYJJzX/nGz9HzZBq8VE4PvmxpITZrR1RjlZKGt9XKjZiTH429EIEXCN1JDfMjfETwexhp X-Received: by 2002:aa7:d588:: with SMTP id r8mr678063edq.17.1586241896097; Mon, 06 Apr 2020 23:44:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586241896; cv=none; d=google.com; s=arc-20160816; b=qhU215P3bTcr4+WFTzWbf2HfrxLOGTehp0h6Mlb2+R33Pwejofl9UOlLZKFjyp4aYS cVpVdl4O0IuCEq+/pQNZLk4cqOb03+cFN7nEt7GAxtd8SKFFzw4y9qQPepEu5Z9I8ark qGxmrVyzfcEnAv/FwgHA349Dut+d4TTJOmoeAp173qyNG7ix4xsikC5oc7IxhDNoHKG3 mQNkk5uZnKLjOzazvUrVu7APg5wexRQKr3/O0ZIaMN3QHsktWDnX2fS82KMBIbuuOwgw VYyyqAKWkI2JE6A+2e5l1pc+Y+G2l5szSexdNAW/GePLbK++LO6QyTj0SDlloy3kSKQy QwEA== 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=dmk9RIcuT11ery3JQu47uGqJaCOmrYQdMB8KNj6IJj4=; b=XmCd95B37qFDqabfhSXgPKbZQ7eiYrJApbWFfy4Eyi6cJnQQcA3pc92d8ONL0ct1PT A3/7GaGYqzUWzKNT3iEEQrgCve2nahVESu+6DZENS3Fpne0eCHuiVATaCorxVOncv2ns ZkYOTt9HhtU5IjODDgC4k6JZ1hmiZAStsLiupZ3VsjbMzsy62mFwO1Hr3M0krxHYCLBi tnxbC9opQ4yHc+qdLq6TKM817aUV/0DzZNP9G4cgzcyjAfN+zQY1D86b5A4bAhr0yALN eGaZznFw0dOuXLn+SIYpPRwkE18LlAGUjruIPhx7FfsrPljJ3z4z0oEVL/JiozxFPtc/ SRgg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id k14si137307ejb.1.2020.04.06.23.44.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Apr 2020 23:44:56 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 0376itBG022176 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 Apr 2020 08:44:55 +0200 Received: from [139.22.39.199] ([139.22.39.199]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0376isQg016410; Tue, 7 Apr 2020 08:44:54 +0200 Subject: Re: [PATCH v4 2/2] meta: cache deb srcs as part of postprocessing To: Vijai Kumar K , isar-users@googlegroups.com Cc: Vijai Kumar K References: <20200403130551.2158-1-Vijaikumar_Kanagarajan@mentor.com> <20200403130551.2158-2-Vijaikumar_Kanagarajan@mentor.com> From: Jan Kiszka Message-ID: <95fef6ff-5434-fd54-3b7f-9a656a725297@siemens.com> Date: Tue, 7 Apr 2020 08:44:54 +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: <20200403130551.2158-2-Vijaikumar_Kanagarajan@mentor.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: 6cEuHmtw3ht4 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". Jan > + done > + > + 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: > -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux