From patchwork Thu Mar 4 07:41:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 348 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp6298557oop; Thu, 4 Mar 2021 09:42:04 -0800 (PST) X-Received: by 2002:a2e:9758:: with SMTP id f24mr2788416ljj.404.1614879724298; Thu, 04 Mar 2021 09:42:04 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1614879724; cv=pass; d=google.com; s=arc-20160816; b=bXJohr4s+vHcTwJhmScgvleF9HgQRMdEcjwUZ0uLUBWlgJhif8Wy1JRMP/PIsahQtD 8I7c7hSxXKfbGZW/qQjClZZqAe5IDroNUDYRDWvL/nghZA2aCYX5xan7grDGcJ7Q8r0T EcIJAfdQpHfg2MVdqVD+ZR1RcQh/rqkzBnvYciMbIXNtpR3E0KJCvcP9XCmMtdr6pDhd gVT950W71AbQSJM4q11Pkh5WpkX+cNbP6EtX6X9PopHCYR+8QAC3RJKx7Ra3YZ5AUudq /ksYFlo/KHsRIOXucDHNM8L/orkHD4Uz/83imrD8lAVGifOSI31LcyH/ysZ72Slsolcv seVQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=KR2OUVwcPee+yNUo+TqRb2YVs2YzG1tWSxbpySBZxRk=; b=NUM4mM02dDH9GLWrjMY4+F7CcUsPzTTuGl00vCK9PpQNSeTNuQSKHb2iN6q+RLPV1n qQBoHRGpyTnMNDAYRWzKQS2144Zo4QSDYlF0/NN9zXr6hKMZamHa+ClTbS42B/pv58wP oP9kKQaoZ+Ko2x2QCAZD/2BOz9zxnywMi2ckiel2L8nK7104Q3SA/ak7Cd/5fDRKnGqx S61h8j2qHHmEcbEXIusLR+dhEJgO/es13mCnN27JRVVOthLXIALN82VzD2lg1QVfQH/X 67t2efEgwAtgKltWg0nlx90v/fihQQGtUWynjCjUzP/wvlMA5qGZeWcvcTQOslltbikj cT/g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=nUIlgQe3; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb25xqsbamgqefwsjcxy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB25XQSBAMGQEFWSJCXY@googlegroups.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id z7sor31743ljk.69.2021.03.04.09.42.04 (Google Transport Security); Thu, 04 Mar 2021 09:42:04 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb25xqsbamgqefwsjcxy@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=nUIlgQe3; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb25xqsbamgqefwsjcxy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB25XQSBAMGQEFWSJCXY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1614879724; cv=pass; d=google.com; s=arc-20160816; b=w5B/GlPMBs1EDVURQ3IklKR+er9iKdVGxVscUZrkYEAM2dZPHSXp2hhkEi55f0c+S4 gppeW/BX89lA6VvG/IjBBe6pAzT5IE9DSTaKIipzTYdjfUMwkOgiyrzpLoc+5alA2lxt QZjVAqEQMEV0szKM8+k29u0vUsf3XJsCWW30XHhCpx9pg6ZPfNt2KsrxguDUXm7SoEVK kFDpjw2rb1gEBK0xuoTVx43EKWNe/DntcsXauEpRHd/CVrfTOgftOVd+YZ/BfK7U5B0G aUGk1YR+uEkoQmu47Oz2sVkl6AObyiJCdqAIunMiyz/M2ostO1amigY2CbIym20zyGGt 3MMw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:ironport-sdr:ironport-sdr:sender :dkim-signature; bh=KR2OUVwcPee+yNUo+TqRb2YVs2YzG1tWSxbpySBZxRk=; b=R0JEawLB4F3yAV+e8fO1Tpq9oAa0BmL6rC+KiwbT6V29OIN6rymInnt2/bjvxizV5I +wodmkPDE4K3LFXTDrWR5xuvjtTCQMbg4S2FQT8MnvDSIpcCTSJ1up5Ai/Ig9q7rWP/n kNUCV4s6t0QTLo73cXAPfw3TsjvyRRVVvr02cW6ZLa5V9LibPKz4UkbTDVEsH+ZSFSCH rB+NmtATTnZEa9tEdQMJTfeKmGRWmJbGywW1ZFPHwt5hZPz8BcEAxRk5IOQKKKwnkzL1 aVxvhckwCeyJOni6UXrDJpCxUkKRI/0tS3fp2L1l8WlUOWf+oQ6lRimirM7SqYDRNoWx yqWw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:ironport-sdr:ironport-sdr:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=KR2OUVwcPee+yNUo+TqRb2YVs2YzG1tWSxbpySBZxRk=; b=nUIlgQe3oj5XkJI96UDr8uZYPlsShg9ToR0V4Q4ChMsboFKp50bN/SsGs5Li4PvqLe LaaEjaM8vQx9HI6wPHDxYF2Sz5Y72CdPM29U6I9SYVFs83fDt4NpsxdqVYrJskg97qKR 43mbdh2ZwNyNJ/KSBkWeetgKVn1hZA/WqLRZXrB97juXJPJlR0fmeD9WW/sT3NoFhPVf jVd08+3UCWm2EnkuTGrKgWNqv4WTBcfA2PHxSopDo/n88zSL8GTY0irRX+wvDT+MF6mQ e71WSQakCGBDKeWCPWJjIr4NfB2svayEI7+juu08mfc2bqbJv0zmk9P+TgmmkMQBkoSB Ni1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:ironport-sdr:ironport-sdr:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:x-spam-checked-in-group:list-post:list-help :list-archive:list-subscribe:list-unsubscribe; bh=KR2OUVwcPee+yNUo+TqRb2YVs2YzG1tWSxbpySBZxRk=; b=ebHiij9fANIQj4bnPqb9nn7Nse+/LjZ9sYpFlf5xcXGpzAsqEVi2Y/X5qfHHNkSdz4 ovuWh8w57Z89y/dGORR0JsoNvcIyrOlnLYjACIH5vZDdY3oA0iAKiI1u152c/zSYoKsc pYw/FNqPCoje3PoScPo/gATV7dXXs091PKIhnV4K6V/l4q1gWRQr+r6eIWiSBKdH8dLh yDXjrLGlvr3NHPo1A1Jh7Ixs9imgIoYlu+x2PCoDZPnrKJAihtYTwIjhgE8P8wJqJbJZ qz3XLxckfU4yJZ0xQdK65+RXJUIM0zhMtpy50PnregV+AAw/g/owIcg7RPbdHVyQRE4k iJ3A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530vzSkV38uTuMAZX0MgBWLkOA06UP8ctMeKNAEi39QzMNgP+rJA icWv1wBNPd0rSGAQjfVcqVM= X-Google-Smtp-Source: ABdhPJyaxVBdUdhd6++xg8spkyM8Oeyy6kHb+ISIpknYoEWkzwzZN37AgUPxeObWSDVHl7VYCEoO4g== X-Received: by 2002:a2e:9ec6:: with SMTP id h6mr2906585ljk.12.1614879723616; Thu, 04 Mar 2021 09:42:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a409:: with SMTP id p9ls1342709ljn.0.gmail; Thu, 04 Mar 2021 09:42:02 -0800 (PST) X-Received: by 2002:a2e:5cc7:: with SMTP id q190mr2797256ljb.37.1614879722492; Thu, 04 Mar 2021 09:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614879722; cv=none; d=google.com; s=arc-20160816; b=Q5n7AgVxUnavbJhubXmhyGHFKZb/H0Wa/w9NDxiLeaUfhkrPVUDhTF62/roR0Az8zr R+ZHI5PoFoXnFXb/2MU1dcYUjag89Z++bMUsuexcTjDjZekfu7ttnwQUt1Lg1Mhwc2Sr e0VTxm4PBv1vyKI2STrymz5gpc7e0vsKqkGgnbVm9SX/g+i28PlKHVgCHphjXfjDI8IT JDqpdeQRWRd+iP+7NxxjlgoLyZbDz6WZY3ZEB/g5SVF0fIRqDJg+ipQQg1fhyBET3Wf7 jZLQ6fRKiqvPJATLNiT/fj0QrRlPi4yQ6X0SVLmAuWgWNs4hDFD+Jr8xFqMXsucstJ6C p7PQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:ironport-sdr:ironport-sdr; bh=ZVm26XCT/M1TB29g2vNguA64aiiMO5HUQtnyui8CQ4w=; b=BOSYWpSZLT85ArRf0r9mSXzslVxyC1AB3QrIW7GioCo+GC/0/124/p3A+5YY57du84 9iIXlGaulOzuBfGYHbpu4xZu369tI44OhM9FOQbH7N0Wj/d1NrmYcXWCqtUo0qIaUDBh N6yEDwD+R94muZvYqGfwFVSJNPM1p6edADerxCgVGP8iiAqmKFm25xdjVFoWB9MmKzFz o70NYj18UCdd5nD0l1rEpfeI7UuLKZo7xRZEVAY8iMOEPsrFv3o47P7CO/AYLz+6TUyv Hj+EyzP/It772rZjLSt0Vel72CVMb/+/U+ZLFLExguEtKWXRfGDF4YlbKt8cTIq1oYmU FVWQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa4.mentor.iphmx.com (esa4.mentor.iphmx.com. [68.232.137.252]) by gmr-mx.google.com with ESMTPS id m17si9741lfg.0.2021.03.04.09.42.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Mar 2021 09:42:02 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: e9SpvfkBLlYTsLoar4eyUvFUMXFiwPCqfNOiBfwYS9V29Bk7wjBjdoy/1nvWuuwMn++1+simJ/ onqmS4DNrIDmQdncxUzUoG3iTx8HKA1W0nk/gXo0kRoPa5uyrS3wat0S2Y23aYNR5vpXEG7Fd0 rLCGkpYlfisz0pJxJ3cN6LR5RBQhwwy/rhk0kfHos1rNf5bK49gAKjEtWn9U30c+q14ATxl5kB iJM89OXaP9YkYTvEwYrY/2VQdpqSuLvH7vv7pE6u1G6BMV23GpBI1C2LatmIRTkLHxx+L2IZnR I9I= X-IronPort-AV: E=Sophos;i="5.81,222,1610438400"; d="scan'208";a="58899585" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa4.mentor.iphmx.com with ESMTP; 04 Mar 2021 09:42:01 -0800 IronPort-SDR: uU0ULA+7V4/XWh7Qil2Nh1hkr5MCAUEvaqXj+3JRGusYT0KSu5mip1vovBP5NcLXHE9vWT2Mb7 nuE/dcFnz6kydbMzjILSXlXckRjQbVr2lg4itPIFfmcu6QE9mgwnaMKpd9XiAZLLI9di9igOJH 15HE6uw2MorZfmpOTvxIvVM+h2E16HPzvacOvFB/o0qc9AGQ0OFw06kZXMR8QUO4H5n7LyrYWy QfxzKO+JODht1qbMtZr0Z6N0H0rfEx73YphESDPTxJ5blossYnsD8WWldLvUNRYvY03HtlgYlQ nfo= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v3 1/2] dpkg-base: Introduce do_apt_unpack Date: Thu, 4 Mar 2021 23:11:36 +0530 Message-ID: <20210304174137.11166-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210304174137.11166-1-Vijaikumar_Kanagarajan@mentor.com> References: <20210304174137.11166-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1693324121571133391?= X-GMAIL-MSGID: =?utf-8?q?1693324121571133391?= 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 | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 5c7bddc..c1425bd 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,16 +68,38 @@ 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 } -addtask apt_fetch after do_unpack before do_patch +addtask apt_fetch after do_unpack before do_apt_unpack do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_apt_unpack() { + if [ -z "${@d.getVar("SRC_APT", True).strip()}" ]; then + return 0 + fi + rm -rf ${S} + dpkg_do_mounts + E="${@ isar_export_proxies(d)}" + + 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")" + 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() {