From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6790334981638979584 X-Received: by 2002:a17:90a:208:: with SMTP id c8mr1013185pjc.153.1586242749718; Mon, 06 Apr 2020 23:59:09 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:86c7:: with SMTP id x190ls1472932pfd.4.gmail; Mon, 06 Apr 2020 23:59:09 -0700 (PDT) X-Google-Smtp-Source: APiQypIrpR8pEG9JBeNyzz8V20Hkp9OIt3Yfrnp5lEsfLHShKu0pRP/h3JUOh5Z3mdNKhTVoSXrF X-Received: by 2002:a65:6855:: with SMTP id q21mr666384pgt.188.1586242749125; Mon, 06 Apr 2020 23:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586242749; cv=none; d=google.com; s=arc-20160816; b=eWfZYpTpGqfmzbG8VAY/pMB0dL55Tm128jOnMcOcVau3jrUlDXj4mxN/7u55X4NZtP N5Hv80FdCvFjq+ETUL7RIMzXFsT2EJ3Re+Uj5BYsAb3/2pxi/DHrXHjQKQawDt4kURuV RaNF9gG6ZskSJaOm5UOwuM18IJcmw9yWjyVIBE4UnaCre+BM8PZ4qwf5We3K0DPiLbzd lOYZ/w6LIC1FTHqhT/avzyoT3taskBjtOUUzl/leY6VCOT2lhlMIfFhG7aXqEexyr6eQ eqW5uVmce9WJdodi512pgF754od0mr5YDbhl8jYxV9v2Nm6ZeW753d3PLwN220NXW610 Ccrg== 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=td0dQqkKOvOHxN3PBCk4q7yyxFVmqGVMGisqCSjeiNk=; b=AzUyZzk0iEiEFCNCT5OqqQi0Ly8Lqodp7/5+8wdBHFYyHUF4F9qiuJP7mB6WNZwUHH NBBGkUiLyjdGidiauxqi3N0z+ReFyIQ1RCdrTn6rGgWhf74wPV+2kFtyYrDd3BUL0c2v CwK4zq5Idc4xx5LulVAOchBgHytloujkf1jfMbz6oXxiFDHVb9LPOaaofF/g2fvIx8S7 bXgtSqGwxaMMuC86YBTMv3vpDs5rrM1EfjPf+YW0ThcQVZk0+O3392KGpUD3b9IBvSBS bbB4boQr9dgugEG9qduBKSW/RAjjjpBeRFHYtIP5ZMOG2MMBbO9AhPNFPCXzhNh3dPe0 l2Bw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=loWPYhtO; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::743 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-x743.google.com (mail-qk1-x743.google.com. [2607:f8b0:4864:20::743]) by gmr-mx.google.com with ESMTPS id y5si96390plr.4.2020.04.06.23.59.09 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 06 Apr 2020 23:59:09 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::743 as permitted sender) client-ip=2607:f8b0:4864:20::743; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=loWPYhtO; spf=pass (google.com: domain of vijaikumar.kanagarajan@gmail.com designates 2607:f8b0:4864:20::743 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-x743.google.com with SMTP id 13so622527qko.10 for ; Mon, 06 Apr 2020 23:59:09 -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=td0dQqkKOvOHxN3PBCk4q7yyxFVmqGVMGisqCSjeiNk=; b=loWPYhtOc5Va+2WFOabBj1Ev/XMkCW3XRimMDqxH++Y6GA6yMPfLojyRv8I6ILZUc6 mjEYw0RZUnRRDvhW2ZkPER4C4fpMKVViQd4vY1dzJDYVgVJZgrAGD/ekAYGPqTzVs4A3 aem7YBECTZKhOU69/2yapWrMt5mmqhVPZp8S2ZbSPCdAlu8zh56nCK1ZiPobefhzHZSY 51TmHYHs5GBIUQwY+MXV4LTGwZbpDZxM2AbxkOhw/Qz7b4Pd//wm8NvJakjaN+i/kTjm qn1faFsAYDsygJ3ytRDlSz3OJJJPdFbzEEhAw85bjtQoVO3YnnuBn8LQ9o+kNH8girB2 SeVg== 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=td0dQqkKOvOHxN3PBCk4q7yyxFVmqGVMGisqCSjeiNk=; b=Dqji0O9GHH5N2q6C/UW/XjrODzQKPbHP69lLlPM1lwDJ6keKtSorAVj4IDkAkHdb67 yC41sdhAAmUEuVRU78yiKF3gyBaKoAFFejtyvYq9KfDUwdLpMk+nWYrsC907Ajdn8viY T93lEjoMDvfI3Syl2TPax4OUYdxwl49Ra66dM9K255tDzBgI4nOdt/n+drSCrKXsWPge 0EnrTpvzyo9OXb9rgwMzI98co0Tbd+p1vtLd/je+9rAQu5KwB797/fywgF9pgTzRz6oV qas92Pq9L+Uj0Gb30BON72RIAvpsrW3+UipGG5B8/djNmau8pgVXdaitdo7Y7ny8t4O/ HyMQ== X-Gm-Message-State: AGi0PuZfEE8bELPAPTSTYqHySSOvbXTqimlVZtggGdy1HuRUAFPk66Js pGvLc9t6RxZkhe6BhWT2dvI/SJGdFw3N72ble1A= X-Received: by 2002:a37:9e17:: with SMTP id h23mr717177qke.315.1586242748238; Mon, 06 Apr 2020 23:59:08 -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: <95fef6ff-5434-fd54-3b7f-9a656a725297@siemens.com> From: vijai kumar Date: Tue, 7 Apr 2020 12:28:57 +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: q4osqi3yS4CE 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 ''