From patchwork Wed Mar 3 08:38:23 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: 347 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c583:0:0:0:0:0 with SMTP id x3csp5464027oop; Wed, 3 Mar 2021 10:39:01 -0800 (PST) X-Received: by 2002:a17:90b:4a0b:: with SMTP id kk11mr441669pjb.95.1614796740894; Wed, 03 Mar 2021 10:39:00 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1614796740; cv=pass; d=google.com; s=arc-20160816; b=OaUwc9wZZ0tRwYidsFMq5wTiSrSMZOorONJUFRWPWbuYzaw7ylXhEKv1eQYhlFJu35 U6R4DbDUfVKApzti77t8WnMvRkI9bP9GjUprqkEZR+jLdLSrRYbQiVkQ202z6I8y0gzY Dvf7q/rYR1xWkjppzKktokhcsII6LRqZeefxk4RkerfLoMMEOqOAULp7+nDMJHd/vdU/ xTD8+oW+p726QtuVsr395unh27hL7JMOd0MbIV3M6A9uN9IVUbM2TsVzBYU1Zb3vDKGd jxX29koK3mJUTklrQHB9xQpI/obwW4Db9pf7GCVH/RAI/VMrBFf6UkZ5sq5YVI2/D9oS KTQA== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=EHWGw+l980lrfOeC7iv9EqDj016OP7bLTId5GGhFCyE=; b=LgLygrq+uQjOFQCsnc0YCLT6MFJxDyz5bRt2u1/j6GM9Rvr/Qj9ncSITOKyre1R6aF WKUf8Aflbw8H8KvZ/cN/6N9D6LTkSz2lJ6ImRuUOC1j6Y5DZM6Xy1sMqma8FdcJehzSP BHCbF6KbX4Xcc93ISzf1m5LKz7YChl3FOrfOSiVhbTIYIoZwj7/4o5qJEZIHECb6QNJO yTnC+co6El7VULvApAweRQQ74aBb3MSzHLm7LWtu8vz8KYe2suebNDBVm2OneRY1XAGC h4dEfzMEADkbrT5+a/Yb4kCgbRhkNEzDfR5g95K0joUe0N2OHL5pD8alir0hddDpwfXe NW3Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=a35O1URu; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbq5p76aqmgqen3eujyi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBQ5P76AQMGQEN3EUJYI@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 k10sor965017pfu.47.2021.03.03.10.38.59 (Google Transport Security); Wed, 03 Mar 2021 10:39:00 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbq5p76aqmgqen3eujyi@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=a35O1URu; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbq5p76aqmgqen3eujyi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBQ5P76AQMGQEN3EUJYI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1614796739; cv=pass; d=google.com; s=arc-20160816; b=ZoTyo+KSd6KP/k6oJBA4hwh1q2phLamwxPpV9csXp5AJVd0c5IjHoDmJ/EcBHsQbhN zDFslMHGVM778VhdtD0tCCRN+r4iqNgWjgTpaNe8SRkllaBdyFnhjZ7VRaHfDYnpIQVS hgN8ULWfD09GRAwC6nHQFe6eAWBU4pNz9vKzT3ExmN3r4UB9hMYGrewigZkxnQIoRvsu 9hpRJ5bF+GLz+pICbojKvtuNMYPGHw8zRrXmcB536OHH+c5yc3X+4CDnsfU9xz/EMDsM 2VJhSRBqh+h2WqJYATqUru4/WxjbBRXs361NcQrHaFxKU0zySRz3jCal7KtQJxvViXHE 60tg== 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:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr:sender:dkim-signature; bh=EHWGw+l980lrfOeC7iv9EqDj016OP7bLTId5GGhFCyE=; b=Go+5/ywF1XfvdDnP4u6v7OwYBDkOTfpkKbSFGxBcMzfa5x89uOdem0Twwh3xLnE/Ce /7aD/rM3iEc7CQzwKdjm9HeE25ZsYg7UqhjoxoZyzaCDcq6v+hU0yYAdcxEMWoB50rDP +nwwIJDiKrpmyhFNxnWhkw9tBlmjT60ULQi8lX0jHpChIRQt7qzO/dS/z8n/N8ZgUNaP cZhlbKjdIOw1mzokfwNW5wsj0Swv1WhLQ4t5KiCXFepHKUTwq8yDOr9HwhT0tkRQSgpW dvxaajnEjr8n4rnffPf3KRdL98UT6g90SOXNxE1a1jFSU51E4IE7370YH2ca9Y9Q1pR3 aM8Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 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 :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=EHWGw+l980lrfOeC7iv9EqDj016OP7bLTId5GGhFCyE=; b=a35O1URueZIiX44Xu1pKVGltD3vWtbW4A71yu6SQllAqtoI1rH0q6t0YYwsUXFL6wY 8Wc4NR+DXkXyIhb1aw4I+KhNo8Mf/qq2gwqv1/lxruSqHem66OJjWpqiMhrlQvALWJk8 9T2OCnXwKT2ZD8Af7F2oojgN/7LGn0nOWrMfg28l9ocpHlvgl553h3Q7ii580jwYhyFj fBAP5VNUh/ZwWlBdHK5/zOog3HvBA1XM6hHT4Gby9126dYCgHxbtrWRCJuoF0FBY/cPY wAXB+zHb464PQoJiHTS8/hmJ69b4sedypm8EiE2BWVWr12glsGVP1/CZcv5dG0ugb9bm 6jYg== 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: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=EHWGw+l980lrfOeC7iv9EqDj016OP7bLTId5GGhFCyE=; b=NF5kU4NlQXN21LU1ZdMkVr4+WvRGIFj7I4xXNPI3sLP2eNJPlZ6shgdIT3XhdYbIWD 340Q/wZxT3IaPB6UHWwgi/AXD02WF7ADYkRo4OKusm7Pf1XqhOoBOOJU//jC6hRpJgDN xv/EQ6r2bXb5UNPjPLNC6z440xI/vWBKavoK7n5mO3R2esS9GMh9zafxImGNv1jTrn/K NVtgKAqdQQS+cIN1GstqvdMKPkN6XaOfofmNPiC530KKKNjiC8+o53eyMEnrrBYBPox7 wI48h1ImA4LFaCG/kd1viiyD297air72zP/yrSVoApyxx/Qt25zEgECqxOH26UwwaXwU D+6w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5315MtvV+159QpB//ldHfBOlxgl5ulKV+/Uoj/lnZ9yr6TakJiez SlYIAB6zTTTGG4Np8Mf8PoU= X-Google-Smtp-Source: ABdhPJzH7usSyr1WTXWuTlQNEDAs8MM6K34mOkLoKKIREHr0Uz1Oruv0TawgQQiVBhZL7KpbrDueDA== X-Received: by 2002:aa7:8ad5:0:b029:1df:5a5a:80e1 with SMTP id b21-20020aa78ad50000b02901df5a5a80e1mr164364pfd.52.1614796739756; Wed, 03 Mar 2021 10:38:59 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:16d6:: with SMTP id y22ls1741562pje.3.gmail; Wed, 03 Mar 2021 10:38:59 -0800 (PST) X-Received: by 2002:a17:90a:b28b:: with SMTP id c11mr480384pjr.62.1614796739007; Wed, 03 Mar 2021 10:38:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614796739; cv=none; d=google.com; s=arc-20160816; b=OpXJeh5OjTHCxdv1utpTgJWS0X6m4BYg7QQR/AAp3pnerNrOASXvXP4aDPgwiafunW W+8tiVCPWHlKrTG3haauhAFeUZa5eXM11cbZMrZRpyT45k70VNtEIeXm/v3MbRozNA1y T1SPTvJY5NQmsVpioxXQFASvLgfT8tZHhRLf9QSRaNXjfYvSwfn9dYTBjx8DIDCwVW+g emQqyZ6+560WrHtJGV/+cXDBTHf07Kw2bDoPlJyTnYMYlq0Nk2n+dL7E1MbhQqj6Y+bw rEo6xOd8ynLiSGfpMlwg6C+cM8xbXm/FbhqWWcYP4oGmyhPBS92XYkxOdeUIWCKd3dd2 Iv1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:message-id:date:subject:cc:to:from:ironport-sdr :ironport-sdr; bh=KxeDaMdf6jVWuOuhFmhvlHCTUnB85eNy5lWW9M8GinI=; b=mQnlmm2fMba+GjOMXSaD5/ofZveaMv4Nm0nMJNyDnw52BEbFzA8SzPqiMzczCkHUzN G3uNeWmsU3GT9Ciy17NgUp1bItJiq7NEZR96R4aOhu3UMfwIFnson5/x7cIx1KqVR67O kPRPDlmbQQpJ5MbO+s3mhzlErQ6NPJyhvlyZFw/k9hlp4bb+msrnCIx7ZezGNmsV5G7X WrLMALhCRbulxmCwAhWs5C50A15SqCOraZjvgyx6+h58Qjt88b64HyNjcgn2MkMhMxm1 sH/3+/dG6IVDrHuwsI3Lv9AAS4HBybxa6FT2P9aSm1NVe23EslvFJQclHRf/QRb23lzt uOZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com. [68.232.141.98]) by gmr-mx.google.com with ESMTPS id e200si166513pfh.3.2021.03.03.10.38.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Mar 2021 10:38:58 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.141.98 as permitted sender) client-ip=68.232.141.98; IronPort-SDR: sDk3N19ZIG1gkOWOkknavkRm2CAOQ7X/vhJ+RzUltzuTQxR8nMopnPAWqpdRs5qv7zeHR0DYXH NYaBIzYWvUG5BqLoZndOHImwjCcz8brA2Wg86VHaVIUd2LI3i0ZRTX1Kkk5+y1cEAVIu0pnN2M BADSytsjRHdxcvLpYpy24bB3UmkKi4Y5FZu0aZrsf+6nf76wYwCvEyrRhWWEb+DbW4nDZRQwMw DWIoLFlX/Ep1NKjlL0OoMkJzlYzI9r1PlK7p+XF7DRVCTMEoevyImBL6UZ3Rue8xE+cXuQ9J8l YPs= X-IronPort-AV: E=Sophos;i="5.81,220,1610438400"; d="scan'208";a="58707956" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 03 Mar 2021 10:38:58 -0800 IronPort-SDR: j/KU4prAAW2zX3hhnnMLVF814aBai/ct09Bzpjj7r3aD8qAMKV8x7EDq9eDZYHx5hOVoUGc/mc MVPDAOa2kmuHkhr7HsKxbgLBZHV1JDIpRwKvu+ECaIX/cA83Y2sFuDApZK8RLNvL8WUlUyqkhJ qFG1xMzdVbBL983fk2A1ztYcCzfMduBFCnWG7c9R46IzvYx0gcq4gHmiUjAzro1IR4woHL+nGY kL3NywTR/l/bc2kR2RIWqVut2LjBmS/LugHMqmy8uAM+T0pFYXxfgSX3AttFBqfNHb4j8261hs ILc= From: Vijai Kumar K To: , CC: Vijai Kumar K Subject: [PATCH v2] dpkg-base: Introduce do_apt_unpack Date: Thu, 4 Mar 2021 00:08:23 +0530 Message-ID: <20210303183823.11563-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 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.141.98 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?1693237107296697528?= X-GMAIL-MSGID: =?utf-8?q?1693237107296697528?= 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 do_apt_fetch[lockfiles] += "${REPO_ISAR_DIR}/isar.lock" +do_apt_unpack() { + 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() {