From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6935499186756386816 X-Received: by 2002:a5d:50c7:: with SMTP id f7mr181350wrt.18.1614797954238; Wed, 03 Mar 2021 10:59:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d1e6:: with SMTP id g6ls348093wrd.3.gmail; Wed, 03 Mar 2021 10:59:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxSnbc/VQqd5zvo1JZFH36jozTwx+NA83Dh+1332Adzkhez/mQWZ0wrAdwJErg7kvvP5K2+ X-Received: by 2002:adf:e391:: with SMTP id e17mr39183wrm.285.1614797953493; Wed, 03 Mar 2021 10:59:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614797953; cv=none; d=google.com; s=arc-20160816; b=om4sLyE8b4B9NuOLQNE9GADhCQmf46YuMPd6K8ffPWhdi4w7j4G0x3M6RneM8FIa41 UPJ0sktpygMtOrP50IkES/+Tv2kPzTxVKPM3Fh54JU8KEaQPK2zkBs4eAYGt/1NI5z0X e/BGtxjIdxs0NkVd3WlvGQ+RUrQi3QxzYhFmfmGeZNVhTK6gb7CsyTPsAi4kA+iV36ik ZcbWZxBxOZql40xz+ZCfrMRycgkJpVIG61QOWKN5zuVFW+8mTzTzx7skv2CobGPw0SNH ZyUyiFzW6Nv43nRdOdITWcK9MCYUEVgLkcLyIGzxNWdg5uwHNFif2xwv6VdM202FZJEm Wy7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=ZvxOraeE1UzXl5OaWyxyvxreo+Rd/TnFuRCz9fjZuZE=; b=FpjSCfEIghQ3PXKsR3/ge8LlvqkjAwhiAUCudnPquz/Nm7Fao1Q4GFhWsruI2v9bJe J4iuhWWw8VhwVTWmO2f046niSWM4CNP4AZd0QHUVOBL4ak6KsI/lO6cLVO6q4Sf/rP47 CI35UY3PB0p3JNUNmt5sBrt6Z93oWJkF1urM3cXUxp2vapVQubtqPHfMQg5FnN5kvnf1 Ga+CLXJsBzaTZX5bxmevUqjEsEpKaM5P5WPQJsoJ0xRGnrgcLmTYfbAmoDem/KdoJKdr TJ6yHrzwlqXuC1jZlodoHkvDirpefbSrwg+DMsLem835AU24C5fyulLt5acRkJaHw3dN rjYg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id i22si426968wml.2.2021.03.03.10.59.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 10:59:13 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 123IxD4s025121 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Mar 2021 19:59:13 +0100 Received: from md1za8fc.ad001.siemens.net ([139.22.36.86]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 123IxChO010226; Wed, 3 Mar 2021 19:59:12 +0100 Date: Wed, 3 Mar 2021 19:59:11 +0100 From: Henning Schild To: Vijai Kumar K Cc: Subject: Re: [PATCH v2] dpkg-base: Introduce do_apt_unpack Message-ID: <20210303195911.76cfd86a@md1za8fc.ad001.siemens.net> In-Reply-To: <20210303183823.11563-1-Vijaikumar_Kanagarajan@mentor.com> References: <20210303183823.11563-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: GuYSitU2mfrJ Am Thu, 4 Mar 2021 00:08:23 +0530 schrieb Vijai Kumar K : > The Debian source package fetch and unpacking happens now inside the > do_apt_fetch task. > > With the current do_apt_fetch implementation, it is not possible to > use a custom source directory(${S}). > apt-get source by default extracts the contents of the debian source > into folder with name _. > > Add provision for specifying a custom source directory. > > Add a new task called do_apt_unpack and move unpacking logic there. > > Signed-off-by: Vijai Kumar K > --- > meta/classes/dpkg-base.bbclass | 24 +++++++++++++++++++++--- > 1 file changed, 21 insertions(+), 3 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass > b/meta/classes/dpkg-base.bbclass index 5c7bddc..a6c2e3b 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -58,7 +58,6 @@ do_apt_fetch() { > if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then > return 0 > fi > - rm -rf ${S} > dpkg_do_mounts > E="${@ isar_export_proxies(d)}" > sudo -E chroot ${BUILDCHROOT_DIR} /usr/bin/apt-get update \ > @@ -69,8 +68,6 @@ do_apt_fetch() { > for uri in "${SRC_APT}"; do > sudo -E chroot --userspec=$( id -u ):$( id -g ) > ${BUILDCHROOT_DIR} \ sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && > cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only > --only-source source "$2"' my_script "${DISTRO}" "${uri}" > - sudo -E chroot --userspec=$( id -u ):$( id -g ) > ${BUILDCHROOT_DIR} \ > - sh -c 'cp /downloads/deb-src/"$1"/"$2"/* ${PP} && cd > ${PP} && apt-get -y --only-source source "$2"' my_script "${DISTRO}" > "${uri}" done > dpkg_undo_mounts > @@ -79,6 +76,27 @@ do_apt_fetch() { > addtask apt_fetch after do_unpack before do_patch before do_apt_unpack > do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" > > +do_apt_unpack() { > + rm -rf ${S} > + dpkg_do_mounts > + E="${@ isar_export_proxies(d)}" Not sure about this, i would hope the unpack would be "purely offline" > + for uri in "${SRC_APT}"; do > + sudo -E chroot --userspec=$( id -u ):$( id -g ) > ${BUILDCHROOT_DIR} \ > + sh -c ' \ > + set -e > + dscfile="$(apt-get -y -qq --print-uris source "${2}" > | cut -d " " -f2 | grep -E "*.dsc")" but maybe this guy needs network Thanks, looking good so far! Henning > + cd ${PP} > + cp /downloads/deb-src/"${1}"/"${2}"/* ${PP} > + dpkg-source -x "${dscfile}" "${PPS}"' \ > + my_script "${DISTRO}" "${uri}" > + done > + > + dpkg_undo_mounts > +} > + > +addtask apt_unpack after do_apt_fetch before do_patch > + > addtask cleanall_apt before do_cleanall > do_cleanall_apt[nostamp] = "1" > do_cleanall_apt() {