From patchwork Tue Sep 29 22:02:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 93 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4807304ooj; Tue, 29 Sep 2020 23:03:58 -0700 (PDT) X-Received: by 2002:a17:90a:c28f:: with SMTP id f15mr1071502pjt.143.1601445838411; Tue, 29 Sep 2020 23:03:58 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601445838; cv=pass; d=google.com; s=arc-20160816; b=fBZm4YsnzQe9iMJp6IxjAe6D+1qW71Lb/+FyOnrn/DudbZMXhwhAFXZGVwCM4xhYWC qRMOq0Nug7KLa9Jmz+TKc4j2yc4xvqPy7pjySMYiPzmpf0iHUlxLWNowqlAuDyncn8GS SgIgamSWJHLePjHQ7M3XnTi7/MK6GDdZpjmzIqEaUNAW/8/z+qdLRIwd5/4h6tgnsnp1 JQpbiGuUVdNBszTF7YQj9geUSyqfN8AzhRsGj/QSi4LpM/IimCHzR5oX3gODGdGB3AkC mM/xDnqudjoGzey9Cv00lWljOAPEFfcYpF45VLw6V0DIM97HnfdyEeXMl5jcdQo4daLE blnw== 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=dEHCmhMuydY4t0kEMRcEN1sRMLvCdJF8ZM44KQhz0N8=; b=J/jsD1B3a7A/sMJANz1OtfC0dTMLZgSkv711qz+/Bdvdpfty3AwX5qzmscy68CHinz vC0q47Y9axUUyZDTVCyk5LEkZWU5ntn4oZjlSCtS+2ZmSYsI4FpQAeKjkNgab2cfxnS0 w9Kotrzx9bfPbYqvBO6rPGvIlYcacrCShEvFDMHlzelkJ4dPdTdm6SGSu/O8P5n94OVQ oXCkm+a+uheECLC2sz8cStlGOqvrHh2t8UwRyHS/tuq2vvA/XAfbBNPl0YqTbh2/q53J rpXEP3kQdrNJTFmV+GNbR7yMh+rDt3/p98fL7LextjA7Gknnz3C1Ee5raLALlYjFcJDK iYyg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=o1lr5JIj; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtf72d5qkgqekdqs4wy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBTF72D5QKGQEKDQS4WY@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 93sor279105pjz.28.2020.09.29.23.03.58 (Google Transport Security); Tue, 29 Sep 2020 23:03:58 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtf72d5qkgqekdqs4wy@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=o1lr5JIj; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtf72d5qkgqekdqs4wy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBTF72D5QKGQEKDQS4WY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601445838; cv=pass; d=google.com; s=arc-20160816; b=muzGRgnG4Qd7nESZIwhQqj5WwRt5Dm0Hq4ui5ap7Jv7Ljf4BtNl9IuAOUYI5S0iHqY /JYsFu4aSQ5CEzgEt5S9/Du9m6/LRJy3b0usteT8DciEbcjeGu1A+y1qyq5YqrLFcvYX F158ImEmeW4fPnoGtTWYxIRzGuzJwOrX3x6pivpMe3VDHMKM4/8ljsBWUMyLSfd0E7kb VemE94gKp+4HmY9O5lzF3eYlIKnfBrqm7PQFWid86iOqsW/3kKlfA78oNWl2MnVqeT1X Qf2Tlu+IGCG3Pek1uie2yW9ZvdY7nc0zq17/i1ONlCaq5hgTSPjSpDb+B46mW/EUtwef HnfQ== 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=dEHCmhMuydY4t0kEMRcEN1sRMLvCdJF8ZM44KQhz0N8=; b=vLoaqMW+HY/1NBLB1YY/Ch1hePIgSufmH3WdYC8Netmr4Tj09OBeIt3SvHjACl4fO5 5UJQaoTZTg8eOgy1KC8Y5H2vtbnN67SWljMnoNgKpMjzwAoaDZgmRvaZiDvyRDr/2fGu NbXyBLWYAuIQ6gCDxPoYiRfZZopguK4x8conBlNBQEq9lq7Ss81/bdWyxLYoBJQ275mb yPOmyTayAYD5NMapaWU5nzI3dut/0/DN3Wd9T+BSODJfWhsBgOVn0f7Wc4Pa574+3VpE o+zrJidV87vr1S16PhTZkOri4XSK2dvKTDLUNcYBJDVdzd/wmpaTyX684rO1ALn496LW flSg== 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 :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=dEHCmhMuydY4t0kEMRcEN1sRMLvCdJF8ZM44KQhz0N8=; b=o1lr5JIj+wXahiUtn+2MAhX0bu5kqS9bqnIXoBhT/GEZv0c+nUcXLXoUL4Y7+VSuQT IflxQtUdkP6NGIvrNrlS2PumgkXm0Y7wEhKyAsgu657J1Sem/k5zlDiwMDy3dsfs8Xza bX0DFElSGlg74lclWVGLvrkwBfeLFN+W95YzGlvfeWvy83fHG8qTDGtdQ19raR/7CWea tC5+I9RfLX4V2UGgAlFEF5aQDsYlR9+OtNFQtien03cS5iiFHAAb3A19sZONXc29QxzO W58spe3sqvSuGGA6byEioy8InVt+Ni5X0QGnEkkFT+O8jsX02atfGjvy2/BU9vUW7d07 Jkpw== 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=dEHCmhMuydY4t0kEMRcEN1sRMLvCdJF8ZM44KQhz0N8=; b=WigwqQLNTw/j80U3Rt1Ivk5MEpyD5S5ysTWWS6Qdkl0+AAQj/u7WSXvhs6CqRz++7g PXhriu+VisBLPEKUP+CyriVJG2hWDKNywDDDQCXebGirP2zCam9p6Aa5CmZyDKinCTQ0 a87SBvLiOI1kdKeXAf24+mMCXf+wuDMCd/+yRtvPx46waOPnxS92UioHB0ptwmi4ZN1k Ad2eFdgPGy89u6Aptu/pRGuL4XLYkQxUT7SNDulOcr53MoPYBUWR9j3DLvlfT3vEjZJ5 3x6hVeBa3NWGJLZxq+EiBu9xxK2qnHZrwDXmGPhfQa/djptcNvzeLJDyPhx8DUv7zfZu RMzQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533Lyw8i8pc5WYBK/lBaGbEdJBCsaWKUOBNj5XsCS80t+ifBr54Z /wLqeXj6EFLmU7+cix0GW2c= X-Google-Smtp-Source: ABdhPJwiFq2X8xbsFHVl1aIkoHtVDusdOdBO9cOT1nRCU4GqvkcG641tq6aoQPLFBl9NGGRyxGnw4w== X-Received: by 2002:a17:90a:e60d:: with SMTP id j13mr1121155pjy.61.1601445836925; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90b:2154:: with SMTP id kt20ls313991pjb.1.gmail; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) X-Received: by 2002:a17:90b:a51:: with SMTP id gw17mr1155483pjb.118.1601445836328; Tue, 29 Sep 2020 23:03:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445836; cv=none; d=google.com; s=arc-20160816; b=sOdf/HnVkx4kemCJb22XRXLl/mi7ELaIRV/ZzxYLEw7p686jPHtXUcx044COXgnAtm QDTm0YBusgAjJnoacY4JbwSKxoBL3ADO43g5DSxdCiqT5Bonz/vWsdl7tlspOykGOfrj x7SyYKYYf6R+Y+0tinEQfUdO3HcmItgF8xLR8atHAIkQkx9mYx6zG7nmay2r1kRYxH78 yCf1o79vJWo2OBbwMlXIUp5BVrRxp1/eJ1G1hT0cTcPLVGB/HBU4CGk2b+Ak/1QI6I7W qw9ENYtUW7lNlfWwKrXuagIvV0x4JCAD/btfVRhLA3IxsY8+Z+e2xbLwUn7lKRBEEGte GaAg== 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=H8niWxM5BKPb6fWXtTy1dn2jxNvuJlJ1fTRLh0T9ZqE=; b=wb3hy764DpTj015lDmGR4zEGHQOGm4Yuz8Immab8M9Ne5ob1Tnsx2W46HnLHfunxQ1 EF7cqHpq2ACULgyWjnuqICM4ZHAC7eNLzo/u7c3VzbXiyxq4AbCiUEOAIvnQJ8iqPw4r cv9P+VJn+w4WhaGjiGXZ5C2Jll+t6jDklAR9+dwsmWHTHu3lTp+XfTp6Z1JCt4ucoAIV EFljIo27iiRB5SVPvvP4Gdnvz60pZl0eh1FvdgaRHXyScy2M+SEjIdzMhqad8cJJ2CID sf+5ZJemQAPwYAi4Xm8bdSqniu1HFEAFku2ljP+HGrjwnhZh9OamI+jr1VNWLxfmjqoX vctA== 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 mm16si51246pjb.2.2020.09.29.23.03.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:03:56 -0700 (PDT) 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: 2ZuaqvZzUXNAQYpW1aHojMGlaLuKYv91hkL2VtNnV+NT5aigmMVarkpqBuR/NGfKzihKZHF8S5 s/m9UIfFUlXfhB6dtCWgCdM9SqKL9uJ0vEbIW3NYKUh5jn4LyZleBxSCtWF+hD3FYeZShKE7oA hEFa1GgzCRI8MD9Ke9HRv3kv6ScH5HIrlUuBV31vL4gFUj/ohF588PnTPguxqA5wgJe4/hd7LM owYoaVFlhWrv3CHIVGhYgYwmKRRx0JfbWfW0yYc6gdLeK0n5+HqhV1+Uk+I4xpzvdzlAqRHvWb D9A= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461959" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:03:56 -0800 IronPort-SDR: XbkNUtt2HJoE+IWt73KG/gx6MBrU+6AnMxOicPp7FA/vfi1Pk+tifFhQOrD0SwRBE1VtCWPEsQ S79Kt/dcTol5BZ2nJuaoXXDfAp5jjr+jkADXBG1vz7aBatJQmIoco3c8ZoVD02O2ROo7OU5Eve rpy7YyLJ8Gnh7h37/8/NrycdV5vVUMnGAoLjEfmnHfujxOlbBwp62iQFhfnIquf4uSvqMdM1Qo +Zp01qMCrYmQRrmBp5q2EJGVkWUhsxqGOaxFS1ZZQhYsiL0BU3nLQ9xBDZ+lnbh2roUhUqX1v0 zs8= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 01/13] rootfs: Make rootfs finalize a separate task Date: Wed, 30 Sep 2020 11:32:47 +0530 Message-ID: <20200930060259.12422-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-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.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?1679237671847862933?= X-GMAIL-MSGID: =?utf-8?q?1679237671847862933?= With the current implementation it is difficult to append a postprocess function which requires a chroot environment. For example, to add a postprocess function which runs apt-get to download all source of packages installed in the target. rootfs_postprocess_finalize is not actually an optional feature but instead a necessary cleanup function for image class. So, move the implementation to image class and make it as a task. Signed-off-by: Vijai Kumar K --- meta/classes/image.bbclass | 41 ++++++++++++++++++++++++++++++++++++- meta/classes/rootfs.bbclass | 39 ----------------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index a296cc0..2391529 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,7 +63,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache finalize-rootfs generate-manifest" +ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" @@ -173,5 +173,44 @@ python do_deploy() { } addtask deploy before do_build after do_image +do_rootfs_finalize() { + sudo -s <<'EOSUDO' + test -e "${ROOTFSDIR}/chroot-setup.sh" && \ + "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" + rm -f "${ROOTFSDIR}/chroot-setup.sh" + + test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ + find "${ROOTFSDIR}/usr/bin" \ + -maxdepth 1 -name 'qemu-*-static' -type f -delete + + mountpoint -q '${ROOTFSDIR}/isar-apt' && \ + umount -l ${ROOTFSDIR}/isar-apt + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt + + mountpoint -q '${ROOTFSDIR}/base-apt' && \ + umount -l ${ROOTFSDIR}/base-apt + rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt + + mountpoint -q '${ROOTFSDIR}/dev' && \ + umount -l ${ROOTFSDIR}/dev + mountpoint -q '${ROOTFSDIR}/sys' && \ + umount -l ${ROOTFSDIR}/proc + mountpoint -q '${ROOTFSDIR}/sys' && \ + umount -l ${ROOTFSDIR}/sys + + rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" + + rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" + rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" + rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" + + mv "${ROOTFSDIR}/etc/apt/sources-list" \ + "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" + + rm -f "${ROOTFSDIR}/etc/apt/sources-list" +EOSUDO +} +addtask rootfs_finalize before do_rootfs after do_rootfs_postprocess + # Last so that the image type can overwrite tasks if needed inherit ${IMAGE_TYPE} diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index afec1cb..eae14d5 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -201,45 +201,6 @@ rootfs_generate_manifest () { ${ROOTFS_MANIFEST_DEPLOY_DIR}/"${PF}".manifest } -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'finalize-rootfs', 'rootfs_postprocess_finalize', '', d)}" -rootfs_postprocess_finalize() { - sudo -s <<'EOSUDO' - test -e "${ROOTFSDIR}/chroot-setup.sh" && \ - "${ROOTFSDIR}/chroot-setup.sh" "cleanup" "${ROOTFSDIR}" - rm -f "${ROOTFSDIR}/chroot-setup.sh" - - test ! -e "${ROOTFSDIR}/usr/share/doc/qemu-user-static" && \ - find "${ROOTFSDIR}/usr/bin" \ - -maxdepth 1 -name 'qemu-*-static' -type f -delete - - mountpoint -q '${ROOTFSDIR}/isar-apt' && \ - umount -l ${ROOTFSDIR}/isar-apt - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/isar-apt - - mountpoint -q '${ROOTFSDIR}/base-apt' && \ - umount -l ${ROOTFSDIR}/base-apt - rmdir --ignore-fail-on-non-empty ${ROOTFSDIR}/base-apt - - mountpoint -q '${ROOTFSDIR}/dev' && \ - umount -l ${ROOTFSDIR}/dev - mountpoint -q '${ROOTFSDIR}/sys' && \ - umount -l ${ROOTFSDIR}/proc - mountpoint -q '${ROOTFSDIR}/sys' && \ - umount -l ${ROOTFSDIR}/sys - - rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/55isar-fallback.conf" - - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list" - rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt" - rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" - - mv "${ROOTFSDIR}/etc/apt/sources-list" \ - "${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list" - - rm -f "${ROOTFSDIR}/etc/apt/sources-list" -EOSUDO -} - do_rootfs_postprocess[vardeps] = "${ROOTFS_POSTPROCESS_COMMAND}" python do_rootfs_postprocess() { # Take care that its correctly mounted: From patchwork Tue Sep 29 22:02:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 94 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4807317ooj; Tue, 29 Sep 2020 23:04:00 -0700 (PDT) X-Received: by 2002:a17:902:c3d3:b029:d1:e5e7:c4da with SMTP id j19-20020a170902c3d3b02900d1e5e7c4damr1148901plj.46.1601445840053; Tue, 29 Sep 2020 23:04:00 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601445840; cv=pass; d=google.com; s=arc-20160816; b=JdrGkGnIpM/Z/KI4jCy2wXbotHrPR+AJwL7E2PNt2J9+PqvFWPCfpJRKVoF6w9m8MA Rt5UVx/zNKsnikntyDh/zrZxEk5a6dBou3/nqSw/oV+Eu+TgewCYGRi793BBVKdArGbW UtMryjEHJPJZxIMKbcnBP/Ra6TqnXK3aVqlDRk9SIHXbaxdJC/LlccWY8wwkTSF1gDYg LCg6KneBcv6JuOgjIPu3h21RiX0P5MdmP/2Ufk5daX2VOaPnTClQha+qI/rQMWQNblJ4 gWgVM7llzsi/j2a/JdkubKGY1XviWbpiu7++GLLSDqVUGkT76rk75FoVQv52pwCiALtA LnGw== 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=/63B/Sws3flEPK1lFRkjkFk+8pbpGVsp+B5BvkP+zPg=; b=XneB4cC49Oz2slpDcybMdqQzMLk1Xa0sYgykRaX/UxSqDABlTivq84bqfhbuSySHUO SP1IL48RUBhuYCI89aWB5WnQmbK/QY441NZOv5OUSd52tw+69kbCAJGw5HfxKzfWy7LI JoOkkKQioGqsQJl0kePt16s4Fyh6zxz7X8Uo/0NcAxdBuXoeecHgi9qwvNKiYzqG6riU ugpCyxaVYXiFwAN+/7AHoqZyeDrB3L2GYkkBwIj9ykcAHH3xn9QfMxQ4yn1pEmu8/7Ix iMmUHNOTED/Lfi7Z5CUqAVvYAmXQGa9Deb6kmj6xlcU26hypMTdF4h0QkBO5NXE24TF7 TIZg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=oQU8v1hM; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbt572d5qkgqehy33xzy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBT572D5QKGQEHY33XZY@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 u137sor344012pgc.1.2020.09.29.23.03.59 (Google Transport Security); Tue, 29 Sep 2020 23:04:00 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbt572d5qkgqehy33xzy@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=oQU8v1hM; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbt572d5qkgqehy33xzy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBT572D5QKGQEHY33XZY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601445839; cv=pass; d=google.com; s=arc-20160816; b=PibsEc15jGo2GQfgwVG2zllrSDVkM3GJP4rEjN8ejEyhcn1/q9mtkBtZ/O894dHnRp 1aLyfnUs5hzKAH7m4exZmX2BZOYaVLgqm3E/p4Cie27drmy3F+FdTYqnm8VtjYfJ5Cd/ BW1eojNwvlWeVZgfo0xbNIMljV/vpXfZDBXE4NKi4KcR3XaSme3hVRoZ0YULBJdrwV1s zNGt2ukrLUX7HIlNuB5M7MvorO/ox1gaVLKnfX43IJuEpZlW3nYLYsoXZTp4RVKaKace YLtqZgELDYoulv0aStHqjbCXChJoiEB7DmxWCK1pYV66a6/50IMF2gyFq9xTdvlfaUyh Zudw== 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=/63B/Sws3flEPK1lFRkjkFk+8pbpGVsp+B5BvkP+zPg=; b=PefNjOAkJo5XwYcxAziwLflMNQa0Jqozj/O1UDB1DAZQF8gcWt6LSEICYPmiquOzsE Spx/8/8nkPqKsrRY1u3jh2S3A4LHXmcQvg54kKZK+MzRS/63wlv6bqKE0xObUTT3qQyR 2DNOCvK7w4Nz0tC1Agomzu2ICoo0gYGBi1UnPPNhpI1N3nw8KVmMLofHYlhhQ30DkGpl ofMNcfh4D9wQatzMS+wSPIS9/7+oQ5VSlLmoudrb0NvL8DFzJZVlVfvNj+aZQimLIvYF hTZBv2He9XCnTtHR5zX1Im9IeSLKq7K8F1bmsbmGAWyOYWLGDc07tJ6fTTqPXCoW4faF hCFQ== 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 :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=/63B/Sws3flEPK1lFRkjkFk+8pbpGVsp+B5BvkP+zPg=; b=oQU8v1hMvsWLc4ZTOWbJ//E4qGkkeAODqXmdD8toJSjo/sS/hpnRE7KKDknBOABypr WxM0ru4J9daPGujVyfeS9JT88rJTKcXeGhpiABWlH1o/UE4Cvy7qbNWo9ry/g5u2fNXA 1I/mJpR2PRkvd+9T10k2gyZWW1dR0HASl2En1DjZUC35oS4LB2N/ZIMhv1H6i/XF8Xd/ nVIxAuo8yihO4iJSgCCniLYxGReNbuhpm/9iNeGimPDYa8hZXEA94RXpidSCOUOKxGxy M4wEw1fOw9HnBUZ2ToooPdmoEwCd1aXGrdeKcjFHh79eO4U/bx/m89Eu/+SzSlBzE78l Zg+A== 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=/63B/Sws3flEPK1lFRkjkFk+8pbpGVsp+B5BvkP+zPg=; b=qfXlAkItLTHrEhpdmiHhNXjQEX9KKgq5gzJt8bxP5QjpxomnBqNIvzz8DlY549a3D3 Dacw8uNmnmEPqEBdtIMCNhFJny9C+M3eCRqrYlhwrco/fUlFHK00grv1x2d4P5mDIJgk 6CFpRCaACWRBcy3Q0r9fS4wPYvEP477r6dXsOHfAieyH1qqRh5ifLbgyRN9JVxSGtLKe z2frg5m7KBQxAU5NORY2Rfy13vIeOEOeP++2CXILrgVcfVF3g6xp4KUtW95XO4nNS32v jtCBrqD/8njGflbito8+DdnjQbftfD6x610gEOdWu1PK96xz/zDe3oTB8IjRAUOsSvQi guxQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533Hp+39Kju0yeFzrIc3/9ALY9PLuJ6WukBZ25qEapvu3tIBYMFW BuZGOSAnlnBrqO0c4vLiHjM= X-Google-Smtp-Source: ABdhPJwI43U/yfOCAR2bBvsy3BSsYDyvK8+h/AdSm/bq9b2YkT+y/P9usf+xeejedwNcdwK/19tI6Q== X-Received: by 2002:a63:2319:: with SMTP id j25mr916646pgj.75.1601445839646; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:fe0d:: with SMTP id g13ls431808plj.8.gmail; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) X-Received: by 2002:a17:90a:d304:: with SMTP id p4mr1171813pju.138.1601445839099; Tue, 29 Sep 2020 23:03:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445839; cv=none; d=google.com; s=arc-20160816; b=IDPMDuomiorw9UMEi6CiS+IzRK97GuntKACe61Jx/md86qWwl5S5HgbzJMFucZ/crh T0/pbxHXDIzymxnQ9jwnDVlxsvD8GmNf8wOn09hTfkCheQhOIqlHCCDZ69Z6zebLV2Fr iIoMnvuuxWeZo2AUrFaEOvm7ZObF7VgWFqDjmlHw7U7ubpI/ysaOEBVNiXqfAKDIyE05 bh1hDsepSn1PKRIVce2Q7HsSh9I33h6WTjr5ogD42DxAdre5jNQqgMD6ndP827GO/Sqx gNqc1JYJ9uosCg0tihS6CPHkHJlMymbDCRA+7D7Seajbig1XnFhkrD6CXOmq5mD2Kezk EvJQ== 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=Ry7No+QnpeTw8znystQ38lbavyvHuZwSahB1mjExLRI=; b=pjboa+ouQ3l1rUYeXjd0wflwYWYzd5vFb8wmAy+X/Gq7Ggnr0SW6oe9TXnsgvhElr+ hT+ZUSQ163KxeKS1uI0MBepT2cDmNVOlQiZLKHJxLwr/XNtvlU/0O4D9oNZowgTPva4P Gcz+n3WxR8ylzXR7kCNMHeZwx/fNe86zZFT/0i4If982/hHF1VnVV0Goiz0dvkq3YRKX GlhdiI3PzUtYjDyh8BgGJklFhnmgrHG/qbRpx+ynn9GLTOdgve+Rbc2wqMHkLaUtrlEB 8jOsmnY90j0skiPJXmIuNyV55PjYZFSrlvifk9sN8KkOtG4pTW/IZsKf7xkgr+n7pDkR YgcA== 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 mm16si51246pjb.2.2020.09.29.23.03.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:03:59 -0700 (PDT) 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: ENQRUCDkNWAxc8L+ayOqWEp2eMaeyq7zAyhSBSiQ5OCpiUU57xikB9VkNrTEr55si6l9/Q822e kKr75m6KWrpCGKdMP27/4QNsmZW7Ae5NcTb613gWstLlfVpxJk/7JspJ4lIMutFf3++mPi2b+u 5qqXsAE7+qw+pzVSzfVex9f9pGrMUjnqOMsLA1apURFRu4q5/KSzahYB3G9S80rcsT3LqTifBT I0devJnwNrXSqzUMlb4Vm3g98lZefHvTJFsBEb1flPRlvO666H0Rv5T6muMaXWr3mdnV5Zd4K7 P4Y= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461962" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:03:58 -0800 IronPort-SDR: dWYnbmWW8wRIrY+kmuhZ5HWJ1S+BsMwvMxO8aznkCGMyu6bGWOn9HsfINOegP7RQ4mbnAO5WNl H/e5w/DYVzt39ittCMIsGN2RxyKa07ykJVfntiag8qUEyOhIe6sZYOxwrgW3AaBlm0ewl8tWnt pC6s1QnM8oMH16Nzl0DqJe0MIi8jUQNwQ8XtfOAUpKz+d0WkX43+303O+vgMiL3Z0FekFkwq/g IE5bDI83Q1vuE3GFnjMEb/6awwMA0Jq3H3ru2asbSpzFCNAP2ZwSruCQ3Mmm/KrOEU0f7KhimZ fdk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 02/13] deb-dl-dir: Cache host distro debs separately Date: Wed, 30 Sep 2020 11:32:48 +0530 Message-ID: <20200930060259.12422-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-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.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?1679237673277453791?= X-GMAIL-MSGID: =?utf-8?q?1679237673277453791?= In case of targets where HOST_DISTRO!=DISTRO, like rpi-stretch, we were still caching the debs from both the distros into the same DEBDIR/DISTRO directory. With this change, HOST_DISTRO would be cached in the relevant subdirectory and avoids mixing of debs from two separate distros. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 4 ++-- meta/classes/dpkg-gbp.bbclass | 8 ++++++-- meta/classes/dpkg.bbclass | 8 ++++++-- meta/classes/image-tools-extension.bbclass | 4 ++-- meta/classes/rootfs.bbclass | 4 ++-- meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 12 ++++++++++-- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index e996703..29a3d67 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -6,7 +6,7 @@ inherit repository deb_dl_dir_import() { - export pc="${DEBDIR}/${DISTRO}/" + export pc="${DEBDIR}/${2}" export rootfs="${1}" [ ! -d "${pc}" ] && return 0 sudo mkdir -p "${rootfs}"/var/cache/apt/archives/ @@ -20,7 +20,7 @@ deb_dl_dir_import() { } deb_dl_dir_export() { - export pc="${DEBDIR}/${DISTRO}/" + export pc="${DEBDIR}/${2}" export rootfs="${1}" mkdir -p "${pc}" flock "${pc}".lock -c ' diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass index afa1e19..ba5c3eb 100644 --- a/meta/classes/dpkg-gbp.bbclass +++ b/meta/classes/dpkg-gbp.bbclass @@ -12,11 +12,15 @@ GBP_EXTRA_OPTIONS ?= "--git-pristine-tar" do_install_builddeps_append() { dpkg_do_mounts - deb_dl_dir_import "${BUILDCHROOT_DIR}" + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends --download-only ${GBP_DEPENDS} - deb_dl_dir_export "${BUILDCHROOT_DIR}" + deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} \ apt-get install -y -o Debug::pkgProblemResolver=yes \ --no-install-recommends ${GBP_DEPENDS} diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass index a24386d..4e7c2f7 100644 --- a/meta/classes/dpkg.bbclass +++ b/meta/classes/dpkg.bbclass @@ -9,10 +9,14 @@ PACKAGE_ARCH ?= "${DISTRO_ARCH}" do_install_builddeps() { dpkg_do_mounts E="${@ isar_export_proxies(d)}" - deb_dl_dir_import "${BUILDCHROOT_DIR}" + distro="${DISTRO}" + if [ ${ISAR_CROSS_COMPILE} -eq 1 ]; then + distro="${HOST_DISTRO}" + fi + deb_dl_dir_import "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${PACKAGE_ARCH} --download-only - deb_dl_dir_export "${BUILDCHROOT_DIR}" + deb_dl_dir_export "${BUILDCHROOT_DIR}" "${distro}" sudo -E chroot ${BUILDCHROOT_DIR} /isar/deps.sh \ ${PP}/${PPS} ${PACKAGE_ARCH} dpkg_undo_mounts diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index 6590ee7..0b067ff 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -25,7 +25,7 @@ do_install_imager_deps() { buildchroot_do_mounts E="${@ isar_export_proxies(d)}" - deb_dl_dir_import ${BUILDCHROOT_DIR} + deb_dl_dir_import ${BUILDCHROOT_DIR} ${DISTRO} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get update \ -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ @@ -35,7 +35,7 @@ do_install_imager_deps() { --allow-unauthenticated --allow-downgrades --download-only install \ ${IMAGER_INSTALL}' - deb_dl_dir_export ${BUILDCHROOT_DIR} + deb_dl_dir_export ${BUILDCHROOT_DIR} ${DISTRO} sudo -E chroot ${BUILDCHROOT_DIR} sh -c ' \ apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index eae14d5..6316321 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -115,7 +115,7 @@ rootfs_install_resolvconf() { ROOTFS_INSTALL_COMMAND += "rootfs_import_package_cache" rootfs_import_package_cache[weight] = "5" rootfs_import_package_cache() { - deb_dl_dir_import ${ROOTFSDIR} + deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} } ROOTFS_INSTALL_COMMAND += "rootfs_install_pkgs_download" @@ -132,7 +132,7 @@ ROOTFS_INSTALL_COMMAND += "${ROOTFS_INSTALL_COMMAND_BEFORE_EXPORT}" ROOTFS_INSTALL_COMMAND += "rootfs_export_package_cache" rootfs_export_package_cache[weight] = "5" rootfs_export_package_cache() { - deb_dl_dir_export ${ROOTFSDIR} + deb_dl_dir_export ${ROOTFSDIR} ${ROOTFS_DISTRO} } ROOTFS_INSTALL_COMMAND += "${@ 'rootfs_install_clean_files' if (d.getVar('ROOTFS_CLEAN_FILES') or '').strip() else ''}" diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index fbfe669..3b19914 100644 --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc @@ -255,7 +255,11 @@ isar_bootstrap() { export IS_HOST debootstrap_args E if [ ! -e "${DEPLOY_ISAR_BOOTSTRAP}" ]; then sudo rm -rf --one-file-system "${ROOTFSDIR}" - deb_dl_dir_import "${ROOTFSDIR}" + if [ "${IS_HOST}" ];then + deb_dl_dir_import "${ROOTFSDIR}" "${HOST_DISTRO}" + else + deb_dl_dir_import "${ROOTFSDIR}" "${DISTRO}" + fi sudo -E -s <<'EOSUDO' set -e @@ -356,7 +360,11 @@ isar_bootstrap() { ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" EOSUDO fi - deb_dl_dir_export "${ROOTFSDIR}" + if [ "${IS_HOST}" ];then + deb_dl_dir_export "${ROOTFSDIR}" "${HOST_DISTRO}" + else + deb_dl_dir_export "${ROOTFSDIR}" "${DISTRO}" + fi } CLEANFUNCS = "clean_deploy" From patchwork Tue Sep 29 22:02:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 95 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4807346ooj; Tue, 29 Sep 2020 23:04:03 -0700 (PDT) X-Received: by 2002:a17:90a:a40d:: with SMTP id y13mr1056706pjp.183.1601445842958; Tue, 29 Sep 2020 23:04:02 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601445842; cv=pass; d=google.com; s=arc-20160816; b=yXcMgw4Y4aeX1xMnZvpOFPYsINAygNi5UpZdJhatEAVssdRgjfOGUERMg+WJTF7Dpw 2ZZaJQRR9xWTQZ3SkwIzlUDFKfnNhcaYbQqCgQNBC33u4PtWfLSjukbDJyb7hJcHw+rk 3tn0uJiT7oG4A1n93Ns+6l92gWtHwN+p3F0EMuw+9oO1kauzQZMAe69Q6Oy99hcgzij/ 7+5SvFe2VZt2HUK/UTbu+vumqwJ2RZ7zMVRtijonWWvfrxbRCoKGe2rr1m7aFs5c6F8p pwuf9NzGWmUN/4G3ULKBFcASJMgCDmZqAAUvw2y16xa9aNhTyqYzNiGwREJWOXIpF3+3 ZVsA== 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=zc1hoadlu+ndkPD5r5VUkBsm97kQxHrHnRy4KaSQrsY=; b=qTw47oQwenSpRlshRf2o8QZF+A3uoPBgOlS+ACP/k22ZHr/SelWtxEkz91tIxn0BFs /jFPZZ7/1/PvJQ1FXJCyJiYovJnmDvrHJMTzr7wHMp+1UXfG1ZeXn1eIxqk8gY/KxPal 1R2zc4yOXDijLwJ42TXx6TAoISNCUhg3+C2nwbQAbqy5FHIlUWhsgeWB3Z+xRVxLpH77 jYeJnKNHqiFbE0kIA2qTjlo9M/V5Cr1ue2Wjz5p8DSyDbZgUg448fwr/P4Y+hYP6fvB+ CufMgkFyu9K8I3R9Q0lsqtBK8qzZK38HJGwUPZb0//Qy7i5KCMJuGKnhBXCak2Rfsx9X HIHw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=q0Xa+YDZ; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuv72d5qkgqepiskomq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBUV72D5QKGQEPISKOMQ@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 d22sor293889pjv.10.2020.09.29.23.04.02 (Google Transport Security); Tue, 29 Sep 2020 23:04:02 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuv72d5qkgqepiskomq@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=q0Xa+YDZ; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuv72d5qkgqepiskomq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBUV72D5QKGQEPISKOMQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601445842; cv=pass; d=google.com; s=arc-20160816; b=i4X4F0a83+aFdxzHMjFl7sAlMeH8e6xthnuG2HmkgAyVn3qa7N+IID+sT5xkm5UYTO R3g0879KfuzwJmAmFmAFW7YvJer4wyX8pRpcAN9AYcnh7Mm//Prvykt2KZziVYQhuN97 pnTEfahT8nJ9SRHiaajeNMYLqeaF6DR9lx2nH3zVt74I41jxFC4aLFAmMZ09BwaIR+pj MQS6KzuBKQTaDpc/i1pBobS3XA5kMxSYdQaxOPmjmdQFmBRZNRd48KvPrk9Iv/UWXvp6 /WBQbWsOhgQvZ9CBTpXmODqKsE/0y2mN4ixZZy8pG7kfMb/6JWnuWAmWNy+gJvE7JnCs 2vSA== 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=zc1hoadlu+ndkPD5r5VUkBsm97kQxHrHnRy4KaSQrsY=; b=gWlUphlWU3PbAQNgoEmLNr/8NvLhB2wWE4S/yXuSowOvkj842o255d7gmzdw1oz4BG flH986Nho5m1dGcT+rh72B96fA0H+HK1XPUpchkAOtJH7G5z1q+5PrS/K/KgnCuo0oRD eKquTFv4vsUi0menSxtxf5IDww/rWdGVPBCP2IiOpUNHjjwcHBnY6I74+l41v43b05C4 NBdHUt2pefZ4gGz1dL450AVtEnpcPECwv6tfWTs0ON1TnNcAGDaMg92ErJLzx+LVbK7o yjDkfEV7g8hYJ0t58rzO94WVa79SZJPnbimfglKc7AVSAID0WxdWKGnW1W0TPyaAb3u/ 7G2w== 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 :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=zc1hoadlu+ndkPD5r5VUkBsm97kQxHrHnRy4KaSQrsY=; b=q0Xa+YDZpkl9tm8uEPqILlcHg3YfLNvm7750SAR+f3pAI5g5N2EZg2nEca0puBO54e cWs2NYwV9TiOQgKjhpYaLZ2wBO/4az9sI5iYunmmN15tzUb3FHX1NZ/HGzDiUZAcXLBx 9pYPTNVcBwY+VC03bbxmzEVZVNh7KSCMCo/i/OumUcyzfCiqaLQNETwKL2Di/9G8bsVn UjBiANjT9FRJNB49Gaj2Zu50SXTrdHRbCpKltJ2545iU26StrAcXaAhwvGCz7bIEKHnn 9wEMYDsrpfmZKoJPAlTTO9ysDMwtzZQLrCprQ8EyZvzUWzzTCBm5y8bSSgZv1r5I7utu G6qg== 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=zc1hoadlu+ndkPD5r5VUkBsm97kQxHrHnRy4KaSQrsY=; b=gktfv62X7rcJ5C7GkD5Wf1GndLIw3MvUj7KnrgCs9AHeSp7SinofIHfa2ozG2EGhzd jZnDfaRdhGHZblgChPDSWxH9+5CeyYaJ8TUQzHq5ZNlAPfR7xs19DzU2dBKKgYkCdrVA OnXYpAaklz3FAsOsm2i84c3VCvn/Uaq3OnsG2DEJyiVczxWpLl+cjhVfTCw/uKvxGGUT f+x0vT/hG5aCxv9wEXFG/wGH1qiVguH+VpfaZto/tNZU0jN8VAS3P0oo62822uKRutMa ubccspkqKXmt37FZh8/EqW4e4S147gHsUbUsjZPjPRUBW2N5Zal8s4wxUh5pUg7lLdSm jaMw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532fccStR5hPG01MKVNpK0h1sfEXn6gd618xFZ/LbW1LFM5OyxIq TWE/DH4XbJIQkyySYZ7QHLo= X-Google-Smtp-Source: ABdhPJyMc7Im08ThuoKfc5X8pXkV1uWKe3ky00NcUAzqTFfkfj2vJEgBoiDByEP3dl91GgfjNR1rUA== X-Received: by 2002:a17:90b:208:: with SMTP id fy8mr1118744pjb.153.1601445842374; Tue, 29 Sep 2020 23:04:02 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:7591:: with SMTP id q139ls409949pfc.3.gmail; Tue, 29 Sep 2020 23:04:01 -0700 (PDT) X-Received: by 2002:aa7:97a8:0:b029:13e:d13d:a105 with SMTP id d8-20020aa797a80000b029013ed13da105mr986862pfq.33.1601445841819; Tue, 29 Sep 2020 23:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601445841; cv=none; d=google.com; s=arc-20160816; b=C8NVy83zfwWeLdtcML7+I+vumCMhMo8gwUKLRiAnEGHMznfWqg3B1NnSbHHPhtLAI9 cNcTRajUCJnkXrPXPDyWsRgTRoW/XhX5EE2+RJjeLItTTlYFMc4d3AVduBqns17rVlFP SoaZAqPGq7/NZx5fUKvYp7pfxq4AgRmevqF4nvwdKdOw2fZVPk2dpdtQeLgWeQxfRy/m LCo++3D/iQ21RlaH6RdZ7AHi8R/1wpPp9E9lpfInK3WxIQnJ3hHo0zk4fWjrxi2FUuzI 8Y9463auhedufMTC/OIZDCYXdisulLrSaGu8cjJY99o4KoqdOxLsQv35DWrI09I1gDqQ dW1g== 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=eX/neAnE6fdFqMzp9SceOCGspwS3v2A7f6NXRsIxkeM=; b=y2InMz1Rh8jk3Gd5anmbmiLOJ/s9goxmMfxFuLZV/fyGFVEeyKHyr0TTuxljdWVEMm soz+2JqYtNxPrGBAMgccyv+69AXJf3PTk7sFP5+izC3Pic3TkHSz7sUON7ILrGrsmCKS KuwNd3u5XgzSnHjKB8UySKfqD8eZzpJwmDAJ6RGomZk/7jD0hkNLzjRZcsg0RNuCT8Rh bosWjfX9s80uguAqjtVWX3OpBhsW2XkqGMfeiipR8Oh2ADXbGk+U+j9sZcYk0obYi3ao WO+QcRbnnQA/rKG1DPbHMxVaIml3VCa/4oSg/bEkmN/NCsQITgb3KHioZEsks9zvyY0T BYpQ== 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 mm16si51246pjb.2.2020.09.29.23.04.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:04:01 -0700 (PDT) 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: WQjwQO6OLn8g0wGJ4vjWaMrmAt1wLvH1Mnseddy/SF+a1EAuJotNu5C9BkrtF48hGoig2lJWYu LfAYPMoaPtD0LiG3vss9qDPQiAUqiZqBQaJok2S17/a4BrH7RtD5AlBkrA/1Q/TPwiBtKKDI69 7n7PqjiN9+pHKkOgcM49c2mG6h6w9bsqf+FPOTwhHyS8W3IItEy12/K1l96pa6U5/x+wGVzozZ MuKZ9zD19JxhtIE34dd76Dv2Lvq0OALJWE28Icaz6sX/157XGql859k/nMP9M17sOJ3gBen8IO i0E= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53461963" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:04:01 -0800 IronPort-SDR: x4bxb8oo1Tp6bHFhg0EeGb9yk0J8k355nG8HghD4c1FsNC9qP2JrOv0llmLA4GzzZ+XxOFRRZq FAmzjswbq5o2r0/kS2WC/Iji7oI8WgOJafnfT8YeC8Er88yUwzY/bahx0jz/4qdzqxKFmWxD6C VmxMQM7nwH1rLpH3HX0hVqZ+JyFn6kijGQFcucOfBCWDqUipdHUzv8Y+5eZO3IdzMpkSHw2uiO D/OoXvPF0FjFF5rCs09h5bwL9koBSOoCBbzVPX3Yb9dEgz/YKccs3aPcxzKeaODvmDgqj8GS4U lsk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 03/13] meta: cache deb srcs as part of postprocessing Date: Wed, 30 Sep 2020 11:32:49 +0530 Message-ID: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-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.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?1679237676583544208?= X-GMAIL-MSGID: =?utf-8?q?1679237676583544208?= Collect the deb sources of the corresponding deb binaries cached in DEBDIR as part of image postprocess. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 27 +++++++++++++++++++++++++++ meta/classes/image.bbclass | 2 +- meta/classes/rootfs.bbclass | 8 ++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 29a3d67..659fe4b 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,33 @@ inherit repository +debsrc_download() { + export rootfs="$1" + export rootfs_distro="$2" + mkdir -p "${DEBSRCDIR}"/"${rootfs_distro}" + sudo -E -s <<'EOSUDO' + mkdir -p "${rootfs}/deb-src" + mountpoint -q "${rootfs}/deb-src" || \ + mount --bind "${DEBSRCDIR}" "${rootfs}/deb-src" +EOSUDO + ( flock 9 + set -e + printenv | grep -q BB_VERBOSE_LOGS && set -x + find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do + local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" + local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + + sudo -E chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ + 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 "${rootfs_distro}" "${src}" "${version}" + done + ) 9>"${DEBSRCDIR}/${rootfs_distro}.lock" + sudo -E -s <<'EOSUDO' + mountpoint -q "${rootfs}/deb-src" && \ + umount -l "${rootfs}/deb-src" + rm -rf "${rootfs}/deb-src" +EOSUDO +} + deb_dl_dir_import() { export pc="${DEBDIR}/${2}" export rootfs="${1}" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 2391529..6ca5759 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,7 +63,7 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest" +ROOTFS_FEATURES += "clean-package-cache generate-manifest cach-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 6316321..cfabeae 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,6 +185,14 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack +ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)}" +cache_deb_src() { + rootfs_install_resolvconf + deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} + debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} + rootfs_install_clean_files +} + ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'clean-package-cache', 'rootfs_postprocess_clean_package_cache', '', d)}" rootfs_postprocess_clean_package_cache() { sudo -E chroot '${ROOTFSDIR}' \ From patchwork Tue Sep 29 22:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 96 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809239ooj; Tue, 29 Sep 2020 23:07:28 -0700 (PDT) X-Received: by 2002:a17:90a:8b8c:: with SMTP id z12mr1048245pjn.185.1601446048123; Tue, 29 Sep 2020 23:07:28 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446048; cv=pass; d=google.com; s=arc-20160816; b=XxRnepgCK81vlCBXYKn9Dl4e8UPFqaAAHtwIKTbsCE3mo+PAJZRv663sNLn3kOqJyA O7oCMdPaIcBBi3m+rf9YN+ieb3kmOwKQvcAD1uw/WnK2st/ECg7nxTKqqJ0v2br45Deh z1Ke5fCiQUBhjlc289IbfAXH/bPwVB52RIlHejXA0rNcVqcnlZNSqJ++FkBOIL+vwERW K948D+5hyS7dkNbboVwt9sPyvD5Q4wu/3scyaL98wNsgOQ52c2eiISUWTa/fox0wf8/q R5yAbCbQJ/vjdntPX6PyiRN3XWnv+qw8hElAfLp2IUlpgoar+VTMZ1yLYBzuHchmXL0Z 7tGw== 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=8j/GySIbOnG/+/ZJuS0/IND72BFZMQisHI/HKMv+dsQ=; b=rwA4BX5aapaoUe81AknDU9sy4UF/yymWS6jpZdijpaYlWOB9pJyAkq6EjRC8TGvMZv BJegzWJEfLVH8fJYeTnJqdgUVXc4KlzeLfvIMorUAl9fT62BWRWDl5iUOdMXFtlvlABJ pjfYYvzJEpXuFaHP3T9BGh5MAtQuGpbGNuW3rkC3GBm9A6ZnXw9BN0En5pdWvVgMSudh xE31QZOthjjlXhG/m8q58U1ZDCeYwxgZfrpbxd+8SWMx4WHkiKFriujdYURoUZ7LUDzX 1zP8tCAwCCUj6ELauIkZE74NXkYO9zP2pYg1YuevnijNzKtO4r51chejH1EdmJwwZaca 6whw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=aGWNoP5T; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbh6b2d5qkgqekil4eoa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBH6B2D5QKGQEKIL4EOA@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 l2sor412852pld.43.2020.09.29.23.07.27 (Google Transport Security); Tue, 29 Sep 2020 23:07:28 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbh6b2d5qkgqekil4eoa@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=aGWNoP5T; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbh6b2d5qkgqekil4eoa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBH6B2D5QKGQEKIL4EOA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446047; cv=pass; d=google.com; s=arc-20160816; b=TIIXhBIyb3bUL4l8Fp4/AimccPt/dh6Q7QRcWhXTdw2J2zT0l1caMSDMtRPhI4jHl1 2Su1FMOzmCc6tWRHMkTzslrJdWuT3WgXRxrBPwYdiVyEBARdB8T1h6WIu038QbGzmDbr GquiQQ3SPz5xVQuGROFy6TEbKqNTycfqui37yqTYT/xJ0C7sEBrDrZhsyoJ4EQs1VsYy QLVWxjUshxzqZym7CcqSHeDiEUey1kEDkcQwy1jEmXDxFTPR3+82qZvwCXXD9K9xoXD2 4MQFcriiba40rF36To4lvbW32JWFk3Q0QPcnen7WwEtmC7fZ6pIAQHskRV0R4GSbW54r iI+w== 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=8j/GySIbOnG/+/ZJuS0/IND72BFZMQisHI/HKMv+dsQ=; b=GkkpNLO+Fsh+iNwp08HB8D71KQW6Yhat/My9uOC5SxRfhw5hepQryxnbSVYVkCm+Pz MjA4n9DJ+itYjCRauvL5zWthJe2lOeYlK0k4kxDoRj/Y372oAnecrHTrW0gm0FLDTSit MnAKp+iJ7/unHdjA59FiiFx8aXYQlD/6IA5SdDS/NUDQULRKp09SleC1S+bGyttLRkzI EKmapKlul0yrOsG7yyDl+CosouyGh5rAzvnlMFS5SICD/pFLObBvRzozZaHIgbP2U2/V LVyO4M5nM4l0X3I6oShJ1IXRJnUTfpKgzNJEH0MQkmYZrDVXf8+lnMpGlMhzrSh7ipcB 8qkg== 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 :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=8j/GySIbOnG/+/ZJuS0/IND72BFZMQisHI/HKMv+dsQ=; b=aGWNoP5TJnVKgoggEOXmU+Tzzp7g0VJ2b0GqwG/pUqLJz7izsVJ5iHzuY4z9ZA0zQ2 2Xbsi9ak9jlXwZII5KCEhr5d9X9itaLHu6TJ6WY+93UhIlSNnTQREdoF0ucnbwwgXruv tXmHamvatufoIFbZxxtMR+h71YEzaQ486riA7Sg+WedG+lhi5A2i68c9pCuZFeXNJ4Ru iJpiUY0SKN/q2R+WU8wiQv3DOIGqCGRkZDSoLuKM5LE41azlrMAwU4Tl/nN0hd4B9S+D IxBou5KsMOt10H7XeiOQYtxam8JkraI61+ajRO10mBx15rusjL576MmKoNhGckd0xkkG S3dw== 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=8j/GySIbOnG/+/ZJuS0/IND72BFZMQisHI/HKMv+dsQ=; b=YLuFPeSJnuGNCL0uM/dCQVII2zw6WGhj9r1zDpA5ifLP4Zy49F+ubKqGe247LrPsLp xE3X2EYFck1KSfs2Ors6DazMOPpKyrwqfrwAU25UTJ4278e8IhHNEMniAmw65TzmKKhK sz1IprT3du/Fsu6c+1XwxfpDwIujxcEkiUCxh5iDDR4pQR9j5O1lDx0UgRSWMR+UMpKy FncAsJBAe2NfHwdRDZOyuWvhtjWFWfF9Z54m27twDHUPORFLaAYRATGmCdeF+XM70Hzm ikPgkOPxLZdJHq7sLqxL1MHBV0spzHFEl4VwPpOX6lFIRbba2ZY1tUQqlUEONURgtlqC k1Kw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5303IQcDks1B7xdvfAP1MezLkgJjfJ5z2ZuTjboHOQS+NUguYAuX Hth1OMOl4euUuPgIrUqh34w= X-Google-Smtp-Source: ABdhPJwAQGchibXssvYuc8OWVJ1kt0X1MEzHj02Aa1ewohVtNX15OEUWKBdTQYwuouPL/uW6I/nlmA== X-Received: by 2002:a17:902:b702:b029:d1:e598:4014 with SMTP id d2-20020a170902b702b02900d1e5984014mr1300415pls.78.1601446047702; Tue, 29 Sep 2020 23:07:27 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:45:: with SMTP id 66ls418102pfa.1.gmail; Tue, 29 Sep 2020 23:07:27 -0700 (PDT) X-Received: by 2002:aa7:948d:0:b029:13e:cb8d:60e0 with SMTP id z13-20020aa7948d0000b029013ecb8d60e0mr1262831pfk.9.1601446047127; Tue, 29 Sep 2020 23:07:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446047; cv=none; d=google.com; s=arc-20160816; b=gECqfz3FwlqSPfiuVkLANksg/SWg5dg+MTfFVyNlsQM3tp5KChovygFCnLRWcIysSP PMcdPOjo69Haso+GmXNw99dTU8szQKFmRmfL6t6lhLFhAHEaw9eh1KbhfwH6p0JwGXKf MlD1RyzKKCaqyO6ajpx+lFheECR4wg5ImMDCcfRsHt0IFAx2yCsbMc81fi2T8HRbP+77 6jVyJjB4FDX44SYr3p7nkyJj/EtGWnpRcb8XUqj5sLhYfJ2iE6XwNnx87ujUuKYnfBDb nDlx9Fl4tM6lv/r+3T57Xwc+wYhWhDYVbVtHJQagPoI3eJ37JpGPtA+eHoDJKcEYGwQA K7bA== 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=eNGr2sY82htXXv/f2Ypru+JC6ylWvonjFgG9JC2l700=; b=epvZ9bPbo3BPB2i+FXKawMS7ryAvWCneJkvdS/DluUNyQ3LDnU02QXuP5P4AGiCurk +82jPlqh8Kh7lCKSU21saS9FedFLtSgY4DvZfDq+vluXyFpHN7Y7wv8bED3xS9OPKDdt lvFXdALDyg7nzPWdIjuW30QvA4oGf4HyeguP6t/1Ug6onOulmpQFOMZuCY3XtrZ8dd3+ AKOtnF2tUif2++3uz6b4SFvcvybGTTJ5cAOoFAdIF7Q5Vmk05r2zkvQIa9OKEaBtaPA+ 6OL6Lzz41tDJXnEwiMwcn7pTFcGeo76m+0ECflR0riXN2a+BFl4MvFSHYxw0Twv3NMah 1PNg== 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 o13si43847pll.3.2020.09.29.23.07.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:27 -0700 (PDT) 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: naMg+tU+PZOu7GoVFW/URMBJg3WOje2t2vRK1ZX+KhfzyEQJtyAlmXcLgym1whiAU/tnck+Yc1 rmxMYb4iGQAew4szHgwb7wa/47sRl/aQ7/0PbF8XjKGCtrHbUsjHJOip2vDqXsnwI4s9MgNKtC jE9CnSMBgbdXHvLZF5zN+JtOfrnD/EWhjSmJwC0L9SSZhR+jeefm6Wn9u8pvtMFDqdMzAsSEEB qQgJ8zXeGt3L3OuIXbTeIci1vRgNtGXZtAdQr0iQ9khB7ghXg5X24QlfEElz9UN1V+dX0R+NUH 7AY= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53462088" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:26 -0800 IronPort-SDR: zcqqlSu/Vv6iBN6oq5scNrvdrVN4ztLqG96y1kCA/SfijnvYbPTx9N66z+/DyR0NlTzCooCiZ1 fmasyiOWdCXIkFAKjqf7s3Mq0D8XCt8m5hHIzVFsGI+rDO0uEgOyfuAGcaHmGbX/tG2xSbZWSE Gv5mdFtX3l3wE/euaVwBcfZYeaouTIzvAECirGuJPmDoxi/HvWAZgtuYwag837Pn0zo82OXnbe 9MlFZdfBxM73vZHDstqJvcdlHQv/9vD6XjSQtkky23P9QmxyKIkKjXsyczyzciMyq4eH+SBcfJ c/k= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 04/13] deb-dl-dir: Make debsrc_download faster Date: Wed, 30 Sep 2020 11:36:58 +0530 Message-ID: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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?1679237891227378396?= X-GMAIL-MSGID: =?utf-8?q?1679237891227378396?= Eventhough apt-get source skips redownloading of files, it is still slow and takes a lot of time. Instead, lookup if the dsc file is already present in the cache and skip based on it. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 659fe4b..79a9a88 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -20,6 +20,8 @@ EOSUDO find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" + local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc") + [ -n "$dscfile" ] && continue sudo -E chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ 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 "${rootfs_distro}" "${src}" "${version}" From patchwork Tue Sep 29 22:06:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 97 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809303ooj; Tue, 29 Sep 2020 23:07:34 -0700 (PDT) X-Received: by 2002:a17:90b:1256:: with SMTP id gx22mr1155830pjb.47.1601446054332; Tue, 29 Sep 2020 23:07:34 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446054; cv=pass; d=google.com; s=arc-20160816; b=btrgtCOnD6Q8xWi60wryxE4EKocpK6yImaGiiv9cmnn+DKNsk/QyQ7PVxojaACRt6S 0LC7drIdI0gEKSJn8nPsc+ES0rMu1g9AX7BvLYNLjzgJV24nnpLSpmQ8hlXHoAbxMD3O gqiv/n8jgfQ2B+GiP3qzl5BINDNUsW30RSLT6DzSax/5n9za7ZWv61x7yU6m5s3HwBsv gliT2TTyYfYQlrYrCRfA4nFNWDYxPVDTLSX6eHtCQBlt156NZCXAEtbNR4KBpoQt6vrM r3/rHHkuxL4fhbluTH0I/fY/xBjFeeHQgiTsrmG3wXcR881G2vMLvgcYopgmcGCUf3KG CLEA== 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=uDt1t61Zvr7/XsBrhouOgqerym3BJnQ88bFQp8ynvEo=; b=x2Wlak9/LIQlwCngewTbXiMlOPtm1Krm5JBGrG4CYFCWlLvGY3pEgkfxKP4ZfoMa/v 2RZ2kniqQmjXWLIZ6ZNy49OR8ppHicSE33NP6PadcF4P3ljiGLOsWR4GI9DumGg4HAP5 v6fyZOn8r6iVHTOJxUm2YN84gF/zpkfHo1e7J6K5W9124PHGPRUIKWQDyG3662yT8NbL rmz9Z2rvEk7ctJ6NyzYDVglC0zwIIxI6oy6jBivYMdMdXaium73L3jvx9EBfDFrsSsi3 eCadye9U0aWeSRE8oT+PIS8dxE7PEVVBFZn689MEnHRWlamlh13D7y2ukF5MPYSzXJ/o XlBg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="NUq/+yIm"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbjob2d5qkgqefketrpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBJOB2D5QKGQEFKETRPA@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 w8sor285278pjh.33.2020.09.29.23.07.34 (Google Transport Security); Tue, 29 Sep 2020 23:07:34 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbjob2d5qkgqefketrpa@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="NUq/+yIm"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbjob2d5qkgqefketrpa@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBJOB2D5QKGQEFKETRPA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446054; cv=pass; d=google.com; s=arc-20160816; b=QC1XmmOzVanQUaT6zDkNmyo5LLQ8oed6qdrQ0594TaSpYDe3MzK804cQQIMFE7rFUx FmsZaaxSfHDhFC8XQ11hhBtu6XzRAHfQU6cJFKqLe7q79bnfIsoZ/x1XwqJca5nSwlYp btwIvULrTmAjpAirzgN6WhdwaagcpV2YDplRShEMaBtJ9xzi0do7AgFK+dumIONFDw3Q NUU5qy0IryTU/dcxoFTfbgILzxFt5qoWFS3WAOpEXwQHo4oBK7+X9h91CUS+LTFlSky9 JZS3z4Rpz8HQIbxFR52owjsR9IYLjK78mQJIMs3HefiWUge/VEg8hW9eVT3RIY1MeaPY lQZg== 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=uDt1t61Zvr7/XsBrhouOgqerym3BJnQ88bFQp8ynvEo=; b=IKbkhq9uH2ydKUQWCV1E/Y8NPOkyEC+gH4CY3qbkiVHafLA0UrO6tkeWEo1wg+uUia oDPTkcE/18kimzWItfH+fXTRDCpvSTT0DzXIpVpStU5i6+Uk2gbpCgq4GOy9R5NfST7J d1fMIj+XeuIXQweVHNxpJvnyZQY7FS3cEEtiPm/NPh8m+/nrU/XFR3Vd3jl2MQvf/ZV+ nflpRLDslGFaC5BRFlqx18AA9fNea3BCbNLmBCaXEWC0lb1ZFifqy4UZRZhPn+FHPrLd BGxpv9UuxrtdQlkrx/X2g/PehW6TEVtjYqxhvNEx+I2DvDCwVtySi27BbskgNv5ANb7p lcdQ== 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 :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=uDt1t61Zvr7/XsBrhouOgqerym3BJnQ88bFQp8ynvEo=; b=NUq/+yImy4u0P8pziBHrxhM5GZbdSPRgQd0gcw8DE1EEZxNp7F+Vi6pUnM+U2gI1iC 7WHaLOJZQXGl2BSQYGz9iQZFod91mZ/QCfMofMWVXGd0pSJYHfLuT4KQDdV4A6eMjvcF nnigy06Iy5u5qZ+s1hCUCCuNOjlRJpWkAlMgFHUiU6tt2M6ZpmsIKdqCkwEU5SUJ4ilj nVx+c+I5Ygz9o+Xai6YyCCeSvL3Q+k0Vn5J8cPeiMklKVMfVGcxFqErDukum2lZF6g4P Q+LiFQxxxPeGdRyEKl3SH/is7hPYxg/pGVGwqv5p2Gef+7RGgBF2CXdhqppzusudj/fs ku8w== 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=uDt1t61Zvr7/XsBrhouOgqerym3BJnQ88bFQp8ynvEo=; b=WYfavdNAKl2mXLX/HcKBqjIK53CoIreOpZF7DzUqMRxWz1MT0nmFZ8jb9Y+cmFRI/p 5mekQAZHdq3MWbQb0+P3dX3S0V1qu5IijxDsJzfzNRLfoHF3Ay+yRocpprvq3IOJbIwz LyKWF+avVNQNLymGOkShG5DDioj3jp3Z4p46w/mFPAPK9IxDFdbjG3vapgaI0BVJnPIp OfcXqIG2B/DuXg396bbh/9O7WhRLWhq8YrieZqL7UCI6clIEpH1/T7Uw4M/ifTx98LUF 3+ePI1gxaJOkiVzeGvS6ZN8Srarbvr2xjKrOFsAJlVv6LYKvy9GsB7c8oQ1IhFuIXBfx CI7Q== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530UIci7uMO7ID2WOXSh1VWZ7RTjdnOo/RIWzbt0GLEGsxHmd2zw /CFFv3XOKX/Rm+iU0/e2Olw= X-Google-Smtp-Source: ABdhPJyPzJZjuAL+ClXHLhb7J/G582xG9U8tgULx3ls0V4PTOIQTAfR3UFnavVJWRYYmyKYk9+t5Fw== X-Received: by 2002:a17:90b:1098:: with SMTP id gj24mr1159871pjb.55.1601446053951; Tue, 29 Sep 2020 23:07:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:96cd:: with SMTP id h13ls417543pfq.0.gmail; Tue, 29 Sep 2020 23:07:33 -0700 (PDT) X-Received: by 2002:a63:5349:: with SMTP id t9mr978898pgl.62.1601446053390; Tue, 29 Sep 2020 23:07:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446053; cv=none; d=google.com; s=arc-20160816; b=s3jRLcMg/tfwSFv2g5yyUOB3w+cBSzuNQeFY/P6L/qyp8emHHinYcFuiAX8VFZFACW 2aXWyKZvijgNsZ9wJdSbnkqoLESDnRrwRGFN/c9upzlL1noj43CSR06BIe9V3Y6bWIwf rPZ7kymAXHDEdsBzQRXQr7o+3R98SiEU7pQt8UC/MnbOOhUBuGHCnBSUq32Ev6Rq2wgc iq5ysUDr3yNgzRECF/o+aJ6faa0ATBEeQ/RMG/YvRKC7C7lC+RfhX8QVT6y1zkBrt+fd av9qGYJKr9jioFheRnF7+GCZufsVS0HsnmtXhaVy05phoP8JmvX6BgSq/VLxEZVmJSDp TFPA== 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=no9hSo7RZllFmyagmgiwNi3BFDjxbPTReSBDBoqfkwo=; b=uK455B5WXmTaSpifHTiluh1iNlDmQzK9leCSW0C1Kx3Dd6zg9R4HcSosrCeIjOWLKx bIDRuaAouyvzFPAdNttofgPN0vzYqp0kdLaLUYmGhC4SmC8rJs/Xu/wzTQsETSThbFXL oucQhx3yIIMJFRIoJCBRXRf7sk97lYqjFlcnEYhDfC+lz93CriGT8b78hbGO54or7Rdf aUWWrG0h3rxIq8IeUg3L9leAbo5IBhhdqosr2R2p3ubpMQmRlSaNqWEAEco/suWFUAIb 7T7OfsT1rJC3fYI1lsjsFN42XuNoYmDLb175k3EBKcfl1xYgfCttjmTL3fb6sHlP4HwA vLxg== 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 e18si48100pld.5.2020.09.29.23.07.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:33 -0700 (PDT) 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: cIejVpjFocDwOVk0rEpnV+FLu3K9RckAp4n3CjtuZlvf6z63yYvEpSCkV6B7HD7Sa9Ox8BJck9 U94GdMtJzvwlY0CMeV2M0Jla7VnB2Ws1vbMyVkL4CrlcPFR5WkV3Ug1q/9LODxIV+Z7M7ZVyEZ KRgs/zdVBXM5+sBOmA2vJFCqZGz4k8mQ9v43ne6O4cUeFHEWtiWj4uz2inGh0cqjxahuOMSNst u04Qx3HGUaJhUyU+dIroRTBo38zEcPBfyAHYhxgvf8S/jtxeix4/25IEuWbMesRhOcpBcxl+6j fHc= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53462093" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:32 -0800 IronPort-SDR: TJR1qBDkGA3Jlab1OyDANsKv524cKo/xMxqT+mRPeaIH8JlunV30/0TYEXGPmH5HncW2cYVwq2 9h1BtLeRTvJGKtW2cSytf1ZcxEN08/K2/ykBsex6gcnuC1ezX8BqRHQpvbkG9CxyZPIsSzUAE9 NC6q34CmTQ4zYEfO6v5SqTRWZ9MMSbmwdqwdKaETV5YXSOny/pUeMZvRaSI0t37M0icRaByObg 8lnC6o4FhU/06ut+b630wk/f4AofRTJ8g5i6ud54HcEQdtW/MJAEC1NQ6y+04KzuETstfPJK3P UH0= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 05/13] deb-dl-dir: Download files only belonging to the current image Date: Wed, 30 Sep 2020 11:36:59 +0530 Message-ID: <20200930060707.12785-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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?1679237897926674166?= X-GMAIL-MSGID: =?utf-8?q?1679237897926674166?= Avoid downloading deb-srcs for debs cached from other image builds. One way to ensure that is to see if the package is present in the dpkg status file. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 79a9a88..ce691cf 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -5,6 +5,15 @@ inherit repository +is_not_part_of_current_build() { + local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )" + local output="$( grep -hs "^Package: ${package}" \ + "${IMAGE_ROOTFS}"/var/lib/dpkg/status \ + "${BUILDCHROOT_HOST_DIR}"/var/lib/dpkg/status \ + "${BUILDCHROOT_TARGET_DIR}"/var/lib/dpkg/status )" + [ -z "${output}" ] +} + debsrc_download() { export rootfs="$1" export rootfs_distro="$2" @@ -18,6 +27,7 @@ EOSUDO set -e printenv | grep -q BB_VERBOSE_LOGS && set -x find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do + is_not_part_of_current_build "${package}" && continue local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc") From patchwork Tue Sep 29 22:07:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 98 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809380ooj; Tue, 29 Sep 2020 23:07:41 -0700 (PDT) X-Received: by 2002:a9d:65ce:: with SMTP id z14mr628799oth.280.1601446061409; Tue, 29 Sep 2020 23:07:41 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446061; cv=pass; d=google.com; s=arc-20160816; b=mtmzIev7xnk+DsJBSaObXbzdVFPOplPnGO5iTu5O3UtI1s0rnGcAAx0xvOjKH3k4R9 kOIInCCNl4T3pFAsRaDNncowhcB5Vo4GBAq0CXBERjHTQOOaTZrS/lMbiSmJoA1tfYSp GeoSlcVFUoEDkkUZ6E6lEUYnv2a+Bac1Ymrr5ek3a1YQRtHA8JEQ12moJ6m3Y3L4EcaJ KdZ9iOJ5jsJ4Ct+cBgkFiUlmViTzqNlKu40IpFx5vkPuGnwHZp3alGm8+AtZ5we71Yyr nRNHS5loq3LBkvmIJUEK9qn7+Gw2FKBDCjKO5nYmfhMXPXmuPUB7fUKiPUWp6fOL25yL Yc1g== 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=ZlTJi7QiQCf/rMgK8U8ylzAYQeaHYioyNOjYqrlK1rU=; b=vp1i/CZB8s+1Jb0uLbmuFid9nH1CKnnfQrfefhRRMp+EAAWPMO0eUNE8Dse8Pvv7TO sU0WftDLJlRz8vQeozwr+da6Ho5IZpgqzwK2CminlzGb9JfaeAPkSrsFEssoFB2a0c9H GYG7mwJ2gGme8B1f1JSDaEVk6yRgbVOq/rnLK2UsMg+cRxJ/HUd0wGPwjz/PdmfDZK+o BNRg5xTl7GwsIVjefRxxAGIk4NPXUcp5rxKGEgqA7Dir/dg3qk/OhJPMJHk7nd6hYq4g czBGZVxcequBfveEoU0stmCYtTd6ycAeaGnSG0KtE56Df/bf15MIKU3TPXGj43qSjOu6 lDAQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="ddaT/3KD"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrblgb2d5qkgqesbm6qya@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBLGB2D5QKGQESBM6QYA@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 c19sor115959otm.84.2020.09.29.23.07.41 (Google Transport Security); Tue, 29 Sep 2020 23:07:41 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrblgb2d5qkgqesbm6qya@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="ddaT/3KD"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrblgb2d5qkgqesbm6qya@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBLGB2D5QKGQESBM6QYA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446061; cv=pass; d=google.com; s=arc-20160816; b=M+xLNGHe4cWBduou0bI/Puh6SOJiMdvFPPflSkl3KkbgknRtJDPB/siuNN97iMaiE9 HNRyepvEoxaakQ4e8+a4u/8l9kcMRGKyRlgvsAKj/EhvoI2W91lrDl5TbjdDDRgRdBu7 MU07K54X5vzHY7iQrI9F87TRh6TbyVbYtAdd5Tg3gmelt/ppMIYBj08w1Vf7HDkfjNne N7/RRI8AHhVEliqxwyuH2r8Z0SreQgyWYTtt1F57Q/3FdGmmyVS8xGmOeUnaZmVKnOVG cy1aZLYQVIbEcY7jgfndr4ceYnAZZdtMTmiCWSKqS+YuAIwGgFdCdDp4/a4Dhmf337ug Np9Q== 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=ZlTJi7QiQCf/rMgK8U8ylzAYQeaHYioyNOjYqrlK1rU=; b=rlRGynGYAgbLsZD0jvnSBe+GTJxRSHlSuPY8jtQNwgdgvNQpfuUR3t2Jg8vYoEGpfW QMd5CqwNN8upjWJQ0ajNe6cW2xTlm4z0kCp1t4amOoGQcdzpdkfx0j7Chb6km8prR8G5 3UkitiJEVP5WtTdnTY5WD6OrxoWtgzxorc90B9jw2eb9VlqV2B7DnugoR78G0gFFjtVd J43iSt7RhaqZt9l51FX6Ccb7RaNDYjJATo1nVOEU3aYCCz/RAd1AqgY1GspKooCZOL77 Mg9GH9XjUBYgR7BfWn9ak5LccTzlln0SXCUOZtUVWQB68t6CoIFs/2gHdFGXW8lgkgzU qmfg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 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=ZlTJi7QiQCf/rMgK8U8ylzAYQeaHYioyNOjYqrlK1rU=; b=ddaT/3KD76eVJ3QjBaC3XcIoRLeny5Nn7h+TCTjO+qmQe+H3Zu9jDFa5PNkY3Khtfy gzXxwsOBiPL2fxf09xobkZ4f5u6x3J53ZEMfxZKAOsGPaj9xUo3xhna3bA9WP6EtrNcR mdXXdtPSD+xBF23ffWKpqiF38/1nZQvTmaUNlTMJD0HzUzE0vSIlmwoaI2nOFCJC30GE zN1GR//YRwzoTlTs8vGXsdkLU2tdfv/hg9lj5GBnIhv0xFdB51yjMXmG1WEyQS1irWLE 4rheoOtRDIjDCAzOL9rrapL3MFk86scS2lD/EHFwVpVZAX7yKVHAAKNkHaMYJm8o2SaQ P5hQ== 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=ZlTJi7QiQCf/rMgK8U8ylzAYQeaHYioyNOjYqrlK1rU=; b=bd/mirwTB/1LCHIpXuj/g9lWWxIDhNROfUZ73ArAy9Ush1qlxOOZejB3l1ropCkFCC g8sk+k57Bl4c3ZB7kdYRkg6XcPF9Og5361OE9T87YkKbJ//ovZASE4oQbSinx+J+RRtj Mu9X6VwfXaa+sFC71o7L5eNocTBk9kVQWWowCqZgU+AmG1CMmva550k3IhLTQmL62cIh 8MUB0i9Ld5bJYuTjn3Jvdmb+5kQCeUCVdxYmbr57GvYQIuc7EBHRAjfOwvVRid77RUJm jNBLJLy5hc2bPD9HVrw6JB5/AAnTQSlEnUm7diNrh01hUMd/Jd07e/jE2Rh9Ai2BWQdL D+Vw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531z0pdmr84p+MaP+29T4sdeELhtTdCydp679HaDMmn/1x7CPK/8 h4lagapnx3e7qK1dewx1TmA= X-Google-Smtp-Source: ABdhPJyP1vfj9iJTxCrrQFwzVxp6xdn6ycL5Od4X8RWcaMMYLMzagrP0zeUJEtVESJEqL216zoCxIA== X-Received: by 2002:a9d:be4:: with SMTP id 91mr610683oth.248.1601446061027; Tue, 29 Sep 2020 23:07:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a9d:5c0b:: with SMTP id o11ls206994otk.2.gmail; Tue, 29 Sep 2020 23:07:40 -0700 (PDT) X-Received: by 2002:a05:6830:188:: with SMTP id q8mr615896ota.278.1601446060533; Tue, 29 Sep 2020 23:07:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446060; cv=none; d=google.com; s=arc-20160816; b=Obd/F0jqSOHfEXEvMpjI8SVFVyj02v2+d1zuCEcAO3umAi955DdXVd1MdKZqKsXB+D 16GPikstAb2goeuwYgU1gkMDhsZO3w47L3yp/CpthKFbHKm/Vq4vtX0fYlSARsYCMDLz ixravlIPfgKfSvr/kfGkhpcCU79CllVYNhRdXs3yM40Ebolgl5Tur9w5bBDBiz5HMWmd 9h2HlDxJwfbbfZNgbZ5VjkTZQOSMYFlhw66ZfKWmG8O7syxDFwhQgs5bDnCXFXSkJuC9 q4MnIfzWXcaT0Ar/XVso/aief+U6xmYcp2W+5uPG0RmbjveuKU2ymv3IDKROqgADGHJg 1jxQ== 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=AopAAE7zNNXq7DVNy6s+zFZp5UrmFlBiidNI1InkWYE=; b=bAxQ06zN+FkyhM54uOyPXZf0kFYXA5LgaMLUt465FZ1HaH0vk0Vyc6GrJvUh9ncyZ5 oxX1UAdZeev2UF7AJNq++MmWBS4WbbDKwhELX4mI7+f76OigIO08DlEHmFFRkz6XZPnK JUGTV2fUDSPSlDfY8kN/x9hJwkHeuxq8KD2vGt/xSobLhlmYzFnwLP71Epqr9qgulrTl vPtTzb5mVbvZlL7HaeJSqvJdVxzYQCo0uUzNoWWcfXONFovCo0E0ySUn7voKntRe7r9z La5fKIOU4+fHRdY6jMz0nRjucnLl8+TDfZm7Ordag/ZcnFUB+msKs6bhHW62xO07hOBp xu6w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id l19si41028oih.2.2020.09.29.23.07.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:40 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: 4bk47/sfQQWKuoqDQXZheHhAnLLJ6j0+9uhR25MDOcbiNhezLQc5Ck2nsUZTRv5WMBOvYNcFOl aMXfXclice/5xZ2t4APY3LT55S7rrjVOx7Bo3a5YFk6c2wYF4d/C4oFV4ZjF9CfQzCfJnig7bw ZSJJLHTpUXXVKAoqjuD4IQAdbL/0Wcnua8GTV3gQl9hNm+rXfmpt3ngmtZk8MOVY1nkr2RJ+IB SCxYTIq39mWBRgGpxS1ZQTiALFUJV077J07u6R2GyVm2VnCTIV8urQR7pyDxxVNLDEVkpl6tQF njQ= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="55661190" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:39 -0800 IronPort-SDR: 38oo+Q3onfBO4Z/vR3rXoBZ/JocD3ZIpcrs6oNAOz/nr6kI09s3/UJn7Q4Ak4MZU41wrLTePN7 r3sT1qu74xbRR/tPdU3Cj5WWzCoH+BVK5sl+MZkTYKtHYWIWiOwCWGSc2nr6l307mN4fUunAy3 o0CNTmip7tYRSzxbxviCuh1w+LMNAczrNkkG8p20XuK4LC35dLTQsVkmCulzs3cQsh2cQY76Ht RaObmpfne0xkcwbtXapTXN/fJIurONYpensWz6qyK4GT1VxMPjKDWeqG7/XMnb1jczi+hHbs88 u0s= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 06/13] deb-dl-dir: Factor out the mounting part Date: Wed, 30 Sep 2020 11:37:00 +0530 Message-ID: <20200930060707.12785-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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.129.153 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?1679237905209076904?= X-GMAIL-MSGID: =?utf-8?q?1679237905209076904?= Factor out the mount and unmount section to separate function for easy readability. No functional change intended. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index ce691cf..b2d94e7 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -14,15 +14,30 @@ is_not_part_of_current_build() { [ -z "${output}" ] } +debsrc_do_mounts() { + sudo -s <"${DEBSRCDIR}/${rootfs_distro}.lock" - sudo -E -s <<'EOSUDO' - mountpoint -q "${rootfs}/deb-src" && \ - umount -l "${rootfs}/deb-src" - rm -rf "${rootfs}/deb-src" -EOSUDO + + debsrc_undo_mounts "${rootfs}" } deb_dl_dir_import() { From patchwork Tue Sep 29 22:07:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 99 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809458ooj; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) X-Received: by 2002:ac2:419a:: with SMTP id z26mr277927lfh.537.1601446069593; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446069; cv=pass; d=google.com; s=arc-20160816; b=mMolJY8j3D+KNM0mc+HNdNXmgPUAv6Sj+bFv65DT92geZesEpMck/+lyA6QeA1sOzu n6gJ0QpvvEaPXveJuhHdesUJYNM7JmM9t2ZMC3QMDpSO1eJCiQWH4jOwMxqGxcxeoRlw J+GTApVfAP2SR4j4t/I6p7OwqaS1xn6uCX8KMfSx6Ja5+VRNuBtITSUnoQWgXE4yuTzY gZPpZHRTLgk6DaydhEY9bumwnlt9ZuK3oZSulU0RvcXIBEWKZ2EW3ulnTS/bN7y2spe4 v95Cu8LkRR/duTKdZNF8yGgqsQ6fkt8ii7UGA9A38qaX0ZzW3nqCFJsaiFFZz90iMjXB 9Pjg== 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=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=BJzkTgvz0j587Yn+E/pp/btAgGUf+5zyzlGL64UvrIz4+Bs1AtmJgbpkYcCKhOiwDx YjYQ8lfTAE4t4XfQ3b1be0kLjIZjET5vLnCRY63W7nMTXodpX9yR5y/xQATRifpP5znp tobsNW739Y/4kmVuv0mQtVGZTKjJjDEZyG2CaQ2DtuITMqPeCKNa5tPFJffrfLI5b8N4 by+ZrHFgtSDf4HaFJBpjFlBfRiRvSJei6X4CdG71F6S9FMGNOo6PqvRYcZXEv7bDeNkH r8ll752PPdvVWpMafdtMK8WgoYvVg5iMksEAWVYWAqYB2DVwXXpbp57Wx1q5Oq35Su8u +84g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=SgbzSYPh; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNOB2D5QKGQE2AYFVSY@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 t15sor122399lfb.168.2020.09.29.23.07.49 (Google Transport Security); Tue, 29 Sep 2020 23:07:49 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@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=SgbzSYPh; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnob2d5qkgqe2ayfvsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNOB2D5QKGQE2AYFVSY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446069; cv=pass; d=google.com; s=arc-20160816; b=n5dcm/BLgl6z6WINr9vobvsYRjYW2bmQkHmBCBXxEEC/Elj4HQqiTNKnv6m919px7Y zAf898cW5hA5dqOG0cOYlwot/RBnvt7plsBpa7Q1F+KrbFiOAl1d3ENrKTQOt+DBtzdB 8Viq74Zrsyfsad1mvHi7YY+Zrt3aZeb/btPQKcYSSRRlEqCAIoy2QvAgGjuOfuiX7hEV b9xH8cJXIAut23ipORn8st8F2LrKDxMD9kJE5HUufENvzinL0/WLAj4qF+lToJg5+8SJ A9S2N1pLIgThZl18MuEh8LBrG5eeP67xynGUJyJWvS6w/T5pfVAAiIYTRWzsk2xEekN+ e3gQ== 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=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=DokNwK6gZeYkwXCjhFgiTXfnPcv5f+maaW6wle4DEQ1wea5FNxwAwQd8ROZPdeB0RN bhqL5nFk3cIn2ZD5KUxRWuQxtJPfpSqCLpAgKpzbLDMr5ZHIXrF0m9n4xNx/WA3SaDWu ZmGOy1ibVajxhBKsIQvx7kcr24bL6WJKVGMgb6gpyQOKE3PQsMMHILIAVlJIBFRzW2sW A/o1y8SB5kbEagf+dgBeKD3nlppw7SVZASEOfPzg/cGWjohTjDpf53RvQ4kp+DJ+T0hz JzlEzyabkqdRJzTkNQPrwe15FKcn7evZVCUY55rxfOCLyQz55fPI6Uvm/92SPOXUulbg F5kA== 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=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=SgbzSYPh1lwwWgwTfE+lsHfxmoBF41DHARIJCiHwbxx4+WeQ06Qp11hRRh6JywiaA6 DiWH/GVkG5xD8yrOJeZ1aya+zud0OrYXz7ZQMKFZJDA8WdQpa1wiSEPLy2MP3/qEraAo lbu2tRSmrqJwui10PCZcA8J6o36j3WsGorODHTdWGedt3m0fdHUhAv2gtNabI9Vlp08N Q9byijdVBUc1YtOeu+SpOiU64c970mZjN4RsBlbCTlneZPQNpQFtInf5QwRe13aezWvE O8UAnjSWDk/2OepAYavtZlcLaZqdntbkls2MLl37zZWAuAIpnP9oTvdxGHeul5sgnj/q V3fQ== 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=Jv6TBRISBA2IlCkOX6IqCx3RyHS4Rw7YK/BPksSbZPo=; b=dgyXVO49gg/q6yDTAIinXfUAeGHpDFvT5pK/EwU+QrRO5lMbgA4aGvWW1Cve1fxsHs JScoa4Yey3vUxcIC+qZbT445DVCA4G9Z8T+oZECHvwE7xcdvE78QbdaAXQz/2sJxf4SG sJxRPe6XjHm9k7lHUL6mCwWK0MWOp1u2xxp6G0rseXF2UY2NriCrBp4JqZAxLkBStsk2 xWBXLkGYoPWZT+2Q7aQUZr2gL0seygGgO9jARX6MIfJTd9Duz5sHvEVyEX+Qajdvk5F7 Rvg9H9UWIpDtJAT617Xr2wYIuAJZwCs21eEmeqfLaV+Hd+m4B1JFu1hOxIZhjrFGEA4P JA9g== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532hEupnNEIXfJnJFGuI2+B1n6Xccx6LeicQ6pPAb/ZjbnZ2j+hH PHpzft8Gw4EmWMsOo985tzU= X-Google-Smtp-Source: ABdhPJzwPkd1qNsMPL9r01O8RB3Fx4q6bVR92hrQfKcrZGOLXKABOu8J8M5gtYSDWuxD876W3DOmWQ== X-Received: by 2002:a05:6512:2101:: with SMTP id q1mr333839lfr.157.1601446069245; Tue, 29 Sep 2020 23:07:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7e02:: with SMTP id z2ls121090ljc.2.gmail; Tue, 29 Sep 2020 23:07:48 -0700 (PDT) X-Received: by 2002:a2e:b530:: with SMTP id z16mr397212ljm.143.1601446068034; Tue, 29 Sep 2020 23:07:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446068; cv=none; d=google.com; s=arc-20160816; b=tg9IZBgZusCgCT7D6RhQEcfa/A5MvIl7755aZIw7W4N5Xls5v7IVBc/N0ui9x+0tlc 2ZfPenhmvzCR74aKp/dc3AOdsDSv9phMYQOwne6idwDO4T7OGddAiXLH7DpAtKWBLj+y d3JVlzC5e6XpsI/npUWyz+/pyUEi+VseiX8dtIii3YCmZV6gQ4AP7lQxfltfYx6FMG7P 07pu9u/UP2T7jkH4V/9BCZZFGmdEdppct+MU7YY33qN/2ykZaa6iYie10QIdBlJIVdjD QKorhi0mXCrVGkpsVSwwBiN/YWTEysoGQBFpbAPBlsSkQ48F/NYwkerbcw6oknYoNgHb yXCA== 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=waF/cg0xZ8LCRUZtxCRDXkKPva0/PrQwMXUieUs+908=; b=N+rdI4z3Ho082M+tiVrI2tNXuSmcYytVg5Ti1ZfM7Ft2qZMtDdA0N4Wmb8vgaMK0/7 ciGsod8UY1tpXE8Syd4ICTkLbD7xQi5gM2PB357u4uaJcV8SK6cV9+eI2pe8MPO+koih N7cRylgZcW/M58qQSJVemfSlqDcZB904AkxH3HXumQarl8a9UEB00j7L0E8f8XiU6Hb8 HSfjTAtJcH99cYV9o6f5tdwbxV/Jx1vzAH6Qde+inETMRqSg/5fixZlaPbmzzFf7/f9u 0rPqEka3igOjm1KXNeDFZsu1qffeizGhxrbblB/ZefC4f2+d5YlwNTkjUjyQuSbLJ9ZB dWJQ== 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 q20si14430lji.2.2020.09.29.23.07.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:47 -0700 (PDT) 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: 9+mEpgsJr7iNvm5xwc8FZagkGu0bYiGpy9Rj66fbNNvCSN5y5IeHPMqZf1/xJ+RXiiSdJsxh8J LBBbZRdQd4VktaxBK2HjtTO2usN/yKre44SplctxSM0QlsVXs8/un5J3GbkzOf2YWlu1bd32JH T6HV32xqh0l75yPE3ZACHUZZhpm01Cs/35iujJjAkU8s1Q7rd+3HUxGykuNQ4AQedXHu3hO+uI zrLjRhAeubuw4ESzTfML8wVS9aHvWK9H/ASrAOdMc3PvPZc5Y683FnXQjerzzul2A1Dg7tRwKG +t4= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53547884" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:45 -0800 IronPort-SDR: acTowwyZPVTX7q65phY3d0srlOZaAoLQjheVrzPAwa0jeYPLtM6WIU6b2/Q8ZYPpUDUCAbCM3b eJjgNzbcDtcf5cINWqW8Jr3TwuqKwj1JslnyXGzPVEuD+nNPe4QZr8iyOv4M2Z4zajBT8aA5i7 So1Kevmugp09WTwc9rhxiYPahW7akvuqq3hFHtNQp+WSKb5+dR6A65wcXwC1iJxu3+c3jqQdse aEhY2Zc//zHhRlJyhsrSokr/1xSTYhz0uwOwtIVBaofxQXKe5QTuXwyMqYPQvz06tdFV1886z/ lAY= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 07/13] deb-dl-dir: Fix skipping of removed files Date: Wed, 30 Sep 2020 11:37:01 +0530 Message-ID: <20200930060707.12785-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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?1679237913633404172?= X-GMAIL-MSGID: =?utf-8?q?1679237913633404172?= Some packages are installed and then removed, like localepurge from image-locales-extension.bbclass. Those information would not be available in dpkg status file. Use dpkg log instead to see if the package has been used on the target. Signed-off-by: Vijai Kumar K --- meta/classes/deb-dl-dir.bbclass | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index b2d94e7..a94fb10 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -7,10 +7,16 @@ inherit repository is_not_part_of_current_build() { local package="$( dpkg-deb --show --showformat '${Package}' "${1}" )" - local output="$( grep -hs "^Package: ${package}" \ - "${IMAGE_ROOTFS}"/var/lib/dpkg/status \ - "${BUILDCHROOT_HOST_DIR}"/var/lib/dpkg/status \ - "${BUILDCHROOT_TARGET_DIR}"/var/lib/dpkg/status )" + local arch="$( dpkg-deb --show --showformat '${Architecture}' "${1}" )" + local version="$( dpkg-deb --show --showformat '${Version}' "${1}" )" + # Since we are parsing all the debs in DEBDIR, we can to some extend + # try to eliminate some debs that are not part of the current multiconfig + # build using the below method. + local output="$( grep -hs "status installed ${package}:${arch} ${version}" \ + "${IMAGE_ROOTFS}"/var/log/dpkg.log \ + "${BUILDCHROOT_HOST_DIR}"/var/log/dpkg.log \ + "${BUILDCHROOT_TARGET_DIR}"/var/log/dpkg.log | head -1 )" + [ -z "${output}" ] } From patchwork Tue Sep 29 22:07:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 100 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4809492ooj; Tue, 29 Sep 2020 23:07:53 -0700 (PDT) X-Received: by 2002:a2e:8ed9:: with SMTP id e25mr356154ljl.404.1601446073055; Tue, 29 Sep 2020 23:07:53 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446073; cv=pass; d=google.com; s=arc-20160816; b=lU58WLem2Vu0/1+B/Cs4r2/IRnM2IfD5XgYi9QaO1MFRbnQOkT7sKd80QtAiceoOca nboLTLUDQdSZsz3x0gJlFsuSp5OqWkGm0QvoS1McfUyl5+QIdDB5rwgIJaI6g/cIT1YR mrrjcD7ZdoWM4ANOgfOH5hw16qyQ7+efHZ/6WOrCI4OBPCPA88IpA8NvgxSJNcdacLE4 N1jPcLq9kn7saio5hjcOSdMV/9rh4RN/EGxAEd6Mm3sQJ3i6jWIdawsHt+TpblTBwPbg ftA2jkwt/jFvzenesZP62OsTa2PrTDRCmw8dmX0uJ9p+gN1h1TGtPUNmwOgbV/cbi0O3 SyTQ== 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=CAEXP12Ym6yqcyM7RgW9C3obmN7qM3N10Migac7BDbE=; b=S2qSDzie3rwNF2A1XZ3arh2ouvWGfL9EFqQ26TaZleK5bkBemdNH7FV9Z/0etM/pSz gWDTmPbSE0LVSxgQrWWQb99uKQBknknN8+ayBqHCitKjLf/WvJptXPHURN4rrbryMC4J O3M0CFq7P3KrVdC8t22x8dFYJLu5hxfRqVoY115X+Zn8bCytdIOwqWfmbOZuBTVMl9uq agcCOBtldf6yThoATN4gCPl7j13Zt8uYQKXtIpM5iLOFR6Mao33NiioshMvNjmwgxA/Z 9wk3ppwsx6LDNUKV7ovKXhSYNoyYTVtE7l60a6xqaUV7ZwQh0d5wJ6BnTbjdsrFC+HYC 0GrA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=b1HtuhOz; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbogb2d5qkgqe5jsxbyi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOGB2D5QKGQE5JSXBYI@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 c143sor131545lfg.12.2020.09.29.23.07.52 (Google Transport Security); Tue, 29 Sep 2020 23:07:53 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbogb2d5qkgqe5jsxbyi@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=b1HtuhOz; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbogb2d5qkgqe5jsxbyi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOGB2D5QKGQE5JSXBYI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446072; cv=pass; d=google.com; s=arc-20160816; b=vZ7lONNVvidX63pSNy1XdAkkffD6NBWZUbP3ISz5igJzr2nKfksGaVMwqL/VVAPDff J5Bx78QgKFYIJW12XOye5LwoRWYufIN5SvyRGWwSDfRjH2EiBUpegful5aRGeyyAG+k0 M6u0O9f6DenBPGq5gr02q9FrZPKJ6x41GnZW7L9ayUIrCTLmcwCD5Ma+XXUq/oIbEV/y pP2j8SqZCwNbT5pqv2cqRH3KI/Xx+yn54Q7PFXNuyAGx6vhtiO/aQ0Qw8TSz3LxD8Eb6 qPhEHaPkDUq/ue7g5ozmbVlhgvJE0HpSiSm5vaW1uQFM93oO0bUw3vo41k3FbjZFsAd/ IqKA== 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=CAEXP12Ym6yqcyM7RgW9C3obmN7qM3N10Migac7BDbE=; b=NWlBieWZKW5BjBtSijHQMf2tMIBj7EJFeRPZgwUSHXRUQHYl2+lJ+ljJR0L4n3eCyg yG94o5u36/+jcBNgFLbP7Qce8Z3DQ/58/VBkIiOgULJUgA+paO3AFawtOnOiSXyUA+K/ VLJUVSwttJnm7VVf+FeltYEjxpIp/TqqyUeQRYp2ORrSBxgqe98LrBHRmAdqlP3vUsHI xewaLtwR5CTI/u6nGdlKSU2GRaF7n71LCBQu4Zry3PjrRSFQ+86xBAsVftx7zZtWOZsr QmAzSKU/gEJylOhXniSjxNk4J5Nm+wlImzxkFH+fBgRogje3Wp2+lAPlwqUXW+E0tDz4 gpDA== 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=CAEXP12Ym6yqcyM7RgW9C3obmN7qM3N10Migac7BDbE=; b=b1HtuhOzAqmFogGV5Bg6dF6xMIzGZ8lXT308565WFBwjtNXrEpqiZ96YvdBOhtGSu5 wqh3EVLtBzzACxEewL4zQ5rdG6m+MA1oM0QiLtbV61FWSHn6mbnP1XvBcMqT98YSamNi 6lNKUanQzHPg6HckEfJY4AFOt4ecxwz/rZntshSTdyP4pe6QDjAdzKbo1nYHslWS/g9v 58JFA8A+jwsWjgo5CNnTpksG/kxyJgIz5X1m0K4ns++pixvGZ9f5yVjhumX5dtBJXthA JbZbrDzvaCenmsBstBC2dcziHb9sos37s9OyD5boae/BLxijzNn/Cj7YRFxxQCTdvDEO VgWA== 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=CAEXP12Ym6yqcyM7RgW9C3obmN7qM3N10Migac7BDbE=; b=R8Il5d9Tc8EpdMEmI7U6ZdAeiRGA5/yXgb7ppytUV93ucniz330fecXUcR7VqlsqT0 2pRt7f0yJFMIpGFxjWng4d3BEdH2Y8LA9YFpe9yhsFFSXBQPGkoatciKKD2mmzQXX3cn +srD9n0/ywqaPegDHRxd3Vxs9UApGpHMtNRhySqN5vHQR2fMll0+PvLqKsnKwgmVdexK Yp6HiA51ijJ2g7en5OPHP8c/5RSzqdIbMv6p4Gmqziyhcx+seztu0VD03jvWUCW0tCqM acOSLLm2xHzbKEqfcjI+QjneLvwWLIGLhui5itm0zMHWNV8ScHOIer5pZZqGBUW9Q655 eUqw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Y5CzJpASz/Cy249Bp1n40WyOKdDI2gSoSNw1rlKno2QOfLwgg asFWipmygqf/4ra0vxtAXw0= X-Google-Smtp-Source: ABdhPJyhaBlBnGvK4esfR1kHYPGDtW6aeqPet1PO0L/3FOYBVYqQs9ll0ncjvnRpMYRkazZhc1kJdg== X-Received: by 2002:a19:e00a:: with SMTP id x10mr328870lfg.603.1601446072660; Tue, 29 Sep 2020 23:07:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:7e02:: with SMTP id z2ls121103ljc.2.gmail; Tue, 29 Sep 2020 23:07:51 -0700 (PDT) X-Received: by 2002:a2e:9b51:: with SMTP id o17mr405333ljj.141.1601446071638; Tue, 29 Sep 2020 23:07:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446071; cv=none; d=google.com; s=arc-20160816; b=cV749Gz42S3Ao7Zs7iuB5hOi5SY/vFqYsEQ16/nn7mXEzPJGmAvsTKqcoDTIPU8U2H skDjnEm7OWBUY9rM7WaXgWt4MTMl7ggRpOVEeQAKIvTJGPJkIIV+V6mWSiQAbdI1YQY/ ymtQUPEvA+4x0StNkODdZotojHUbC8GdrRpmazYifOo3cRpmyqnOb36f/sKedvMgcXcl 1r9LHDyE+dqWgAVt53cGnfsLOe66cscIa9MLWlpzXehBpU+hZwwuNYSX31c6HPn9pemo hrTz6P2MR1MDus+AjOi38SJ+/UDU1BKCK/NccLHw9q7uFOr8FFpJUaZGUb/Om34p9jKW Hc1g== 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=bjyc/AnITYqgbyEIv4gnVUjhB+RwoaQ68TQ1OhRyz+c=; b=Op4eGTAu7Mtlu2vR1fwkBY3kLJ9bVb7gD/0f/WVW67oe7LPZGrTO+iwOyBkql5sJ8H WmmCtvq3jS+nPbG8C3vE53/KbAryxGpFSiu+kvTlwlIeXRvdIFAKPdRj7vq7lGfE4lzW 48WhQ/UBHIqML7qbdEygP+84boaRUsfzvTXNciY5yu6LLcQRDbFc06rFZk67HtmvQYWV Zxy57xNdocI7Lml8W6jppsL/g0PIStl+UiVxwUO3TIYvGbbLKWeQpu7OpuViBe3ZfVlu dRzLRiPtx7l3gwdSYTU3JcxUpg94wLr9+rsPdizV3xRiqgId/Ha53zNAeoEJgJslXGB1 MsTw== 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 q20si14430lji.2.2020.09.29.23.07.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:07:51 -0700 (PDT) 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: oVxLdTbpstq6EwPofuAosMgzSmK/LxGxjOYVqOJO2jtfhl7QrwfBvw/LPofwNI/fC4/9axgqK9 PL6ZC1LMvYR6A1zeXcLQHgCRTXJ0gaEb0ozChbAhXa2wgz5HPF/rv6wDcifAoKkEpuo/a7yWRL uqafm9bYVpOvtSEj2AfEukGnJLD86IXH0kQ7JKehyFWIz/UWxbpxA4ZPkxnVsV+9Cf6F1XRrXZ NR/SI6UmFjiThoxl3UM4GaeLC0wPBnWEWG50xyseCUnZqyVjajr9gW8q8kIRJcqgJBmzii051P NVs= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53547886" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:07:50 -0800 IronPort-SDR: Fr4g5AW1GG/B+sqQBbCCQqZLIO3nYb+MpE8LUOLvyO35c5+OtLmx4/UXNTs8+xlUpSlfSYNcqX 0dfbPsD4At07ioXfnTsTiguuD4oROt3TJ0Y+kfKHM44R+G40oq8J4hvXJDcqIeT80we1jgkau6 vkQ4f/j1rAqlipZp0/xUv7/Ms5wDoDbfceocoMWbZs/pRCakAcq2hktrsWsWSDpst43R71erCc buorqN4Kf+2YGSYC/uh/OtPJP7K+CR4Uljjblf8dF0Q3bb1jRR7xKLF9JxT1WT95EncknnOSSH j7k= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 08/13] repository: Add a sanity test to check missing sources Date: Wed, 30 Sep 2020 11:37:02 +0530 Message-ID: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060259.12422-4-Vijaikumar_Kanagarajan@mentor.com> <20200930060707.12785-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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?1679237917645911672?= X-GMAIL-MSGID: =?utf-8?q?1679237917645911672?= Add a sanity test routine to test if sources for all packages are present in the repo. Signed-off-by: Vijai Kumar K --- meta/classes/repository.bbclass | 10 ++++++++++ meta/recipes-devtools/base-apt/base-apt.bb | 2 ++ 2 files changed, 12 insertions(+) diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index c70138f..7b6e47b 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -96,3 +96,13 @@ repo_contains_package() { # no return 2 } + +repo_sanity_test() { + local dir="$1" + local dbdir="$2" + local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" + if [ -n "${output}" ]; then + bbwarn "One or more sources are missing in base-apt" + bbwarn "${output}" + fi +} diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index da3e32e..8940ae8 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -66,6 +66,8 @@ repo() { fi populate_base_apt + repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ + "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" } python do_cache() { From patchwork Tue Sep 29 22:18:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 104 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4816877ooj; Tue, 29 Sep 2020 23:23:04 -0700 (PDT) X-Received: by 2002:a19:905:: with SMTP id 5mr278839lfj.497.1601446743370; Tue, 29 Sep 2020 23:19:03 -0700 (PDT) X-Received: by 2002:a19:905:: with SMTP id 5mr278796lfj.497.1601446742057; Tue, 29 Sep 2020 23:19:02 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446742; cv=pass; d=google.com; s=arc-20160816; b=hPSNhnEj70ejes6CWiOZgo5QC7vzcPNr5vD7bGKkPJ48ZQWDhKeA2GLFKQfC7zTfTF iB1nd4BAEXzlEO1cJzFaBt3MFn5J4jBaCrdghkCiZ8amCJigsdX7rP3Olb5j+4pW5dHe RZHpA5Y8jTNWPhA7TR5QtbeYbV8Mu8HLyOW2wP3rL1NwDkD7mCINfoJsK+uLy2/G0j+4 mw3jiLRRz2b80KdOrNg31eYJEPU2hfHFvKc6UsVSCMRVP3cb0W6covFzMczi52GP8Nuw Jpk10SDimy/fALmf8v5UZAHQVPGS4oGOPs2l9Xa7ZId0iHga+1bfL+nee87nhtcQJCb8 WxPQ== 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=/W2pN6jp+XjlGaj4RqH88NZdJt6z1Xz+zgMBgU67CfE=; b=lrmOnQRg6LokG3aZxMHZpcygPhKql/EJtFp20mm/vVvuTLdDcq7zgM2F/2AABJwjVK 1g4UEcU5/JjLvdUKSqJmUGztwMJ1OUtCvmpQ0FY3dL6vTtmdqLRe8NgubUfz0mVGbah7 gdiEUesnhPWTLM5y5UaXDebWriQwk+rUKRuT6JsyrSyZBqOPCLMt+FIx2dLuNUXapWT2 qxmYYe5X1OQpq+0rGDT+IRuR/42Fu3lQOF20cRPqkJ6/9fQAwgE1P8qZ91WRlHx09uN1 rIohzFMt6geD8Q9w9ozSJnWHR2YlprUQg3qBwPsVXx6zVtTxIwgY5uU2zKZhmFcExWWD 7GLQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=Tw7Ru5hC; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvog2d5qkgqertz2g4i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBVOG2D5QKGQERTZ2G4I@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 p14sor140795lfa.13.2020.09.29.23.19.01 (Google Transport Security); Tue, 29 Sep 2020 23:19:02 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvog2d5qkgqertz2g4i@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=Tw7Ru5hC; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbvog2d5qkgqertz2g4i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBVOG2D5QKGQERTZ2G4I@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446741; cv=pass; d=google.com; s=arc-20160816; b=SIdCv6caxfg60abr7pqizxMzYNb8ayJdDLZ5arWpg/mEOjx1pItXQFmucKOIKvpJre bXyCYfd/ChUhA5iG0BVluOtNVdRKmUVY/HPrkSRgNXaHms4b6bAC+6Uhmwudg4kTyoM7 S0fy5hfL1CgD6Ac3OyrJb/862f5Q5kPWNKAYCUhaGRLeIepXxQFLor/LUO9YacN3wsbt wZjEf38tvCDl2jQXlkbGe2sB3dZf2L8iPc/Vy+9KeNrsKmTiorTqvl0DEHV21EDYAnW8 nzzr0gPa592JYGesdUCL5F/BmFNt+biWW8pqMW3fcEuM8/cdeNP3o0+yShaCx5fPGVzc goPw== 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=/W2pN6jp+XjlGaj4RqH88NZdJt6z1Xz+zgMBgU67CfE=; b=J8SEnZt8bNeV3NLSIv+MOIf0Kiq2kBvBBh9z7K5h0ba5TgQu3/CUdNBXxNXDC1nF3t nAyzZVAKC3GKEK3t/SVIejGDFs/d15077E0nt2vxGFSum1Fn+qfIRl149wb77ExH1hVX WBzn1yQcpzXO17y/WLe+7ut5oMWoLcsGemxIGnv+yqp3byGa480IqrtzKsmLV2OQsPlx Mncga271qVNkNPhbYHDo1GMGcqUTCJQqetWU0x5CGY93aSXSn13DXYGDAAQ5SXNugJsm gIQ0X4kNLAHmD3pSFwwQzI9NfsY7fx4xm7JpkG+1/rYRwxA1gFouXYo/DbXO1z7eCObp blvw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 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=/W2pN6jp+XjlGaj4RqH88NZdJt6z1Xz+zgMBgU67CfE=; b=Tw7Ru5hClYjVPUidow1cgZh0Klitu+UMS97SvYTxFBGfoJwwA5QQlUhf3J4+o1gNxp XrHQ3V3PAtb5ZWY6sroVbVufbccWPU2Aijz9Uu4unFUqRTG0X1O55WSbSPgL8UybHhnm K5bUEdNjixANddwDE7V0sXRzTXttQTZetPafFNCf0gZTi7/mfJcws6HQVB7IK5eFjQ7k jcRjIsnZI14Jb3Xq5/MQo5yOXlMuVZZFJgt1lyzVJHi9FaNFWcEC3dFAzTP9q/rGzfWY GC7VQh1mxSFc3lbmAwPWKdiCi5knfnPdOCAxTvhHhI4J3lqGAstFRRX/ZQlI3F1GfkLf w00g== 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=/W2pN6jp+XjlGaj4RqH88NZdJt6z1Xz+zgMBgU67CfE=; b=Jw+tTQ2ixd5oGZoyDAoyzr51GWqtCKODG6ssnz8hnE625x9kf2mtAFUMrpzxnCHBNi 5fyGPOcpihLPVrYhe8kuwHPKxx0+WcxXlS7FQifZ2PZaeLFrTpwGeiKQLms/fvh3IUQ/ xyk9RBsKS7q5s4A6EHnOlqT9dSgYM7hOuojB5MeGRDtxFYUEAdwhQvwvPMK0EVK3ZClv tPhNiUsRi8jbD5kcwaEDUjeaICj9CKTex6idtZxzAOg/v6QNoWnOCHPio9ir4JkuEqZx xsen7Izp5A9pSdsmxONi/ID6R36D5ZGmh6KFF2/5dJgV9taSB4xv7tFEasgOr/iBspJ1 yapA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530QExAFrEJnPNPXT0fRnI22TtjAbaUyx//sN6yk7c6S9txaoSGP AubyxJLr3WHCFLbirHyZQeg= X-Google-Smtp-Source: ABdhPJwHfH4sJfk46e3clZ6149E19uFknXTsmyxb4VXLo1Q9sJKmVh7DyLOqSHikdoSzXGnn0zICWw== X-Received: by 2002:ac2:52ab:: with SMTP id r11mr360743lfm.118.1601446741644; Tue, 29 Sep 2020 23:19:01 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:c7c8:: with SMTP id x191ls493671lff.0.gmail; Tue, 29 Sep 2020 23:19:00 -0700 (PDT) X-Received: by 2002:ac2:5de3:: with SMTP id z3mr345492lfq.327.1601446740369; Tue, 29 Sep 2020 23:19:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446740; cv=none; d=google.com; s=arc-20160816; b=qsrCc2VTQYyrp/Q9M4byixt56foE8X96GXM2rd2exsJimmUAcJOapc5FG0ay2SyFiN mQ1T2TJSy3SkeXV0uLxnTCy1QbbZrNXD1gz1JnuU+wnzsu4h4XWcPAO5xiHemAlkei7n DiPt+l8mcE/7VTIk21yIUMObbuRiYRM5+U8QLwkjMlSfI6J1MUWbIZXr2A0sJdgz18rd YNSHAEZz8esh9ZB0xa2pZH1TA7IUEq5sZekncYAcKSkKmMlNZk8PGVSp63KIjbPpX+Z2 uMz0nu0/vWolBtZAywphbJ3wPBqn6VMH0YQ2iI1OC7bhTXpvvdt8M9/2qNa5lS1q1WVQ 1GPw== 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=WplXIXQFwUYXdKlr0gKnhR+7rW2TCZ95LWfeYAz8gHc=; b=S1/gHi/1dkbwdSievaAwQQX4OGJ4Y6OX85RQvhTbtMUI94O7R4M+/pA9l9/Xeyinbs hWM2jmuaQCVk783s46RRpVgz0bIiutA/U/KBhcfze+r3wWRJFmtGSFRlCNBB5qA7GCSe AKGNCAPaPc6LsOGtXVMlOynjihkjecsnPYGboFYsIPIMrqqsVyQ6WKAVOd6bs4e09Mph 2HfjWGO0jgwrt2s5PsUH/WdiZ5eQMJD+5DAkUQcyNNtTa35fXlMh7Bbxrh3Zzs4B/ha5 M3b1Jz2JzrYOSOUsW7rDOu8CweXS1vZIDJaOPk+lkSzpm2sLSRPhnSqvWGion+0wUylA 6TVg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa3.mentor.iphmx.com (esa3.mentor.iphmx.com. [68.232.137.180]) by gmr-mx.google.com with ESMTPS id r13si14487ljm.3.2020.09.29.23.18.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:19:00 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.180 as permitted sender) client-ip=68.232.137.180; IronPort-SDR: 5BJWP0A34vNcX+NE/3UI4XO5IOaGuqM6FNuRHLMcI8pM8+jNy5DvO/a7upL4us0QqJ/dtLGi9A jkuqji3IvdTPxUxD97TPaWD5zpKurMbk2WueKiKTw2jBBehWX/bmWuh9IA0JIpIqQbaSJy/gmX 2jEZDPMbUboi/r+0Fs2aiQQTP5wNmrLWHhj2oubBs6RYWAndoyaTfFWPnX3wnB2vhh3i4ikqnJ 2OJnzf4aK5rMT2XGC7Zon9hWNkhNeqoBXWXX2d4KlG/7iXMq3zyobQZnZHA7CYBlowY1SerYAd vWc= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53398670" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa3.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:18:58 -0800 IronPort-SDR: O0afbweHa42n6ThD1yMxsDtBVraeWKRVC8ghA4w1qYn8VIkTogYF5LgnmljhvgeeXB+WLhEQ/O E67w2sQ/H0RbjTM8f5bjocJzZxjSCNuiVZrQ5xEjp/cYtexZc61zF9Hjjz4Z7gOLsa0nHSVqX2 QkjbMNUvKy9B44tpem+qF+licoMgCVLV2ff2sqqxdkm84iEkWcxXL7vtoSsXhYVFjVfFOUU/+s SrwDQHH0MFUtBQBaRV45M5+xMFtQFBlhThajWAZFxjJ3Kcqhcxr48o5pcR4zSl3iVy6Whf4PiR Exg= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 09/13] base-apt: Introduce BASE_REPO_FEATURES Date: Wed, 30 Sep 2020 11:48:29 +0530 Message-ID: <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060707.12785-5-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.180 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?1679238619125688963?= X-GMAIL-MSGID: =?utf-8?q?1679238619125688963?= Eventhough we are collecting the debsrcs as part of postprocess, it could not be considered a ROOTFS_FEATURE, instead a base-apt one. Introduce BASE_REPO_FEATURES, to provide user with control to enable or disable cache-deb-src. Disabled by default, since it is not required for normal offline build to work. Signed-off-by: Vijai Kumar K --- meta-isar/conf/local.conf.sample | 4 ++++ meta/classes/image.bbclass | 4 +++- meta/classes/repository.bbclass | 9 +++++---- meta/classes/rootfs.bbclass | 1 - meta/recipes-devtools/base-apt/base-apt.bb | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 07a7781..ec0a384 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -181,6 +181,10 @@ ISAR_CROSS_COMPILE ?= "0" # NOTE: this works for amd64 and arm64 targets so far #ISAR_ENABLE_COMPAT_ARCH ?= "1" +# Uncomment this to enable caching of all source packages. +# Without this feature, only sources of packages downloaded with apt:// are downloaded. +#BASE_REPO_FEATURES ?= "cache-deb-src" + # # Uncomment this to enable use of cached base repository #ISAR_USE_CACHED_BASE_REPO ?= "1" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6ca5759..5c2c88c 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -63,10 +63,12 @@ image_do_mounts() { } ROOTFSDIR = "${IMAGE_ROOTFS}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest cach-deb-src" +ROOTFS_FEATURES += "clean-package-cache generate-manifest" ROOTFS_PACKAGES += "${IMAGE_PREINSTALL} ${IMAGE_INSTALL}" ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" +ROOTFS_POSTPROCESS_COMMAND_prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " + inherit rootfs inherit image-sdk-extension inherit image-tools-extension diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 7b6e47b..1f475dc 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -100,9 +100,10 @@ repo_contains_package() { repo_sanity_test() { local dir="$1" local dbdir="$2" - local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" - if [ -n "${output}" ]; then - bbwarn "One or more sources are missing in base-apt" - bbwarn "${output}" + if [ "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'yes', 'no', d)}" = "yes" ];then + local output="$( reprepro -s -b "${dir}" --dbdir "${dbdir}" sourcemissing )" + if [ -n "${output}" ]; then + bbfatal "One or more sources are missing in repo. ${output}" + fi fi } diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index cfabeae..0aa5502 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -185,7 +185,6 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)}" cache_deb_src() { rootfs_install_resolvconf deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb index 8940ae8..506a28f 100644 --- a/meta/recipes-devtools/base-apt/base-apt.bb +++ b/meta/recipes-devtools/base-apt/base-apt.bb @@ -10,6 +10,7 @@ SRC_URI = "file://distributions.in" BASE_REPO_KEY ?= "" KEYFILES ?= "" +BASE_REPO_FEATURES ?= "" populate_base_apt() { find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do From patchwork Tue Sep 29 22:18:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 101 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4814914ooj; Tue, 29 Sep 2020 23:19:07 -0700 (PDT) X-Received: by 2002:a4a:344b:: with SMTP id n11mr817430oof.89.1601446747614; Tue, 29 Sep 2020 23:19:07 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446747; cv=pass; d=google.com; s=arc-20160816; b=i2+ftbO20lUIgyNeAIVcKVkDTe0hxPW9PFCbfsXH7I1svnTnwuCdHMXWmR3uvRrkXO 3JPlZiUz0Mn6HAO5gRYCxWrzfvgDrHIcERic1tgk+y1eMniUQODH6cDHSyyXYlTA2NN6 r/pUe1OrJqDvxFHXTapL6rRkwbuDbn594YgJ1fH4WXwGp/WkMAZuD539trHwqMu0a02q yqGU7siXDVdHH3CJis41z8RU3g3545wcmCJHIL9lf1aYmte8X/wlghcuJf4Ie2W51vCP Jl0SdR8jN2towAlaOBL9Rpz8SrkFbo6zT0lN6VQ1+blMBJZaOLnqfVXngPo+6HbwfzGT LszQ== 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=csRVT+asM0ogsl9GxqT051C7mWTRtfIGWiscHc7Z2AU=; b=p+1tU23I5E1gxEsgQQr2g7e6HL35YopRyRhCiQ6dRPP1M9/trjKr2CMXtBYT8AQOdz UduDC3E+fxdQf+4ytj0HimXOyGaJ8DLt9XO88IFv7dsAEAqsTWF2/GwQVZb19KU/ASM4 umF9JX3jCulZGnQFO9QQ3UWovScx4b9cMKiUaXUdB0zLvoPDPg6Hkx2DiVS5cAW92yBY DyfazxdjkfTrK8O4EW3cRhNsd/qxjkd8sa6cQ0858bBPdoZvamQefmt1QfycU4gMhmat s2xfw7QRy1f91XhopDi92HbXE04tC+in9hVzmrBxCKFr4il3max6I8eikKvm4TVMrrmc 4IcQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ilGnuRh7; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw6g2d5qkgqedvbskyy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBW6G2D5QKGQEDVBSKYY@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 a145sor159459oii.113.2020.09.29.23.19.07 (Google Transport Security); Tue, 29 Sep 2020 23:19:07 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw6g2d5qkgqedvbskyy@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=ilGnuRh7; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbw6g2d5qkgqedvbskyy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBW6G2D5QKGQEDVBSKYY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446747; cv=pass; d=google.com; s=arc-20160816; b=aTwDxEkE7KppxwbKq2QYK16MotBkz3w9r6q2DHGwGIHAuilrqOwsw+AkccWsH5EoOf fjku5M8uDe+ZANunkpUZF0H1bVK3dgMKgvTcO34CYYbZnMzVJzG5dqiSbZdg1ksOm5cy pfBTxOPnGAkFH//K3kLgqubloOVH33Jk9k6kd1U1ljzACcXmWVLIp5NudEOqhw/GwnY+ KojqHZ3qKuO8aI3SCjyImNkur9GCGL50HIF21XvSZO+NAsLG0DZDhQ2OExRNFm2zGbVe CdypQtKuIJAguembVGcq6EseZ3aric7fO0IZN24Y7g5OVR8lp+KoMoyskOY8qNBm3b84 IpTQ== 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=csRVT+asM0ogsl9GxqT051C7mWTRtfIGWiscHc7Z2AU=; b=b02XbgDMSRiWC2E7qMzKEH4FADDSl3+/baEgkZeCt7Jiv9nl5zNm4cFQIuecfHvwa6 BkaI1MEa9JcCx0EwI6Ga9D6SXdtp2ye4ZnYQx+0jgHJmszy7/rquAqtEbOn3ZiHDKB1R Cd2quqiHHEqWJby/lWtR++/e2V38vdxhToy0Z+orwWDvonQRhKiHnnY5B0J068lFtLS3 vbjxXv37v0zFLK85mEvXSfyV9hKingQeFe1V8yYRZsIdMhE/8zA+cRKFFDwXr8TBSdQ/ y68oIZBAKsRgnBSOHhbtT3jwWYkw0WJZIw1oILShRpfieEYsdKAZI9a1lYdSIVbIIBgx qn5w== 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 :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=csRVT+asM0ogsl9GxqT051C7mWTRtfIGWiscHc7Z2AU=; b=ilGnuRh7pj0MJWCpH7A7tIPTsOuqVBIwinCblgnkcWxib6rxkc6tvgTIwvS5uJRMLy NZoGWeSH23AON7/Z/L7Ai2J5IWU35iRHxUf7HNfLxIMmGmqxC4/312ZxnTozKusIIOr4 z8MKMVftFqrf3F1QlArFQoLPOExOmvv0UuTQQ7auGqxnKxkqmtkmCrMvGf+WpXQs7ECa CznC8grQRL9A9+bMdROXF+NkQ0SrviXbPhJT3f3R/vIiqsBckAqrdDbTaCnZDWL6+L1i PL9djaAyUWB2YyfG7Vz1NW4KU8jfxyzgu/FKNUo+oTGWDNGjjhsv8PmRpkzAoU4AduRb MR4A== 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=csRVT+asM0ogsl9GxqT051C7mWTRtfIGWiscHc7Z2AU=; b=NzJy1Q3TV/ZqiNEg8SeM5hzQLwn6QeGz0DkhU6zdpokjg7W4c/lFHIB2DoL3uHadhC HtM3Vg/hnEmkk2H/417ZWN/T91gru5M9J0i2byQzaJq69qyPzj/tgIdhMEjN198tN9vO CoUDDcAcRQaFkeFDi6faNpoONVh741QHK0o4S0M+mTPICl2mFuvaiBpOaGOHHxvLS3vZ 7SsRMNCZ1FP3UKU+X0mDUgbWDDfF7KhT1bZvjxQvkLttol+t+0BCgKMaShM4AfnJfrVW zYqqOUYpHa99rUBwGzbVDswTpM4k6JBBLn5E0akkPHqyhZ9j84+4di4ZOtqV9VOh/64P RFYA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530XiUVdqM3m7leo9i4u64oXEuy9EEUA8vkePgmIN4ovOGJo86gX k1tHquyjbptY6DoQWTyEFfo= X-Google-Smtp-Source: ABdhPJyRhR2h3TvarHNHo+1iWJxnfZFm+tN8951p2qSbpvaCMbRtta4gnmh35Wzpt1l0/k1w3IlOFQ== X-Received: by 2002:a05:6808:346:: with SMTP id j6mr646443oie.8.1601446747281; Tue, 29 Sep 2020 23:19:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a9d:3e85:: with SMTP id b5ls214351otc.1.gmail; Tue, 29 Sep 2020 23:19:06 -0700 (PDT) X-Received: by 2002:a05:6830:185:: with SMTP id q5mr603333ota.183.1601446746881; Tue, 29 Sep 2020 23:19:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446746; cv=none; d=google.com; s=arc-20160816; b=kNUSIWbqLJmwHU5/LIE5xyagkzM6gw+qttYdWwkdJCGKAXo6rHj/MRj3baB0oxw4Wo LRB/cQha7W2dodyUpxJ39wqVdWkqqhYuNdzT6wTrnbFIuBYf5krpLNOPPZyah2ez9Qgg ItyqICucft3KaMnIayrL1CvMH6fOCvUNwbF/jDSUEqvn9Y06StHYIpzyf+/ewmIvDypS A6qUJ41O7H6LAIt9LpusnOtSNHi/jq5lRxeFLFt3KjNXS5FRuuh6rajuG5oFVoEra7Wn 5d19JwXf7Qd0RKzMwjm7XOhX32C2Hp6nkMsbOSdTvNmvs7jVdR0u93pniAZTWtEGl7FV PBPw== 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=ygJmvu8BjMibbHoDS8dL8cyQA9VMFh6DDcUBM1cYV+8=; b=tuq6HE0vT7JtH8f1QMH1La8lMywqgmwDsl4gR9VRf/Q22d3TS/xwRGDVjS3hWSUALe N3siW8OrKSBbDcKCWkWt0e4K7qRB/vI3PexWr6QfUwiJ0BiO94et0gmiKPq9zhP7m4KU dPLH20dDoQhBNv1/8/PXNHYpLrzkNWupdyM4SM0W1a1vfV515a9Y4P5DscBa0GDRDPfK He7tVJFK1b64N/L8zAM9AmFZt05rDuFJMulPpKivPhR6Penh9KXQS+0fbh4hniLxsHWR pxTe1ZkAIpVJItaAgYD54uCbn3WvhJC48+Anxz7NEQKQ2efbNQGD16vGwW2Pd5YS3GEw cqCQ== 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 i66si39285oih.4.2020.09.29.23.19.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:19:06 -0700 (PDT) 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: kd1auZpeuMtHB0NuqyDtq3TN5934qHy308T4huKajh67vslTpCqIjNUMAmQP+Ko4urQcuG53HB 48liwwesWF2mcn+antw1IZurRKh+P5hKbuZ5Xmn0BtugYsW2ddiW4Jd0bU5A3UrRSJPORQzsuj JD41OhM2zVMHMfOerVsXKQlOWF1zWiLQ7eOdNILGsNX8UuBN5Yhcmnt17t9zbfciaZVLD5SdM8 jtJ9uQDt0bItSfQMrF0j2YLiaJFHYd62CQFC3IgF13DkQpRvnVLg25s4MJwDKJP/cLvoGCKfVq etE= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53462559" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:19:05 -0800 IronPort-SDR: bNoIwRNCqUNQ4RCSXK681CyOCJwXH5It8a6f7EWkehdJmWjd74zoSgOJibJQVt2r500/J9WeFi osLoaKrLroTEAXaj3T2JyMxhtOAuRD1P5QunVf/f9iCnm3YDq3srwVWZw1gr9r14SdQKminJE/ p4ydjiHRnlNuTi7Nl9ZT9JHvnGD+HW6NFAXAbkg6wyypmcl5MUucgwXXtJPhsowZeh0PF/cjXz iPM7pJgrw/+yH/ZZUn14zAMe9yfydxOFPzZD73KIHl4v3glVt72w30LTGO5nfIIZlSYKp6PLTY JSc= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 10/13] repository: Fix failures due to missing section Date: Wed, 30 Sep 2020 11:48:30 +0530 Message-ID: <20200930061833.13347-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> <20200930061833.13347-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.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?1679238624638412500?= X-GMAIL-MSGID: =?utf-8?q?1679238624638412500?= reprepro's includedsc failed for certain packages like makedev while complaining about missing Section information. This information is optional according to Debian[1]. Use a dummy value to avoid such failures. [1] https://wiki.debian.org/DebianRepository/Format Signed-off-by: Vijai Kumar K --- meta/classes/repository.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass index 1f475dc..ac395db 100644 --- a/meta/classes/repository.bbclass +++ b/meta/classes/repository.bbclass @@ -42,7 +42,7 @@ repo_add_srcpackage() { if [ -n "${GNUPGHOME}" ]; then export GNUPGHOME="${GNUPGHOME}" fi - reprepro -b "${dir}" --dbdir "${dbdir}" -C main -P source \ + reprepro -b "${dir}" --dbdir "${dbdir}" -C main -S - -P source \ includedsc "${codename}" \ "$@" } From patchwork Tue Sep 29 22:18:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 102 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4814983ooj; Tue, 29 Sep 2020 23:19:18 -0700 (PDT) X-Received: by 2002:a63:fc63:: with SMTP id r35mr974770pgk.156.1601446758027; Tue, 29 Sep 2020 23:19:18 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446758; cv=pass; d=google.com; s=arc-20160816; b=njI+EVH5V3gbtwzlQ7JWXQHN8R20cXiLqftKRLOaVrZp8LrJu3OqPXS8nfXCx/UQs6 xYt1CTkGJrULIt/85qXhmLdWEHJ56ucQwmjVXR32v7aLqwVB17n8o+LfLqhQEZB0znla J6q2hDQaV84i6TcAEga3id8iGe9r8QOrNxR26NopLCKanBPrbYKT63NF4HzSqsAzUwrg EXPVjyeFbgnki2v4oXZSUT7JvyluX3/3l0oPyzYMCMM56uXy5Nh9lgPfKO7UcB9E3IKf 1iZM7zSx/Q/lxQwkIXrCEmSto5Fcz+ySIuu9simPdjb5JmLmH/rjnQ03v2zB7wRio8H6 vukQ== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=AiWhr/qfUYBvxkvgYHtGuEXgpcYJN1y4I+P/mcYdIbxWchnmqupdTKq7JlMWph7T7v kUvvFMXQcZY6Hyndp3Cclk7ZGIkEbfcVHeF/6DRWXchdZ05AveSkRs/qLxTsCWERD/23 hR4RSA2Ct3ZfQftbnXJS4TjKhwF7yykLIydut4LsYFB/rs6g0vipyabYpkx4243wFNhn lgBCqcfQVMt7JDyCtUNWzIokdWVTdvdzuOu4vRwIWR8G8igrt+j11Qrw84AHM0xg0MuU zApbrkL0MBCnoGPqFG0pw6Vx2Y725t8OaNlYfAV4aEmsYbfTNagvIAO2JmDTjJmkqsR+ i3tg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="c/BBauTu"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZOG2D5QKGQE2H4CGDY@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 l2sor338153pgl.84.2020.09.29.23.19.17 (Google Transport Security); Tue, 29 Sep 2020 23:19:18 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@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="c/BBauTu"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbzog2d5qkgqe2h4cgdy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBZOG2D5QKGQE2H4CGDY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446757; cv=pass; d=google.com; s=arc-20160816; b=o8UI4bMcjTkGCoel+V8Hy7ZCW3fqWnyvbooS5orQ09d9O2UNz+Z2r69FespTsZ2Q0Z CDMk0YGsCqodVJgWTKVKWJO6glFpONTd8Yl6zZkatN8p7NTznpbTzczvixDnF+fkAkqQ 7va1G041hLq7uU1ohO8nsx5II2S9TkGXGBXDMXHhvRdfQAiNJUsRg1Ib5T9NxsRPfbjv wd19ODeXSBY4ZKiWVkj/FtjXFHapTNioSBk87+lXIU3rZhd2dN1fh3Hy0wu/rP2FYO5g JoQ1cMtxIhOrrSUn6Gu93wB1nwgNgEC7dhRRk8mboj+VSv12aQmWGGrP2/RyQ/kgkVc8 1LOQ== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=uqMwhQehqmRjW+YNlHfeqfL3eFt+7rIlsNzn1SNVtcnEDFwg0+YKOfGaHuvR1AyvQz 5d5rUvAb2JrUITCmdJ5rnD/LSfiooC0oqb679COdx6eRRX/RWiJzgPQGfTRWSyLdRM32 8M4QXPuhyyKSFUQR8gWwy0kQrR3Ff0Y3gAONPhSsyWodUVPTo9eyY8G3Kvp7lBcUTgAz R2QeA3tuLo9d7jXZPwvI5WlIRmPFRkfp52L1ETFLSav+rjbaeb0PQKQ+50OWBOFE/lsr Fi3vUzNYxQ+/1EH1ZzaewsHcHnPwyTElSZWiaTIlys3vFN9uM+WabwQQh+N9Nhx877R+ xzOg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=c/BBauTugPj+tB6VjhEoX7aG9hJ7hN01LCMYEmzP3EvcvmieghM1ZaDNBNTHF7vqS/ X8/YrHsX/6kcCCpNOOH3/Z76DNxWKYrXN88OHWfADDTlMj7sbOLZ/pex6HxpTVvbFtPG zE+8s76Bzh1O4lQndPSVPn67YPqHhNnLsAW5Lpd7RHVOYGEsQDBYVm0eZWDL++g9nmbd rxJcUceHyY43diKSOmBrpOGdlyVpnYhCkVQVkRu4mQSLEV1J8Ph7YyyRBpOQ0nMBbArN 9H1Ld91hwRdn/R0V+RcquaRKJdBU3ccpMC7dTnlUTcA/fmr6VeoVNHZZZEMUJNwg9e+B nBxA== 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=meN8Vjuwuuq3EVcBsbT/7rnCVnr9nCwlQpPoTDHEGIU=; b=h1B5v/qBtpIccQ98X2qNhbzF9YFGdOGbZAIGSVOtIepi+zgCbAV+KAeo/HlnsrYGsQ ityi5/JQHo2V4kMiEg5klkP6RcBEy8DmvNCvYs9Mak4C8Gh31dnZGXpNj7E0Iy0vEwcQ yopedvAfN+IxtE5vu/gooivkRNuDHqbMbccpKTYBLd47zTFalmYIZCHObg44Bu43OyQN SfQO7IkB5GAXM73PdFC3vffdF8jfjbpeJ2i/bNcGj/HVY2u/oxy8sRe8oS7wtzq5PX/8 eEN0EYWMvHpVdBMQ/581FVVWe/f5cMxS/X0I1f3Ac+hCK3VPLFBHWpxscAMAKOi4vS2z 3DvQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5331Ij1idrymGM3zkTskqu1qwoPWI5g1XpMVUb3caNBanHb7zxkM ZrXZ+YI5BYqhx27Inj6n2as= X-Google-Smtp-Source: ABdhPJw04B+GE9JfSvF+gtAC7Zw+kmDnp6bJSOL1wC+7TFr4lN5KMZOrRvMTajmBL7QB3WykpzR9mw== X-Received: by 2002:a63:1b44:: with SMTP id b4mr952152pgm.175.1601446757603; Tue, 29 Sep 2020 23:19:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:3855:: with SMTP id f82ls417579pfa.10.gmail; Tue, 29 Sep 2020 23:19:17 -0700 (PDT) X-Received: by 2002:a63:c00d:: with SMTP id h13mr997959pgg.358.1601446756944; Tue, 29 Sep 2020 23:19:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446756; cv=none; d=google.com; s=arc-20160816; b=M7rHc9f+pdSy3ociumb71T4fth/QqIw1+IiBYkZDuAHMv5c9ihUMSHbmDxyo+VVItx oMogPjCUl5nvgrxr8Hlhg+44T36G//YT/kAsoFzgchdBVP6eXvxo9K0/LCA11K7tU+Ng vkpbUK8gnd1y+/RW7IPxcDbrqewxk1RFUsdI/CIRYj0DHphVCqW4oxGjFjdMOMEsFrD4 3dSCDIJYnVYYRN7d0kTGU18IFICKYAwtuBZPPYsvAmK5b4GnUFMdMtOMNA66e5HjpTaW amPxtesT400HeDXT0Zgv7wiTDRmoziv5KRY0CBBaoEi1ixAgjbNrgJMDCvugmhNzSxa2 ZDdg== 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=m56Ql/yoYpxgzaP8G+s9k7Tl2aypB9c8UmAgAfs7OO4=; b=ruGA2lxjpx0PjwK9JMWjhOPd4lpZG8pSZOfs9VyNLTN1vLBaU4FfgPeXL27eqew+8X 15IaSeKLGE1G8wJ/Qn6N1VLDDRtgtOYPerCj5hw/STzcDHws6omeRAwp11QDBtsgHlHD 5iDtkpiuVq+HYdKWPUj7DcQ7N2OuZbvj+mHN+eJjwC9lz11orl93TPB419WEWZQ3w//K dgjGD0+sbed7O8xkBYOvNwn6SuRNiiPUwrD5+vLselyu5Wdoz4kveDT1s2wEVfhfsNGD VV3jiaGzdBvadgNX4+nLH6evYUZcCUpASLwygxEgFWwvlusJSI/65C4Ac4Dw8rbdAaTa UbAw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com. [68.232.129.153]) by gmr-mx.google.com with ESMTPS id 18si44564plg.4.2020.09.29.23.19.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:19:16 -0700 (PDT) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.129.153 as permitted sender) client-ip=68.232.129.153; IronPort-SDR: Ot/Bws/4jWsKsRFZwxJ+kosX90q0ea9/PiLgbPinMPVX0ORYXlnrnYfq2NdtkP6zuSoSd3ek0w S9JB4OlFuatdg5BQAwgNmEE79t436J4LoHuryng13lSqopcHA3cRJbGz08/YnLo4SobkCl23Sh qQc02wybmK0LjBwUUqV6QWMUrXN2Csj1pA/RWjPsvMLkuua+TQwZqq2NbM+p6+s7xKgaOM9p/3 amjul3xZ2T/B3LNDGAAioT0KmZA4LxenA8qJbg8xK0mbVO7CL02Y1evmeb5jcw+K7QBbr35J0i LUQ= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="55661546" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa1.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:19:15 -0800 IronPort-SDR: ATQBdds8dx5ei9l0ABMhAxCA01J/SMdf4kxnH+Hl6DGqPFfnEhu0h0Sae7tKVOtEiPX5j6V10f HAOvy4mMEvYgQwU1bhfvMmNgG0RBaZmXnN22k2UPDZkkHFDZOGB0KsVnYAR36hh0NUAERGDEyZ +cCDUcGbC+C1Wnnsa6vL9HxxzmKc+GClkkJZsITzQcrPZjH/2cVPq/A3jH3Z3Wps+ZT9gHkXaj 8QtgNxnpOwhcH/5XJnn4Mvd+9CsSz2Auz8rRPBjW4jRM4/ibQ6W1tbSVXvGrNh3PbzRVsB6Olh Bw4= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 12/13] rootfs: Fix possible overwrite of existing resolv.conf Date: Wed, 30 Sep 2020 11:48:32 +0530 Message-ID: <20200930061833.13347-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930061833.13347-1-Vijaikumar_Kanagarajan@mentor.com> References: <20200930060707.12785-5-Vijaikumar_Kanagarajan@mentor.com> <20200930061833.13347-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.129.153 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?1679238635816348395?= X-GMAIL-MSGID: =?utf-8?q?1679238635816348395?= There is a possiblilty that one of the packages installed in the rootfs provides /etc/resolv.conf and we might accidentally remove it. Fix it by taking a backup of any existing resolv conf files and restoring it later. This is needed since we could not effectively move caching before rootfs_install_clean_files since we need the latest dpkg log. Signed-off-by: Vijai Kumar K --- meta/classes/rootfs.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 0aa5502..ed43fb9 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -186,10 +186,18 @@ python do_rootfs_install() { addtask rootfs_install before do_rootfs_postprocess after do_unpack cache_deb_src() { + if [ -e "${ROOTFSDIR}"/etc/resolv.conf ]; then + sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar + fi rootfs_install_resolvconf + deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO} - rootfs_install_clean_files + + sudo rm -f "${ROOTFSDIR}"/etc/resolv.conf + if [ -e "${ROOTFSDIR}"/etc/resolv.conf.isar ]; then + sudo mv "${ROOTFSDIR}"/etc/resolv.conf.isar "${ROOTFSDIR}"/etc/resolv.conf + fi } ROOTFS_POSTPROCESS_COMMAND += "${@bb.utils.contains('ROOTFS_FEATURES', 'clean-package-cache', 'rootfs_postprocess_clean_package_cache', '', d)}" From patchwork Tue Sep 29 22:21:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vijai Kumar K X-Patchwork-Id: 103 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:eb04:0:0:0:0:0 with SMTP id f4csp4816283ooj; Tue, 29 Sep 2020 23:21:47 -0700 (PDT) X-Received: by 2002:a63:f803:: with SMTP id n3mr970467pgh.231.1601446906870; Tue, 29 Sep 2020 23:21:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1601446906; cv=pass; d=google.com; s=arc-20160816; b=z5eY5biN0wLdd0ojLXTD960/6JXBOCz46IkaTPD4ZiBlYn1l4OhW+xlHYum/TorKTW 9M6DfgaVowIDXWEVU3hO5a4lmYs5xSrx50f7piinoZSsJ/9NsxEoCcsCFYDBtQNn4fuN Z3sJTPji9PztGNnEFxAh7X5A/CxNNORa9IVIZd5kEPS3/SlWNrc84p24cA4qXZGSS5Z7 AWzZ/cRM5NcVxqYxnfUiYh4MYKUNk6gOCR3bAtW0ErL6BiujQlzXnsGIsA/oekiFsvje E/5+V0LMEuDrKlOcUeMSJTJUq4e/EGY0BmBRnBO0EPHUitdbgHU5weZXngfz9+BeB84n OuFw== 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=oRatKLh/YNmPhXthXRRp/iZbCvPZOm5ZDvoRxTZ4iIM=; b=j/+QC+LT/yNPAESHYJg2mzDwsMhn11LPGZDUCTkDK//Hd4X2fBtdBcVr7NWWnvCLjV LQeb2Fc2OZR/dHRKs+9y5ogB11WS5FbnXOUFmQwgfcQF2kqd8w8rsnLeTVozLGJsi66P es+xJjeRy0Q4tx9fsGJhbPhL8fZIFguQ+MWYHk4cNVC5ITb/minpkcJh0rge+apBaAnN hDkTT/H8vhXgXH0vmg9hXLblzAB6d+R9x+nHZ5Fx4zDXKdX3/qcJpwB8+e2sYk8DXZTJ 9v3SFpEY47MT5DFd6ZG5W1UYQMixrwgGgFQtPQ1gWTsMm3TLs+qBeVjJaMHDCYHfdo8r DvSg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=ST4O9CyC; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb6wh2d5qkgqesb222zi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB6WH2D5QKGQESB222ZI@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 y187sor462546pfg.79.2020.09.29.23.21.46 (Google Transport Security); Tue, 29 Sep 2020 23:21:46 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb6wh2d5qkgqesb222zi@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=ST4O9CyC; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb6wh2d5qkgqesb222zi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB6WH2D5QKGQESB222ZI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1601446906; cv=pass; d=google.com; s=arc-20160816; b=T7QhsswWxPsxcBUHgpOBGg+SJDa0dbkIQ//puYgFeYaWP7FElJUrwovZxLLNgd5+Zn 80ZIMIENlf6EvDMpKcm5n4v1CrQ1CIG96SD3RE0eFuC2Y61l8q6r5gH0k6yMguB68nEY PZQu3ZiyM9up1+/9V9J2ExGTo8YcVAX7Ee+dI8Sn2bNE59TGWz6sNlaIyT5jkA2TPVTj Qmqzus26U14CARGlSpnQxPFRpDvQUVIuWkG4EWh+mNjmNfqbRYDKTlNp6mMDiJdUa6ol plNb0+1gF2ml43Q6U+5MPfeJqYSej5K8/+S5PHPJYqbsjo3Lswyayx5Z56z06T4qHCxB e0VQ== 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=oRatKLh/YNmPhXthXRRp/iZbCvPZOm5ZDvoRxTZ4iIM=; b=qFt3RM00shmOzsv5qZAl9jRVfg1itplU1gkvDOHqHFUE6fOQCvpLapn19gh19yAvQD CJuDkQ+LjSIKPcEuyflMK4fPnGSJVtyjkvWWbyOjYswxxHnvMHV2AXPLwsWz7EL+GXea XV6hviMMd8hZ5Bb73niGqTfXsjRPnPAuBLUt/QwJXYJ2HTKxNJEvTrfuyJ+aD2eKbzor eOWGvZkNiUiI87kOelIjO2Klmf+e2KCkrkvrDsAvKo+LJuAMW6rWSGfh+zutMZDwh1LH 8Ku4GRG67/GYSG1pOxH6BBLgpqL9tzfLsZOxWQONzJutQP/wDnzw/54S7RFCKe9o4TDb 82ng== 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 :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=oRatKLh/YNmPhXthXRRp/iZbCvPZOm5ZDvoRxTZ4iIM=; b=ST4O9CyCCtcjeKxR7jTtdDLzwHfBNGV+OUtmpCJ7Ejzzha9k3iXp1ttj6ZaJXZ4Ma5 LCvU0XIoU2AbLSoOfgkAWkGx4deR7vg7YgWKUeVYmmNJwnRzWvaSxVc4vtesBxxmDUXb tv+UprzNn1CvG3xHrnj+7KvX3loTzl07ZuWbE2yYLMfE/ccdlU9rn+c+RrgQCgKY/OKq ruo0tmStkPBI/adf0P+BhJJxq2gF0GGmIr2hewxCJnOtkY2DiKOSpUnXodbfhORy885X 0HCILvseY1d4PsF1X1AyG66hiAdl72Exx5KOFfKJPZtU9SCrfnj0d6mS5rSluZ48mADE oQwg== 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=oRatKLh/YNmPhXthXRRp/iZbCvPZOm5ZDvoRxTZ4iIM=; b=loQDIj51ezIFPK1Eo9mNhoYxwyq4P3PqGUaKyCFE0hC/bLOBBzN/943XRh5Jvn3SFP RH9j+JPYJYiLjzYLmlU58XWlqUQMG8Ce4VraTwhJCyXbmlh4spScVqnnStepu/fBlA6P JNahd86OtyqrNW/o/IdewOIOQ5Rj+zxydVso6+fDOOLDrlDitVPMz3Dn311y8OPHmoqj mrPHJfw32ndbF6SYkKqm2W8f/ebmWVk+KC8SujpzYqdondp7SUUG+Jy6d2X6mmUbtd5r QKYtA7adDzaKhEjpV77HkY/M2fLPnw+HOzEhTXw5T5qoEH2dz0GcPmjc9JQe7j7L9gV2 CvDQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530KdWcgU8o8jm2AgQQKlhng2qfiQvaaw6GfdE1iEUhongmGN2lV pvIlyluyj1/4oqQFoeYhbsc= X-Google-Smtp-Source: ABdhPJyabKrOttXl6spKKmKwwGGJuIl4k7L9fW9DMRkDGrfFECX17DAlqBvCdM15STg9Kr7oYt/iSA== X-Received: by 2002:a05:6a00:23cc:b029:142:2501:35cf with SMTP id g12-20020a056a0023ccb0290142250135cfmr1277272pfc.47.1601446906469; Tue, 29 Sep 2020 23:21:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:902:9007:: with SMTP id a7ls473251plp.2.gmail; Tue, 29 Sep 2020 23:21:45 -0700 (PDT) X-Received: by 2002:a17:90a:d304:: with SMTP id p4mr1230285pju.138.1601446905892; Tue, 29 Sep 2020 23:21:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601446905; cv=none; d=google.com; s=arc-20160816; b=aE2zhQTqh7xMASo4BjKsYS+8pG+Jjj/3bNODTAebzThLJn6IlkZ8HzmlB+YpV5qIu+ 6dV0gnP7nWgShKioL23uAw+/VHtW8ynoruzciyqnYUqV6PG67DfGqQFE0cW5nM7/egGE ozq6lLzsQcpUmZ/jML92Ghn0kuWNX39quPHrZ8nkpsJRpPmtJu5CB6JxXKAao7sAorDN TE4M2LYx7QUctykVyE1L4zpQkyGtY9d1ZGppd9OkByxwREX5lsM6hmzmjO5LrOfSkj6a MnUsDHHGgzKaZo3Fjp5YodzMF8y0pngH/0Y6fg1Az8fPVFt1B07CvsTDgMPSsaSjVKXP oQ0w== 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=NnhDJO0PmHi+mL9kXSqbZwEBUP2sDsvykZCqYXQ2yo4=; b=CFii+Dwj5Cbhbs1K9mj2MYSLDzvsVrpYTDz7DZyjA7TuahWGczhrhb0QNiJF0xiU02 SUlmbiiFoHx+ytCNctVrpAdcQ+PNcYcofo8S/K0DxfQdu7Pp++b/CEND47JZctujQiTi ipz2QBX96BUajoYGDMiBPvmAC2kdn6lmZuVRNvE2Toj4+t2QVGmmXI1q/HVvj7vu5uE6 Rkk9e/zbeXi3mNZlcvz+h5tqY87Zn+9goZWbv1npP3cCQ7bZg1xp+13St/yuCaYSSo8H 1wo2ABBnU9jF1PWoHElrE+QhUk8uaweMBsYe0+RKjaJVSJsCW7fjiCPA8GMq7nzA5ul2 81uQ== 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 q125si62046pfc.2.2020.09.29.23.21.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2020 23:21:45 -0700 (PDT) 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: SfxZi4w7VTIke4hjZM6v6PCoONz+k5MLUBumOWQ+vbx1i28ABdpih9z++y1eiEz3HQ1C7wJykk raMtZkbyhUwSCH0CrXpaYUDh8zTpP5sVGhj3zPF56wxhqLFh6JD1ehUHob6nujR81ImGJVndh5 wvVmpMjW5TmhNUC+Wtu//z/DnW6k3n6kctNIIvh9wgpI6s/SoABVLBhOi04veA69qllIS6XTGP T7gKKeS7qFRob+lt6KCIOJowZhjFxY1qF8qxCxeQZWOHfcsAR/PQf7nZ34/Pam914Jz6xJh2pL QJs= X-IronPort-AV: E=Sophos;i="5.77,321,1596528000"; d="scan'208";a="53462619" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 29 Sep 2020 22:21:45 -0800 IronPort-SDR: DhHj2d1t0XyYhJwIQVgM7MZTa1S7EmPN74pl/MncZS89DonhwFpgzY1b+kGPPG0X2KLJJEm7nD 9vfUzbZ/LAMxy1I0rsQrsV6cFEjOqNDW25KyBA7DEuz1XD3ebIjL/t5t31s2/vDf/1K6bHO6gT 5C+QUOMUqVHPfJuSlPH+oG91jeJlaS10posh4xU0UWJ2L+xSn++Tp1q5vy5P5aCGh0R+cTMrkY ps8MMNwh5fTeHKc7Ff6u4egnky8sdMA8XXUuxg0O1sbC72Aq2owePFBVq15ICs6UFmbWFAWLei fBo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v6 13/13] rootfs: Handle failures when postprocess is rerun Date: Wed, 30 Sep 2020 11:51:24 +0530 Message-ID: <20200930062124.13578-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200930061833.13347-4-Vijaikumar_Kanagarajan@mentor.com> References: <20200930061833.13347-4-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-06.mgc.mentorg.com (147.34.90.206) 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?1679238791305853895?= X-GMAIL-MSGID: =?utf-8?q?1679238791305853895?= The apt state information in var/lib/apt/lists is cleared as part of postprocessing. This makes apt-get calls in cache_deb_src fail when rerunning the postprocess task. Since we cannot run apt-get update again to refresh the state information, copy the apt state information from the initial bootstrapped image. Signed-off-by: Vijai Kumar K --- meta/classes/rootfs.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index ed43fb9..bebc0c4 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -190,6 +190,10 @@ cache_deb_src() { sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar fi rootfs_install_resolvconf + # Note: ISAR updates the apt state information(apt-get update) only once during bootstrap and + # relies on that through out the build. Copy that state information instead of apt-get update + # which generates a new state from upstream. + sudo cp -Trpn "${BOOTSTRAP_SRC}/var/lib/apt/lists/" "${ROOTFSDIR}/var/lib/apt/lists/" deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_DISTRO} debsrc_download ${ROOTFSDIR} ${ROOTFS_DISTRO}