From patchwork Wed Nov 25 03:42:23 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: 207 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp371389oou; Wed, 25 Nov 2020 05:43:09 -0800 (PST) X-Received: by 2002:a1c:23cf:: with SMTP id j198mr3983762wmj.6.1606311789704; Wed, 25 Nov 2020 05:43:09 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311789; cv=pass; d=google.com; s=arc-20160816; b=p9peN9i99RQDUjRJNO0TL/+7MrTOUmaJi4QlaoqX3jd04qtoMMG4w/9fVJZCDvMHuE aKC6kievNRXPraZSO27vpCZehr881lpdmhkFhZNGdvpM8brgt2Y8ts0/HYsjfPXyN4+K pp3F6S8CwZ8Mcg0pxCiLwOgG1uE8fBHVti8VoeZAziqSWRYIYx6lkg9r5Fc2j2b3CLWq bWit3ZlHL0cCfZkTIjy8RfnoSafsOf+Y+/AWRbvQY/+Gv7zeCZ/F1po+Dz5E/RdB3vAO xW8l5ulqwQBC9l1JaejCrTkRBVEOjxAy9/X2jxWD1q/pHI2wF3mcYveD02ycVoygJ/Q6 9PCA== 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=U3Fm0KnNCfXwivaYYbCrc263FCAf/JxP27bypS8ZplY=; b=IKxes3zLU5BwCDmiPp1mS2QHc96QgPcRbXHJ/6yWZ7jRQ/H/C7eA6uQm5YDQPg5OsI agzlf+DDaM7FBFCbXy6Dc1MINYBzSqZu65XA0HGyI+ZFk2+eKVzkY2wFbu2Rrr6ZysVg OCQ9sMYEVtsK3HwDNSzlBs2070YI0/7r9XmgKJDloVF1XUnVwud9/Cjx7UUK1QOEGakM cOxLq8OoKOmmiyn1NweXLNNsVjQaHpgqH/bgmZEPagWVR4Hb5MAvzTOC6Fl6rpeIonZw liL5gSAvGslc2znJunV5VQPRgf6tT/pkkoB8KLnp5Fw7AxHcON7gYGlOloNrvnzKyzjC 5TsQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=pwo+obe1; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3n67h6qkgqebwrorgq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3N67H6QKGQEBWRORGQ@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 f7sor1151479wrx.7.2020.11.25.05.43.09 (Google Transport Security); Wed, 25 Nov 2020 05:43:09 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3n67h6qkgqebwrorgq@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=pwo+obe1; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3n67h6qkgqebwrorgq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3N67H6QKGQEBWRORGQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311789; cv=pass; d=google.com; s=arc-20160816; b=NnMelt9KRAsuxWZBoEAJJNNhgvupQRiw62/xbxUqoRW2f3x9q1PsRv46F+JfVMu2Hj fxnUS5cb4OEzjTW3/wjJosfuvGRSsQuCzNl15rxaftWsPnYGWHsawLdyphHLGsVU2Ppg kL2Pn33PR2/a88jsTRJI9h8Kf8Gl1VlJeIzOjdI6AvIYUdvqCGaDQ1fITrU7zpBzynK1 bXXGs0cVedsz0eT5p+UwjiHIkAtW+Bt9tRegSNNhK5d6OOaMls09IiiS737IclBx+dJY FLxuM2J2xk1vdv2gHLbUgdmiMMywtZ6qz20wnHudIZ6TTfly4NVAvVzwQjdTyyt9Ux10 wRuQ== 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=U3Fm0KnNCfXwivaYYbCrc263FCAf/JxP27bypS8ZplY=; b=Yd0JB5Y668O6rWF8PRyBTrl0myOq404IfljAVVr0e9oQJZkeSRqjNhKREf8IAo80mv D4EcY8T+dIEvBwK7Z664dD9TOAv2vBFNZFIp8+nir1hyqWzyvvl4bqsXQ39DrOEq+iQb X/jaIro7lUgNDh3/1q36OHRPS2KjreB/PbxvBtAt70BPCrtiBZskuiMkeMlvt+wIBEMO 81L71MHtVNfVjD3ezQi1OHuH7xh1NNZLRqWZK0y+7edWEPbBDqL4A5Zxr8cUQEXA4xHq zA9h1lEa9S48jKSATuQb1RBWv8TgSYrkmfne/d6jKzkXrImnvmxlwK/wkWsF1rmbJe4m DlVA== 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=U3Fm0KnNCfXwivaYYbCrc263FCAf/JxP27bypS8ZplY=; b=pwo+obe1MzyQuEc3fhZnnk2166DrBnAB9Pt8MkpCdz4QeTXcuPrajbSk3b61WtbsR3 D0dXcQQUPcNq32hT9i+zlJmc2WUgAAKSs6pSwLUZinwkpuwIrnn3vToc0ISzQTWZrv4p wrpHfMvqC9PU/B0kd4YNkjm4YQ0RiGUnn3Vl6ga9qHC20Juc8hB3ejMOmKJYwKMV7kxj QqM7vgm2Dh2nqbOXPclWjoFhVlGEJWQzeAlxFHpT6mWvIEoqcRxym7Eg6+GU7xt9fT4m K3lAEjss0LcXcczzo+Ej+A+3E+J5EDtU0h3wYzFmikaArXa9ORRxKye5vTDjCHnkQEdc CdOw== 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=U3Fm0KnNCfXwivaYYbCrc263FCAf/JxP27bypS8ZplY=; b=DwHQ3GH9P48fVoFocpmQfoJueNtj8fR6ooA1JQ9wLOYmmXaiQ4cTZyvYNz6l+wXaG+ Kztx17wA1UaOjHRueeozCleKtcfDb7+qo36O+fvxJ1sZG/5ksS4p+HyES6YC3beuQ5MO hsZRSRjUOQK9livKZImFgCL8M1j++BtvJq/Z40QmENFlhcjpRWp8KchkVKrGz2Zc+/uw 5mRwSHS0OQak9yAnqG/2OO5OhkvtJ/U+aGiCBO+aDycDARlKOXgP0OQ2lXS+vToSEoml P+CIVLYuZYiaNW/eIEirutkTvQLeA2bn0UOWxhLYX35YZZ/OmiaufN8i0Yf6Qi4oUpgH 4PaQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530rlwAB2kDb7e/FGot2PI34T6yLr8+t+U9lXTzLVMJ8b0yTQQpV 28vdr/k3T4B2CHcA0+lq6Ck= X-Google-Smtp-Source: ABdhPJwJBGs2neS2Bop2E3wCDmehSE7g/KLt67Zg6sIuGMgbwHCfdMGRPwBgvXts6x6NB5muJDBrhg== X-Received: by 2002:a5d:474f:: with SMTP id o15mr4294093wrs.100.1606311789412; Wed, 25 Nov 2020 05:43:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c3cf:: with SMTP id t15ls67896wmj.0.experimental-gmail; Wed, 25 Nov 2020 05:43:08 -0800 (PST) X-Received: by 2002:a1c:23cf:: with SMTP id j198mr3983673wmj.6.1606311788385; Wed, 25 Nov 2020 05:43:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311788; cv=none; d=google.com; s=arc-20160816; b=QhBUD5UEvaoMEzX69v1Y1DJNKAwHzjfgAbvSr9L6IY0dlz1ei+CGcanxuj2pzELyyQ 31t++L5jwEk3JqBnvxZhzGWMY6EvUJ9SpVVX1aBUHDjHsz9xWeFPJlntY1sOc0lZl+qp VVvPHxNU06p7d10UleKt0sk0F1V3KLs3Yjtdki/ZWM7V6tCigpOHGwaTpw0G8PWQy7zJ vMB8veO9ClFKtB2no73RShZEFj9aDNsWxssFqEwZUPzCIPmeZBpSItuQSsd6nGm2DtCn M6LyvuRKP44vub1xIwolsbrMbkxKRRaMXjhnjMDKMRuT8qx8aknXLoicbNsPYbNthqdr 7VTA== 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=Ui2dAxbnFgvnyt2u3cY1bp3ZRaIEy9B9MfFLtvf7JNR/XV3ohbljijq3r6OQC13kEU It+xPG4kM7M3V8lgrNL/l5c0JYPJqUlgQFhgLmJ0XVsquTTSYxomBaV24oOrqu7Qcr5J r5kAwcUj1ipKg16jbbw+qnxqyYUSkWFWSR6sSkDTaD+jMKJJT8ITZuenaosDyc4xOIBI Ke68d/5a9ZucUftT1TRLXnPVZcFfppvSZNWn44aa4yQxhwD5LxPoMGh0woqqJj9aRmjU wXkZKKDSTsczL/AHys910zzbKNqTvwO6SNmaocvvmBN0O6xR90IuQi1/OJDUiByRlep0 sahg== 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 c20si60917wmd.2.2020.11.25.05.43.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:08 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: XMEcdsaDsirtCcaxn60XsIkN+GEtfYk3fHA/VEDHQ0nTBe1l2NobfrjUc3i/8hfFTB7Gj0ERiN UOG0NuCs3tYmUfkx+C+O+KmceY56m0zwSTTpC8von7N8nDCt7Ie0nBCEBiAkFUuMQbw3UtM/RL uFpKwBwIykErEkpyitJtkNM+rSrZI/aX6JAFxRtTci+gg4ErZ77x0qgurKbINPNjdlKnX+BwYb qpQ7rw50f+Hft1wvyg30rJyTd+zHhj++aZ9WD/s4BHVl+21b/p1eCxAim+VONCF9GWD+Zyb8V1 Vb0= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597745" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:07 -0800 IronPort-SDR: qUsJ4YnE92ruTXC1bQZkPNg8m4cAmbYV7Zmxc9qXwRT0+o9cDGmI8IE8dJ7H3ASpz/UD5L4ZdK reRxFbRBy3jgIrhefQ14kqw/tOgfdFh/D+GgA94HtnzLGbOFMSPUj5O6MxcVuXlIVh3oNWiXHK 7P6C6MNfAmT/mnGJPFwtEGYINgJ4uopPoMQ7zI8Sm79vajrTo5HWm6e4DBMjqSmsx/tXyhuuaU kN4Pfvs4S31XjzSBrHZa4tz1ePV1zp6b5L09MNp91Uz4TbUiZFomlmY3J/bbtsget6S2Xqv+EG hbk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 01/14] rootfs: Make rootfs finalize a separate task Date: Wed, 25 Nov 2020 19:12:23 +0530 Message-ID: <20201125134236.25878-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-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?1684339991183301550?= X-GMAIL-MSGID: =?utf-8?q?1684339991183301550?= 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 Wed Nov 25 03:42: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: 208 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp371404oou; Wed, 25 Nov 2020 05:43:12 -0800 (PST) X-Received: by 2002:a5d:4612:: with SMTP id t18mr4304437wrq.401.1606311792387; Wed, 25 Nov 2020 05:43:12 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311792; cv=pass; d=google.com; s=arc-20160816; b=EtGdrhshVpaG12zfGIhbMb7PM2cKuBpErNEQ03ysmTUY3xImQx2PvXUTZWE+DdwwH8 GDvWy5KATW736eYcQvnGVeTkmPZRy9llHhROcLQ7Xe8p8QaRshpP0t4iOEQ599SCFe8s NfT6dQrKidHl3g2gsV12BuC6VWw6+yM72RzzQcKYKBCyjJOWn8eeS6kvzOowfQY3J4jb WofVnXo5Iq3MZj6o7JtkDnAXEyWDbbr7W7T9DDy24Slm/Q0HSZqPmFY4nmHel9iwMT6w zuSvAWcKKF2r9IzJ0Wn/tbxe528Dz37H742SanzV95qTmLFOLHSvqcnnPGbTGf7RcDci 6knA== 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=ZsTByKCJILDsP2pLLW+fGEfp6zAYGbJtWsdu+qfvY/0=; b=nAJYF9ONQlNerP3gIX+LkJ0IwGRtTcbxr1z4yslvGZ1u7Q0NfRjacW2DVzY6k1Wa3I i4tc55hD/yRPSGH70uh/5yD6s7r8m6ZARda1HvIFJFFj4QJEd9ea/X+e9Sh6NJoLJG5o 4A5sqjYmLlxrTYTF4FxYfexc3GlsUmaX2AROqT6RTaC1nBHO8gwLoTYSEoV34xwfkqXl BSBRmDtwOGo/k7So2zKgBas3CX7p8MqfYxJldt+uZqW7I9ikGNAVJIesS9jvn7jmtL7Z +ebWGzG2kWvSUp4A32DeVrNO0fFLMbGE8a6Cwi5sEGluE4BpqnAqSoMftfALwqtscE9c p34g== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=OrNYTVaf; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3567h6qkgqev6nvzvi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3567H6QKGQEV6NVZVI@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 d29sor1244390wrb.8.2020.11.25.05.43.12 (Google Transport Security); Wed, 25 Nov 2020 05:43:12 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3567h6qkgqev6nvzvi@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=OrNYTVaf; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb3567h6qkgqev6nvzvi@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB3567H6QKGQEV6NVZVI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311792; cv=pass; d=google.com; s=arc-20160816; b=Ux5xmgIYV9A5RoEYcmt+aMYatfaPPDdkzGleHcnra9wNF5OXLsNDgomfMGIjexlceQ W3y1MN6eyFXPBuybtHYyHG7fwFBYF8vdLQjx2GkzljofQ0DG9zbfSjUEXTneu9EFB19Q U8GbZ0VdElwTdgJyNu1gr8b3VNG0adnKUDm9jfZvhUmJOkYPWGEVYHNbm0ecE79ZqTaI z5fim8tJYwzCd1KCLeDtQ3VVDEF3m/txle/dCkrB9xT9A888sjWVrA52ympHDGOTyKEj OYgZvvDqJYOnYgog3veiYpNmnKtsFjtUrEiyXrpS5TyP1roZVoep67jQgE9DmDFde3ny +HHw== 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=ZsTByKCJILDsP2pLLW+fGEfp6zAYGbJtWsdu+qfvY/0=; b=j4bhfk3XlI5yTejP0Sos5HY7xvJoav8sKECUY5SfN/Jp1yg/mFuEmABODzMFfFMeD7 5dHbnHVZfEyGmXGdwbEfIqGkb0aJuMPKChuZXPHifvJxG9lrt2fE/y58ZLdYXzwRJgcI sJZ+JqpbAylvruziubPj8yebW3CjPJcWtauFGtoShHhWf6f8OO76ZYzzdyIKjP9FcYtD M0raNl1ZPpdSIhqO7Sk0uzFCcm40l8sP5Rir7IOpauRTMYVs8JFaagZ1pat1gbQjC162 ATENYnbHAW5Jne4UJdtykotw91FL2rKtB3ecRFF8IUfCzoHrvlD2vnjdVOIFeZuztChQ +8Gw== 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=ZsTByKCJILDsP2pLLW+fGEfp6zAYGbJtWsdu+qfvY/0=; b=OrNYTVafUXJO9AVFfUWG8nvCZH2nzcesjKowZoLnpzhwe/vsdwPzYj3d/B1Dhlb3bE gDkZurz0rLmtpqfmoRW7z+bdb0s4wriHHnEADavvMug9+WULpjngByqBSMmzGKvZAMnk e0V9W91d5X2eVrjhIltLek0ak9KLLZj3jAMHVBODUv6EnlRtHfXDa8iPwjmJPRfNZ9FE QKStRGvZ+yur3l3dPdNgT3EiedkZGrsvHZ29D23DI8a+rQAcj6/0fZNy3JLzAAHpQJiv ztqNrZJyEIA76UTMt/AQp8MNRYZ6BpfYS3ptZNvPWpt8Njcry0vbVhWcRjpRM0oBhzxt biSQ== 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=ZsTByKCJILDsP2pLLW+fGEfp6zAYGbJtWsdu+qfvY/0=; b=coE/tjc+UtOvKrUlyW1+3josiVUG8O42Df5YGb1KB4/u0azQFy4r0oVV6iRwXzYTpt aa8D+Snp7yhf5VphNvrba4FXLygN3NmmON4ZC8Hs6MY6mhfH/3vC6hBD4KiRqUMbOTZe Hf7k2UjhLzMWnl6J/+HXtuO4pn51iyQV3SNA75WLWWRj/umAqNqdP1U9h+kWn4O4OeQc m8mt+xpJF3lXPb8g/w2XN1QtSWrzuWDnddCGjzeKFwG3+P02Hzn1yLSchWWSi0Z1GCkf S7BhrnLh80XoBwnWbNHYLyKb8r4MHuVVw9BKDX3xNwBHgPx+biZIKHup3e/XKB3m9W+B d47Q== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533Oo1Vhswb0gItZrJx/oqbi98yLxcjyorueDUl+7BCr6aO1BzxI AJ3YJnO0ssduNy2Zpbml2b0= X-Google-Smtp-Source: ABdhPJz1vYifODufwjgmrw2qiKYJvFCqD6paGc9zMrr2kySTa2F36oPaSws0fJwBkzile7+XGPrz2Q== X-Received: by 2002:a5d:560e:: with SMTP id l14mr4199622wrv.191.1606311792081; Wed, 25 Nov 2020 05:43:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:3d87:: with SMTP id k129ls1286450wma.3.gmail; Wed, 25 Nov 2020 05:43:11 -0800 (PST) X-Received: by 2002:a7b:c101:: with SMTP id w1mr4097642wmi.170.1606311791122; Wed, 25 Nov 2020 05:43:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311791; cv=none; d=google.com; s=arc-20160816; b=YKtMeyQuGVvKZc2OF7SgaJZms/jrcfkSNrxY213FnN8EbaOWKOOujOeZzZ2Vxl954X dprFuTwoUAuIhAIOoMbaK7hmnVYiOjP+sSi6IYZgn2DH7VNKcAysv9Urfvdj45C/0WT1 vbpOvIkATOMhmeFlIILSfAnIKGkyqTy0Xr5qzqCKkX3JlcGcCmIi7KcmXQjQXMeCg3il GhGb1aT4THRJZPt/mUbhoJn3xFNutq6Pj94GmO1Alzxn96OGNKZLX5izh53f4ik4QiH8 Usq934mwxgA3GDvv1TjcAAYkKZOoYADoXWSHcYu+kZkFO/vSpb5BeA0DVjCK2mLeFWpl qsuw== 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=RQoIktVQDMkyvBROtyWLHHbCIdfrHkGCn+aaKaiZYO5O7Bp4ovij6dOWjQqCfZyID1 9Jsumb3eYIxs97g2s4m76ghubX4+LkiVFi0jDmQ1XO78Xanxu911I9VMiawZaXEC6wy1 S71u8+QQis9NyNttq9HABXktS0zRpBgeWgohOQN3/0TVvxQ/K7e8uYMmlJa2Vv/lsj/W GdkOmUyXRagIK0Y3vc7fsbnVoBM5DsuLEE6Icm+x98JZbN7MYhUjP+CGNyEovHLuFMzp aPs7JUmvXFMXX51KbGRqfJJN3TqOwE6fkfJ0U+XOdB4OvrHOyGVHOYyK3bVpzC58wEpd Pv9Q== 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 c20si60917wmd.2.2020.11.25.05.43.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:11 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: CrgG/XkJIDcf148pBH+YJv5fCgka/CsZJdvA3EdOFchhlAgvtfhXe4umEVHjd72nRBFT2oxkyI WvifhX3jK2FwYh+5e1RgDzU8X/k4wtcgXFCL2WEU233CussUD+0BdTRWXz13Auo+hasGaEJUl2 fMF28vT5MTXBgd/gzrCDyWW+Tw3Vxp3EH3UqqsKeHHv8fz5+tTst2Lq/P0Y7DiZoxJ42UKUVoc IgibGeuqhBzmb0wmI7EeyEvY183ZtwydFkdbfGV9NtLdpwD8Ewh+vEXT7qY89eeSKaz1HvscMW oaM= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597747" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:09 -0800 IronPort-SDR: WB1gJAGFU4kq3qI1ZfN2IQL+BOYTIlJ8eQCOp2htjfffXRqUxhwjWp/6r1cfBxqZHEFvll10zv ZcbTEBTeYX31SwASK9zzc8+Oz3rNi796VNtNVSfQomwio2LshnSyrl3l7FYi/nupysHRBHXisB NoiXd5LqHsEpU66EFSpxP70IpB4bN5gZWryW3WGsET20Gs2qJU2b+paRpOdRhLTaQE0phdII5B 0Ta6Kt34PCPXBosrVXMrcXkqPpaq8vfc7+5EJnXeOJcJuZAnsvgjVXMgD/UdWp2+rALt3Z9jFh o2U= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 02/14] deb-dl-dir: Cache host distro debs separately Date: Wed, 25 Nov 2020 19:12:24 +0530 Message-ID: <20201125134236.25878-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-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?1684339993875678556?= X-GMAIL-MSGID: =?utf-8?q?1684339993875678556?= 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 Wed Nov 25 03:42:25 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: 209 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp371442oou; Wed, 25 Nov 2020 05:43:15 -0800 (PST) X-Received: by 2002:adf:a198:: with SMTP id u24mr4228297wru.219.1606311795554; Wed, 25 Nov 2020 05:43:15 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311795; cv=pass; d=google.com; s=arc-20160816; b=DDe0cvDIyl3FPAo/DktahhZ0ZivmcWmk3nXb5BjLPi5KfoOG/0w6Jhgg6ywv8SNWwl G+rpHZuxpCO7r0baskaAJsZhbNftq0AKTsf340Au0oT8n4iIl4tbxuawmr736TL9gDF7 h/s7lW4k/2AZdxpuZS9SoC+KBPwFf1ZzazPzkIG9EDhO/SvTOPLbLBiTT4wMpG+59K/0 +wVXx4SbNgI5ej2k8526MD16ZpJjTyRhtXSSQ2uXIQVIYeNN04tK/NrzUlZIcmOLgnUH Iz9BC+cJKgbK3MV9PzOtGUr2zIZYPjQD6nxkCZyVlUR2B5Zc1Y6lAMKmFNLHZwQLU5P4 znjQ== 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=MKtk31GK/yg38NA/PUoIWdAZ37Y6sIzYFgj/1H8hmYw=; b=nrFf1jzkRm07YEtWU0tHprhrAagujESnV0RNUaKl4Gd37vKJosVOoGphE0Aze9e+TB d7gXg3/3p5REbTbBcJlFyiyBgza7dHezryelcknWpgTycpq/s1vgl/CJKQJT2Pv/tkYD WU7kSXkQo1LeCD+1p3zX3gS5Z2NibB37XAHBvsPk2a7IvR46+LRB9RmHjONn9SKLaTvW uRLmx+lYuMSTJuHHDfdLpzKirV9eurDnSjJtVRx5L2GLWPaFatDGTSOWxc7WBU64b8e9 V+4il15gVWjdo/5cJ4Lfqc9QzBAmivkEuGHCFhtrAFuttOZo8nJ1FvGBalG7Yn8j0vd8 OqLQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=JrTWkUcJ; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4567h6qkgqelpo4zei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4567H6QKGQELPO4ZEI@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 w81sor1216018wma.14.2020.11.25.05.43.15 (Google Transport Security); Wed, 25 Nov 2020 05:43:15 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4567h6qkgqelpo4zei@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=JrTWkUcJ; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb4567h6qkgqelpo4zei@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB4567H6QKGQELPO4ZEI@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311795; cv=pass; d=google.com; s=arc-20160816; b=Ukse/z42X7ZZpnIM3AzSsZuNI6MDkEWDOKQbJwndwSHpTcwFY2B/M02Rct/8UMXvB5 4OMIffWUPWZGWQIMsKC8s29WKfyVgKhBWqwNaf2N6L0QmQdbx4J5eO4y3P6kYOQ8jaC2 mqbn5iwSBhcC06U+gXwk/37o8aOq2PAjkHcfLkm5WI+MNvzlWoyzcmAkg9BGtcKPai52 asDjBrEkZGLjk7wgJKhsqn2aJrAmF19J3WqsyFvhGhBFYrgK4Pm7ruyxPX7c2oDdA8aS 2tJAnwmKiOD18RjcqTLn4lgaK9Q/+DbcgXIqCIdKeQthfWjBJGAokY2l0Zwu1+t5RvGP OUsA== 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=MKtk31GK/yg38NA/PUoIWdAZ37Y6sIzYFgj/1H8hmYw=; b=jxAcmiFrn1lg3cXTXF8cFiGvjoCEHk4Z2ZaSZyMhYLeIi8Xh1h5qP9idy/+6H4NA1V XQTsUsI9pNul7FeGg+FKNHjhTnay422qbLzQCni7/WZaIt5pkrcpu3kZhL1E37UN04L+ PCffzjo6HWiLHNYeh3pqOZu0n2zOCDrJ4NXkrh354kh5yZI7oX90LESSPcp2xuU3AMeH Ix/wJ0oW057hYL2DegXS57/wKEqVWETMhCuvu3I09xvDlXLI/mwAb3qeMkl2Xrn/zNCM HNBB16Dl8YPyRyHBBgZoJsPKtoTw2JpcN1TBRrIpts4Erxd4n6sRtVXn1cFqBZZM5yjt iKAQ== 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=MKtk31GK/yg38NA/PUoIWdAZ37Y6sIzYFgj/1H8hmYw=; b=JrTWkUcJwIsKR+eBQhDEYvTjrqwOm76t55YwPY8FdauaWAMN6Sil2JAJQt93DUWUTJ N30ByVQeWe96znVHIpl9PpFqOud5MBHakwj/9+2SKiq60IyE/Y4Ou3nzfzjLVGwWThqy dt63E1Y6tqr3LlmIxBbJmMSVVbwOPbehFF/H82Ohe0jyHJCw9h/q/K2IelAGgQLq2pWv qJnegRJVb2Z7IbpOZI1IOYuggOtLbi5EBSflfRnwbuXr7ZcnHaTLIZWLKMCm45Fb4DqF +7FfThej8IJ2srowng7Aot0sT8EBKNf71JVypL6BoQoQv3sY0DILaU+nHjvbgKgsG9MZ 51nw== 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=MKtk31GK/yg38NA/PUoIWdAZ37Y6sIzYFgj/1H8hmYw=; b=YFodi7m0GQsymJGFExImWmOxqxavNUK6v1Q1eJVM/wVbxYwXsdbQbWi/KPrxrMwbc/ VqU/DKU5p79FKg8gY5u3VfeR7gFzWfmrR8l+cVIBA3OAG3UuTFk2qrNzjU73ZwQcfeRs eypf7hFFqJc4U8hvrJX4Xf5FQm2PqrXhObwshC6uwhLz/EOdQXj8CdywZIBndgiKkq1B uRhhMIQO7XMrwWK/Qpzv5Jo25DnwEK0kFaiq+Q277gZCzWs/+Mn5GdBfn1IIxeZ18RP3 jwawil7VpwyhGZhieat399nXYcCFNuy57JG/z27DQrw61HsgwoBVNMNCqL2m70kLlJdQ mcgw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530dokPIsYJcOjU8j7bJfaXt31JexeVtcBbePfnmY1dUs1hwmtOh Ma1DUZbkPWWAgwQBY3NamWs= X-Google-Smtp-Source: ABdhPJz+h2Wp4CRQxgrQwHaL+tY1MDcUnTLG0I2Leg3Ku2Kt9lc/+ardjCdmmacjRAjCoupAWFKddw== X-Received: by 2002:a7b:c012:: with SMTP id c18mr4122419wmb.10.1606311795249; Wed, 25 Nov 2020 05:43:15 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:aa87:: with SMTP id h7ls2828035wrc.2.gmail; Wed, 25 Nov 2020 05:43:14 -0800 (PST) X-Received: by 2002:adf:dd81:: with SMTP id x1mr3626008wrl.163.1606311794378; Wed, 25 Nov 2020 05:43:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311794; cv=none; d=google.com; s=arc-20160816; b=Psy1Y/un2y17fXZ3WLDez2rVc+XMZq+YcZPXh3LugE7Jedex9OOat3d/Nl8T24c4tk +eosHPtx7sDvUQKEIXR0BUjyVNJ/FOrXQmuyR2WXSF3bYrORq5Tm7hIE1GJ5EUTqTcYs emmWZxmIvkeYt3IpJ9K/FM00vLh6vUNtVIuMltBo/jGv5DJcVL7SHBVDDDxk71rsHuX6 NOqr8vB3M7ycwxA03IJU1Nr6bI3e56MTRnITlA6TxYTebhSh9qUi7YXuFJVHrfLgWDem Z6NzKxNPrJjEYz0nIKxMIW1GZrK18God6D2OGT6GDzh6wG9wYfMj/4QavjcwWZxN2M/k //5w== 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=vxoru4K4eeMAMdltd21OANzvRso1fk99oeIzK/OMGPXmQ1EtrKRLCY/G+OyPw3GgYM UrKTbFi3HrrB6OXtbFoxLhT7mb9BX6ITsIlJn8dqP1yJw0htJblgze3SoLyq2sWlLSsf p37JbEjOuBqhCTFoJkJiGOnKM1cQY6DhwV8KNw70eLaQfqyktT0Nq933vpKs2VxTSjem YDytIVwOXrt3+h3Bnac+hV0Nm997n+IzVfdAAxw6oAY6879oGIGf4V/zPnxZehyz2aM8 VyvZSIPhRXPO3I2MLpwe3QD2+00pNRL/+khd95juDsp94lgVNK8N/ygEQPw7PnNAHk3Z ys3A== 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 c20si60917wmd.2.2020.11.25.05.43.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:14 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: s18NIweDeXKw0MBNobfXRsPZz52hGjtIb7nhrUV64V9ktnvJRY/FCHQvKdGn8+rZibc0jxPOED RYoImuYnN0CrnzedzzVfTLYpP2Rn/8sESmY36rFfu6Qdac1SecJgB7WUdSEcrImyodnnwDjh8z qWuGbQLtJuwZz0hZauRnHOq+hauk8YMYnvCxpGpbveTv8xFY1ZjdEvL3N2fXV0MFTfkUqsHAH6 a61jOQW/iYQNCb1eNiPloIHHZEtsTNzXyzS+Af441TkRbwXf6Pzzkt+SCJVnfFV2K/uGQAi1e6 xng= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597748" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:13 -0800 IronPort-SDR: I7qM8rkFgImp8AidS2f3m0QafH64sXnlmDAPwt0t9RBfZueFYWiv2mP8m6vEhKJiKYww80yp1R GyxdPeVTZsyfmyqM6B5/0CRue7woQVJsNgzUOJKd+Yh5va109ckOtDJHdmHrvSHE9ZBJ6d1hqW qQHACu6FHAao0+i9WgyHqqCpqUz64+8vqAORn2qLqR2IBisDiQqQCErxTyO5wzJb9M+8bWzESU 9wbhsFnlr00eECtojml7T9qNCya6PZdtoeKB8Z8biIJaQIhkxdZghBHsMHP1whNjrAiyR0p4YT 964= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 03/14] meta: cache deb srcs as part of postprocessing Date: Wed, 25 Nov 2020 19:12:25 +0530 Message-ID: <20201125134236.25878-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-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?1684339997421657304?= X-GMAIL-MSGID: =?utf-8?q?1684339997421657304?= 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 Wed Nov 25 03:42:26 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: 210 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp371463oou; Wed, 25 Nov 2020 05:43:18 -0800 (PST) X-Received: by 2002:a7b:cc85:: with SMTP id p5mr4102853wma.102.1606311798448; Wed, 25 Nov 2020 05:43:18 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311798; cv=pass; d=google.com; s=arc-20160816; b=JqhOwjeft6+eYYYcp318SKnRy7H6ELe4mHbp2u2qn9y3uefD+jS7Ya/ZgfYMGQ6B3K ixfSj3XmVR5GaZRaeRTOKEmCSd8cM03QLFLB0F0Fdta+HdTUUWbgmXi3iIdo9oU9AnqY aCGUqLyPLQ2q3Fk2ZyS/ZkhoUS+gVBpFqnrGC60GmwWc7hgH/c7DOHfhfbrQ6n13DfEI pQCS2yddClkzOgxSLScaOYRdh++Le2Pg+ennjxxxtW2xpqG9REGoOY1U0tDW4nQGIUNx NYyOtDgVl/GY6ecqvVf57TaNQZKSzhC8wMcigxlL6Ufyde+SnW8By8dDJGi7eQZfEoYd D/3w== 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=lsmSVZBmIQAj6gzWXn+1WX+/NUbQ9Tnk9ktlc8zJJ/k=; b=rtuMJywmXuJm9dnjDaSkVtIa5sNo5/EuBwxY7v89VJeGJnGimsWIGJD3pPLLNDgP/H gcbqYU1Mm50Sgcb4zJERsAlirAboPbBAcgVLOquOps4ZAgo/UM67fMV8EVLDAXY3H9L6 5GlWEaXffnwqzObodrJzw1mJSqXBKPFuD9m0PznQQtzf//om/FHoSDei8DomF1vMotZ5 dZD9uE6vbWxDPfcnWgYlLKIrRgWoCMuBxuiJhYs9JscD/x42I+Z2LXBtCUTFJ/uxPMdQ W4N+o3jqVcVP9f/OI82gP6RNpybKDZ9ZkG4TevtyfxDcqTwwsqhqiMMBdwHsf1ytFDK0 1PPA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=RQXVxYV4; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb5n67h6qkgqe3leccfy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB5N67H6QKGQE3LECCFY@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 f12sor1171885wmb.13.2020.11.25.05.43.18 (Google Transport Security); Wed, 25 Nov 2020 05:43:18 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrb5n67h6qkgqe3leccfy@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=RQXVxYV4; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrb5n67h6qkgqe3leccfy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRB5N67H6QKGQE3LECCFY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311798; cv=pass; d=google.com; s=arc-20160816; b=B37st+o+PIRWuWSGKYtBP/6f6DIGN0HBq1TkFUFzkhDgZVWEgjob5hjsLyoxvQ75xr YTfNDTsiYFrwXW+/BwMoK+dBDQbbdnkPdEziyarnu89I3MbLCajqyyARzych3HH/SuLl 7JMWZijS/EKxsUdzdVTj+ZhUT1+CNxohOvhfnV5spgkzGn+yL4LVc6Bm6J4tlykeHS/Z ShBOVPO6tAzv+DEbarAZt19vhaf5FkQKMIvDA9IISf4tENbGUh0HIJ88dqO0fIXzS+ZC B4sDq5KCBME9bt9Z30FQd42JITsMmBh65LkfbV2c/Vp7sVksm9EcMmdnijU7mYo9KvH1 ayhA== 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=lsmSVZBmIQAj6gzWXn+1WX+/NUbQ9Tnk9ktlc8zJJ/k=; b=hzwu/OkCbLry4GeDVlYBb+UflLcYhhGPwf173XkpeLz6uRkxL7UHpV2uAxZ8DVfllI TMQ6/QPjOsgbaKs+iI+U5AaMTsLrsVZ48pnMAGpOhrvNIn2v6hXGrIzsAxyiRiEKO0/2 meYd5U3gbb4103GNERODdvfLQ6JMGaBu99JWRpuBAGBYBpNCWKGTdT4NYmfDfN1YhE7t 8fLUU3O1Ev9DMqJJVK7bYbXcHyIid+XpeMqieAPsbyiWDo8IuB+4rQ88RadGRtzJec9s Ka4qD1+MiXg/7JXwHTk6SxlMXjRYHah96ht/nfkk3eao5eaAits0D1OOEUQKlhGTbBNE LWvw== 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=lsmSVZBmIQAj6gzWXn+1WX+/NUbQ9Tnk9ktlc8zJJ/k=; b=RQXVxYV448LBdxrVXBu310nIaalZRE+P1+V+3DMAVwUIVfbFc8pqkJmVmEz/LLtA1Z 9Wswg+FRq6iOa1zlQXBiyswXM2GyPV4sjs97fgNnjIZt1QKxYwe8lD8GZDw1WOsQHv2z Rm2HyetQshzD+uWkNbzV42U9KxgZZJSgfZ/khW+jH6bOF/ZvzdpbTdOtMeH+wXPv6zYJ YjdNzutIfsE26qwatzigqyzV55k5pQ3eW8FbJgajcjXEtjkT3+ExHQe3Xkm899j0X6zC KhNFK02h1YOVH6ejIY66ECVfOcySkIP2Y4Q9WyY0Hlw06FJsPF4nK3S3Dq4k69vZPRuP vGpA== 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=lsmSVZBmIQAj6gzWXn+1WX+/NUbQ9Tnk9ktlc8zJJ/k=; b=VWDIrFehAnJIIu+PJwarD6tyo+fuIw0HNxF+Qx9WeFvz5kSIJM/PIlfBnap/3nX6ce XdQQBOOFyD4TUxp/qKss+1kR4UaWYtowT0C9OsKn0w4k0ThwRcj/4B+xv7A0Rgq8WJeu cXLU30EqN1pnLcFfLKPSczPgWqZTe+XCreMDERLUmNblende9Mc7qKr1qi2DLUyi4BUL 3I76pMMphQgGLpkYq2lzHGa3KoPy2BLrwJHEItm83dGUwfW5jI5sDu+heMU103iq312U UhtkVCT19oBKrq3kqDJUHuPlgR1SRCVgGEAx2IEb89WBAAFBnk+EClfYG5Ae0oBbver0 gxCQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531enZpB1jUG658RfyQtORp9a4Y29BnlTYg0ycDZJEb5OwNtzPUq wuKFUlPu/EvUQVROO0734Dk= X-Google-Smtp-Source: ABdhPJw2XWIL6XQWmO5+vtbFY1VJ3uNwdW9fcebf4lPuJhXITdMqJi/jyDru12c/k+I7KSlsYPBRYg== X-Received: by 2002:a7b:c3c7:: with SMTP id t7mr4152546wmj.114.1606311798197; Wed, 25 Nov 2020 05:43:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c689:: with SMTP id j9ls2846323wrg.0.gmail; Wed, 25 Nov 2020 05:43:17 -0800 (PST) X-Received: by 2002:a5d:5505:: with SMTP id b5mr4265690wrv.410.1606311797309; Wed, 25 Nov 2020 05:43:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311797; cv=none; d=google.com; s=arc-20160816; b=tXyOhGQFNWy7UFwbdSqxW9gAGlYXCex4vbDOiVeplvhfKHDGF1iyWMh9agZeWtfR8y aNldHhrvb2L622q9H026XogDBLKmNIthILg3p+5vKP7uHNWztAQXDKthA3JmtRQDTnsk veY/JYXNsA+hNiPguuUhwS3RplbYcKqfPq9LNTOQVSvnR361KkW10qEnPZRyq+EELAEX k3dAtzom8Vzk6m2MzID3QfqYnq7u6Juc2yTsy9Yv9JJhgNfCztp30IaN9BbKPOsKQ8AT MFp0sTsTK55MX9qua7P3ANaLW/W/sIuGBeREtrc2DjMmhVF8GIWXSWY58IVHUGIzYw6V pkYQ== 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=gVn2hLiSwfpziRy0qMjrqU5nlwnZb5JLhWU4BzPvXTKxZC5DN9lUGATsublxKE34j8 TrxdOTH6hRo4FatRvgcqhmDIRhdlbxTR2BDgY7v+p5ofmsU96nEplJ9rWlpIuwv7g0fR FUxq7rt/zmDTzMypvudHzDyv82cXP4YvpKBai2opJ7Mx1EKAKfUWuePn+f86pA1+s38q WZayU76U3s//R5gSRx3iKnkiIcOFPsNR/OvylY4hksserSHqLMR/LUFWvqAiKuQXMnVG RFUSKjmfoMyh/+ODWGsSirNod8zc0eAwyCRlV7XgPUYAr0QQoCCpTD1MIDQOnUVj27m1 MG5g== 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 c20si60917wmd.2.2020.11.25.05.43.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:43:17 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: gFdUUiXFe6iOZA5dHcbS197JEaiCbrilnozT74ihlrsRnvRy/irv6g/22mA5dIqhUmtVIt7PxR UK8W1JVD2YVm5+cjhjnm+VFlzs9WMYHvrtRZBj6cXC9Q3jHrTtMFlyZ06uLKYvkiV+KccF+03J L9vl5umLQOOXXV67fdpzCxfkFvrot4uh7MHaU0p7wiEtBVscV7LKvABIKnA7KtrlFXwI01if35 TQ1BnMOdPcBuNnPlkavulreq6LNYANH0ZHY9p1HggBItC2SMzfPZFZA4sSPM22F/ef3iDfag6S lko= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597752" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:43:16 -0800 IronPort-SDR: T6diPQStVyrKFRQZjwfipCd3Hbrt2IwneyvHqweQQLCr+qWt7GzGtON/rJMFXy1XmxvzwQ0sNz c2LU9+cKDay4Ap8zeFZfvpzYG95gfQTFRUY40/LgR4hm9c3mdXcxgwDZQKMj/CcxhiJnbpVyd3 SOr81tiTkX8Y2BVIdnCA6BAM73eR0RSOYQhUeun0BgNH/2OMWRFhcP4vOayUBjm/hvlyRbARvI XHOU116TXRO85hnNY6V9XsTU+taoL62sLKZV4UXEPfBrUVctQOT84zct9deqK1bUVeRrigGnhy 2rQ= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 04/14] deb-dl-dir: Make debsrc_download faster Date: Wed, 25 Nov 2020 19:12:26 +0530 Message-ID: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-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?1684340000448670069?= X-GMAIL-MSGID: =?utf-8?q?1684340000448670069?= 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 Wed Nov 25 03:44:05 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: 211 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp372330oou; Wed, 25 Nov 2020 05:44:41 -0800 (PST) X-Received: by 2002:a17:906:4ec8:: with SMTP id i8mr3248562ejv.184.1606311881313; Wed, 25 Nov 2020 05:44:41 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311881; cv=pass; d=google.com; s=arc-20160816; b=n4j5F5KSEP+tRjh2U4nmIiNprOSGLENbwZXpo5f8E8yXCKQ+p6IbTOxMur7Fyn3E3Q ctqKG+JccrMqb1k+kR9zw4djxu1Jj16yafBZt5AIn7cAKANf3Lkg+iQ/OS2rwL1YDMY3 sOWVaNrcz3e/2UJStGsTYynnZ8Ov0c+f3pXU2tpqSBWZBmXguqzkX1RUCtZfmGEjQ1VX oKcyU8E4lqBoSSrF01GyeTJcgJN+T4TLipHYVbH+34qizj7+3+u24KwtwiKYw2QKPGVe 5SHuHckxtzeu1VAVhgxIkctoLHFt8jL0KWfXY3SOjUGtYg8g2GIgfD4wd+ceKKdeLsiD iUDg== 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=RMh2GV9xHG8mknzNggujws4Dj+RoyMuBmAPV/DhNnXQ=; b=H/Cpnuk3TI/emwR4xdxY0ITpPC5kbVWd3ZJzkzS+SGJwOfJ0ffMzrZPRsOikxyKV3d rWHkH17eW2tDIx9CWeYTmy6k/NNoqKBJ+rp/XjWp2pYk8V35gEnXIjOHaRBF9xFlnT6X 10PRR70Pnf6VGpXOUqFag/mlNfzuEJdtL1yVhLwjztGbwYqZO78E0E96+7XcjXIrO1hM anEI0iUZpkk7ERlo4h8S93hmigkM9NoZMJs/nlBMUGDdrzZXTvOWWuZl1zWdCR+HoFPZ rNf206U8hBp0VOgLvnwI3RQWHBsEQ+wptQijLkR79Nr8vlf74PO3zglJW+cTF0+q/Qgz 5yLA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b="X6s4u/vW"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsf77h6qkgqejfxkixq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBSF77H6QKGQEJFXKIXQ@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 y18sor897344edl.0.2020.11.25.05.44.40 (Google Transport Security); Wed, 25 Nov 2020 05:44:41 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsf77h6qkgqejfxkixq@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="X6s4u/vW"; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsf77h6qkgqejfxkixq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBSF77H6QKGQEJFXKIXQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311880; cv=pass; d=google.com; s=arc-20160816; b=jzGixbmhv67ArNJRhfxh1+pS4dbfUBlpUuQWLQW4xZk/xt2Iwsw9Vlw5vN+6Ep1RIc 646LkO7llqNxCzJwQkqy2HFzMBNicA0x/cPxuL+UrrB17hhZ+jULm40x1vRs6xSb8Bqp shMGVQm5CNLOjF1yGWfSTpvn4O7LrwzW6bgIXUz+Ttw5KTzQRdYuc6E+a0uk5a+PTLvk litry/i6FfFNUQIvtv/92ao8eeHRrUKyhwmfd09m16Lud/Q8LyT1w5+D1LJ9P2ftVd0d /hE1lJFCO/9Lm3hwMyu6DHFudL/wGGZjACjnZU9zZ/iUnRc5PdFhpfv7EYIoX9Kb1RNO TOQg== 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=RMh2GV9xHG8mknzNggujws4Dj+RoyMuBmAPV/DhNnXQ=; b=yHlgRQ0w+VBDXt3z9IaW+WzfJXqB3deLj1qt4Q9IqFuKrlCjfrul80waeWEJi+38a7 3M42J958BdFmajTJO522BKBE5gHuGbXUYhTBDjibTefwtu3a1omDiN3iA1orddpUjziF 1f+SZ08/czjXsRSvqKJaEG9bSME0A+rbecd/DWTo8IugYgrGHa08OTH9hSTF47V4umqX NdzByFh7YGPjt84arVWwf1dqEZt4d+2RzK7HL641JzRw8aXesfYmlUcVBLuwlmkqp4j8 jPym+s8eKHSpp57A44YSEQzQi1R/NbjmZ5QC45L+ZyLHQ0GcFlNUuYaIHq3mOsQb8xR+ I+rw== 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=RMh2GV9xHG8mknzNggujws4Dj+RoyMuBmAPV/DhNnXQ=; b=X6s4u/vWZe3rJaDqWnyObrB1I9r8o30B/T12sElELPcRnltwio0q/95cwFxG4Jq6Gt Ig/uuZJkIEnNZmKDZ0wbW/mrTyupTgI4zs5CHCtcWvb8Euir/gwNRvYQdEN4P0w2U3gT NEbzn67LTMH5ojP3PF4mvZBwnGg0mzvhavCVMC0P/+klVfHix+g5bam5VqTaqWnmnRBm h/W+TRB9n49ejltAr74T56VFhgePySmYpCHsnswSBjD5Wt2RirQCZ1Ptu5SBRrshVMpc 4lp+mkr/uFx0kt0fhJnjjNIzshPROChZNU3+Uj3uFfgMUf5h2VPr46GE5Dki9nwcQCeb Io7w== 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=RMh2GV9xHG8mknzNggujws4Dj+RoyMuBmAPV/DhNnXQ=; b=LNKSNim8XX+6gqvdWoWTW6RFdCDgzFXZdQwi+SBs3GYAAOWzjAjYdlXmGlyuXl/ItJ eScLjH9YCkXJkw/JbtcUzUJ51Dr0yxsnJZO1jX+ySVz8vV2aPxqKPTdCNe/bKr/o5bIv zsFkzi7cNQqFljq/llSo+/r8BcnFNXM8gUaEI3wxoT3LbSTVUj94ql8DQr+bOntJSJ1H gxvvxlvsUKq3u0oBQH3xHlvBfr+QqJp+Kf2yfr7nQztZAOs6aLaOAlUgfXQp1t5yJoe4 4XRsUWsy4lkCrcw7YRdeT04wlB2mTvqGIfWrvVsafgnMUyzDskjmAxcLcmQFNMGnu/Vo 33EA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531hAJrlqG8luCSEn7FLQ7qZ+SQtlWE8+kwZHazpM7e4NgYv88L7 wQdDnUs8ECS3GWAGkr6RuNI= X-Google-Smtp-Source: ABdhPJyNFyV40gSQx84w5km0Ov2lgpKe6kWjuMAlvPy+re38oYaiNmItZdYgQFYAWrsYbrAug/focg== X-Received: by 2002:a05:6402:3076:: with SMTP id bs22mr3441468edb.267.1606311880441; Wed, 25 Nov 2020 05:44:40 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:28c2:: with SMTP id p2ls1087855ejd.10.gmail; Wed, 25 Nov 2020 05:44:39 -0800 (PST) X-Received: by 2002:a17:907:9d0:: with SMTP id bx16mr3319747ejc.426.1606311879496; Wed, 25 Nov 2020 05:44:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311879; cv=none; d=google.com; s=arc-20160816; b=iA5M87sa7bbAA9k86rBaJb0Uvu0rS9NHqMqThe0hEIcND0hien3GJHccshelhXv2Ph BDNZuvfof3Ti+6cWoabwgu/XInyNmoIoUJii9me53efJJM8mGpBJhUmEJcGSgCvLo4bb lex94ozD0M18Rtr3kCatbxVdiz6C4hN3NoFKwoZ3mK+s4lBx4IlXTEu/gogbuWAhCY7T l0IeCZj/baXDhWtIyrRNyScBtz/m8Xi7TEbBgO0qlggFjw7l9med5p6eadm2mZRLG0li VZjDZOYKD0N/Zi4p120GMQTPPfZo6P6WoOuPaNv9l7op78OcKmpRPKtPDMq9SW/uwB9s NcAQ== 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=jq4M2dcw8Mq2craKAwvyW9+gDA7ODVRI1idk9Lg5ZTeNv39eyBcQLe4OhZa0qRtVPw SucArsaFJwSxz8IEVNGpj1wuj3UGwbY8wkG5J5tDktndk3PVRanmda+pTsyxJ3BcuSEU psahxBfd9YxcgySsYfiEpYREMAl7ZsflSPTIEl3+cifjhhKI2RRiIc4IVbQ1BOD6HY66 /JHBGiao6B9/m3xs79AfK3KAnNhSprPUwK+lGhXIgMOd9DDn6B5/gTjhwYPypRdTews3 SwZeaCEdGNmn6SCIcwEmaTWbe5/VKMsiOjba1FKO8BsTfKCtAdBfYzqLYEpHbKuF9eWK RycA== 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 v7si130589edj.5.2020.11.25.05.44.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:39 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: rpR7q2VoG0s8W4xhPbtlSVhiybz6PeEvmkpbuuIHfHSzpMCtMx737PL57SLnnahLYr4ORoYIWU MMsTeaOQen1YlCu5JuOHdTOwFyZdiAqfRql5Mm6kpqXWx6YvXOx+r26wHiogTeIx+5XXJCkLS3 5WiaCkFvjvzkf3f98ppAOCGqAlYRKzkIeoTwPRxn3jNE5MenkuwCw5+YbTrwo1pax3PVxopIWy AuFzOqQmFgQUhBos+zBfkLt7GGADCIrlWDGKfRNAXjm6IQkzlESsbYiVs+qhVcT6qtSsM9Qx94 R2A= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597776" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:37 -0800 IronPort-SDR: yM+rS5+dK/IHHfsvY1bOWNj5Q/TUm4wCCSebrEONc/F01EgprQ00LEV4R1Jvl0Wx/RMg+L4ivR 0LfTY9ZA5A3zwTv0ziKIQwQqfrigrh/FSFW7z2qhCMbWj1o+RqfWKtusO1MCegueebJIqFWFdO 5U9b2PUkHv0hCeX8NfOxxjSr5XJGlTYkLSaN4lUI0spGQK7DJtVvUaZBNks8haxYXnti9KLOPr j0qi0+e0lacXR04MidNGg8gqa6tPdS2IAbWgSHVXe5QGFbzxVkrbLWZ9ARDgjoaTyWE4BkiNTF Qhs= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 05/14] deb-dl-dir: Download files only belonging to the current image Date: Wed, 25 Nov 2020 19:14:05 +0530 Message-ID: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-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.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?1684340086662250079?= X-GMAIL-MSGID: =?utf-8?q?1684340086662250079?= 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 Wed Nov 25 03:44:06 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: 212 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp372347oou; Wed, 25 Nov 2020 05:44:42 -0800 (PST) X-Received: by 2002:a50:9344:: with SMTP id n4mr1647556eda.85.1606311882544; Wed, 25 Nov 2020 05:44:42 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311882; cv=pass; d=google.com; s=arc-20160816; b=dXX2F264iTpglFSLfgGVKGvpkKUwGCyw/7x7f4NUomwuXv2cLaYL3aZshbXZw22Ejk 6bAfBVujh7+6hI+8s5vmklT0wI1JNQpaKFqoneMQ/BUPnmmhKuFBJ4BiWntU6myF1ZY2 tTWmXooEQ64etGfv4zhGcM/je7XfDND+N9ySLpDTUzX6DJjC6f7z/aB9utBzxueq2o0k aB3VLtLOSfdyrI1X8PaiFelifNdRa+otvMyWT5+EBPkBvMe2ELogoY25BhjaoPS+ObPt RGsfctpqrUIEZb7qiJ1R5PiTfNUBnGJy97T9RCBO0W5rV5OiGJdKQINQcAd8L87/i7dt HURw== 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=bWmVWSpEx0FZ6xQxIhnsKARAqy1xgZqqdt+O4foR5Yg=; b=LqF16bYfT1GvrQKiFl4NDVxMkOY1Ni9bC+8Q4+4kvm4t8UxWnCsy94eWGGEMEvzYuB sspJf+57sxAk6TIOjPNDPb9Jn1XDgXwDSZo87JZhlkUPsbY2RdZMWt5vb1Ait1Bf6yq2 qx5cXUPGFtXHyAllwXebvooEwb6EfFzC8sovPo0JAujTkha81T5mJUJed5wSlYdAaLd6 LCv/OFsA0+XZEiBHhHKTyXb95RY4MuC+1jpGpyRSxfiAq+tG0/2YVgdrB0EOSrHkuEmw Pb7j/MITDOMKaLnW+85QswYQhtTu0YlO2ZZyk8JjgSKuAybrjTCmn1Qk7gPUU4A1O5Vm SGUg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=hk3S40sY; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsv77h6qkgqe3r6trja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBSV77H6QKGQE3R6TRJA@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 p3sor2220429edp.22.2020.11.25.05.44.42 (Google Transport Security); Wed, 25 Nov 2020 05:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsv77h6qkgqe3r6trja@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=hk3S40sY; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbsv77h6qkgqe3r6trja@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBSV77H6QKGQE3R6TRJA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311882; cv=pass; d=google.com; s=arc-20160816; b=Ef9breBKA8RnSN0chVkj8DDwc+ifT982tO768UAtASM3MGVzuNnkUNX8dcXumBCQTd brvMcstZ3t6uXPRRyiBjbRbNOkVwFJQj06NzvnCFHAcJzAi/cIeIS+8CguGjo7w/CwtD 01JsD6su7VaICHfCXDDsH/UA5cLmTULkJkTT1aGBIJme6wl7EDah/0PZaRKs0I/kvcsG +BEnRKHVUZXyErL4tGRLkgfIcAubPVvr7AAVu3+eVFHwXYhk183ejAY0c1psOQgPPSex hQBLANJ40ouX8Qmm+8BIgvzmffjY/KHdmFNfWzXswZ6qkh8m7NRYtN+nCNyY9NnVrJdD r3rQ== 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=bWmVWSpEx0FZ6xQxIhnsKARAqy1xgZqqdt+O4foR5Yg=; b=xvKlAqFrWQTIeh+hxl3You3cIq4Kn4fJ2aTA6CPBVVta8jyDuAUqxqICiTtXOrX0GP RsogERiygnxeh/jfX8GPg25xQLTu5cgj9iWHoItaJIX5SuTCgaVA8d3QBeIppYRn4a5Y 4k4FMXzrcd9nT02Oh63/BGcI4W+N8ZrgD8SxmAXPDm0t/GAClcrXQWAz+wpfCFiWXGfC u23DjZ4+ZLfiBHpP2K09R87McXfNQZtIMAXW74s8oBPRKtAgNlooySn6vtJcDFA86BP0 lPER/6K1tYnTq6SGDklyh3C2pW2l2ZTaL3CAMRKuCGDisKbS6qUXhXnhSABxqj8Czl3H 7U3g== 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=bWmVWSpEx0FZ6xQxIhnsKARAqy1xgZqqdt+O4foR5Yg=; b=hk3S40sY3uc/JK11CGdBx8pFZ6hEKfrBhtW4+R0exeBwJrT99Vuw69RPttEiifcGBG JBd8BMfIibiNh/sl6CQgwVez0v9rRnJzBWoECWUEQqMtENjk7n/5c5F0hpSuQwdgmaMd m+9yyytpRWBG6gRk9sszlYgXphKLzoUROWX3aR712A074dzQgO5FU+tL94U1oIzy+t8F RjNWMWdtthYfx9BViJ8eKBJDLzCJyKuVPkXBkd5/r4xqI1IgDS2bJra/n/D646CWDo1c IQDK+ZVwmneofLKQFEeFh7X3wfyXrb+9QtbMsGxat5FL9MTFfWQc7zaoRXwRZjLE4Mgj pujQ== 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=bWmVWSpEx0FZ6xQxIhnsKARAqy1xgZqqdt+O4foR5Yg=; b=ir2h95lseRFnxF6D9raxCSXpVTGWKJ6UmahtGpNmw0Q1yZNygKOq3iiPH8Dkc0YsuV 84ldTjYrqBGN6zPn/96CK67SbqgldRKWqpKusutEPVQpETQTYT31c7oPbb8uBJ29tX4z HBpKG0knrTiih1Er3h47oCqg+oWHwDASSLySX6Fnn90M4jdaNc8DlRlL8VFiANx9BV7q BSoPkyS+wD/dl3nD2CHYFadN+5tu8Y2UqfmAwpJyHex9fS9k8gJOgEIGgZ5lTTQtthIF QbqFSfoKwUHER4Pot0fVTsl50xz2WbU7KYtvxy5nG9FbHvXnT1jhDilcNl0+2exFNMhY 8yMQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531/S9/OCEpiReD/XPbSWFSkQ83NoIRETOULXT4k2F6/GjHJlDJs 0BqPnQ6nl/WEZOXbq61AFmQ= X-Google-Smtp-Source: ABdhPJxlk/86gisEsuHafYZSxiG/ndJBKqyRUuIqTD0g6SYX56lX0F1eMBb4HFVW3gi6JZCQhPuHEg== X-Received: by 2002:aa7:da44:: with SMTP id w4mr3409147eds.131.1606311882281; Wed, 25 Nov 2020 05:44:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:c1d9:: with SMTP id bw25ls1097125ejb.4.gmail; Wed, 25 Nov 2020 05:44:41 -0800 (PST) X-Received: by 2002:a17:906:a43:: with SMTP id x3mr3077283ejf.197.1606311881313; Wed, 25 Nov 2020 05:44:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311881; cv=none; d=google.com; s=arc-20160816; b=05FQ5jXpFJ+qNYfl5AG6SY2Vs28NezVkK5CKGdB9Ekavptp4XSZOdMB1kWFxk9jvtJ 3Pn1tcy1c5OT0BLDKusvCZOTF9U4Li7oiQBuDjQj+xYMP9hw2aLajUvCI3wodsfFFIc1 9gd22dZ1ONIOT1U3ztlsNv3TsNcC1e3RigmZ5ZDRV8+RBM05gtAVzNIs3BqsFy1bghAW pF8q6zk0oSLMvozq2TgBNhprU+le7o7cZMa3MymFEc0zi0CVsMJKeM/QWyInNUdOlgUl R132rXzMn3u2mA6MQP5rDHSH36uxjWHIYDJ2V9t2tcruG7rNwv807GtPZOQbXNM0bGYg NkIA== 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=kIrmBqnwTuZ5icCRi9GPI6zPC1OZVrsKhuYJ8TxrgWLMfkG/jFGfl6PxspON9q7qhi IT69TjDkDfDkiQOhDCjmgcFM1o/mil4vEzrpyC0FOqFLdMxSvkRVMhyi4kdl0fNP1zDV N8PEA+agOMl5bIJvZKyIe0oimWHElVI7oULZDQNGW/hVOTza/Wt14r7IqVFBqv4oexmH U7sQs3AApdy36SWuGmMO9zzferNM/zImEUiRzKTF2kyKpqe91mhXI6nXj29E/MfdhNQh LeH3mSzOHYX/GF5qekB3RAk2x6V/swqJ6Hd7/nuXNTKat+hLUQXE1Z+sMPW9tnBTsayl TkFg== 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 v7si130589edj.5.2020.11.25.05.44.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:41 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: jxgyWsyB4nTnE9KXMlnX/RsmdHHOSC8pAqBTfsfVGo0PThdikreFCOQylTlisMO5P50njksqZX 9w8rkbX5w2kfB+kyzhk0Fwl57Sf+9vYoZ0tOYXSDubwFQOxPPlIl42ujwQMaIeCiVufahqjHf9 Xb6uFnmGyBOlCiRRtNPS963WUvhKBfn+ecBn9A2JlwOWpiM1W6CXQZbJoZPTHYSLp+F0nilC2s c7pJ7KoYPNHt6cR7FCfpym9Q3/CwWj9pKK29vyPfnEkoO5ZEG6rNvuFoTKY2rjA7WjOjTT0kPX WUU= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597777" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:40 -0800 IronPort-SDR: QUJqhOgusqkEIs5P5cOxtYkFsCl7n0B/AB1Hibm45NaySDa9BMgjsj425kDP5I7ZjBkjdYlcuM D1olnEhMJrfl2R2ibJuZHtSBvroufUlpZT/14OTkbZTwbTRF54DPshznrtfsBvXDKSf8RgGzdk o2O8PeutpVtn24LKTH4+yKTIEsXDR/GuzhSyQv7cwk6IDo1dfzmQEFrNAKisDg8sQzxZavFlaY /XTyZws3jY3f0bGmHeqV3bImW4ivK4K/mXMYA1C57iTR3ZN7OkJ6zRPta8he95M6xFoPlP22jU ecw= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 06/14] deb-dl-dir: Factor out the mounting part Date: Wed, 25 Nov 2020 19:14:06 +0530 Message-ID: <20201125134414.26061-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684340088428220053?= X-GMAIL-MSGID: =?utf-8?q?1684340088428220053?= 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 Wed Nov 25 03:44:07 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: 213 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp372391oou; Wed, 25 Nov 2020 05:44:45 -0800 (PST) X-Received: by 2002:a17:906:4551:: with SMTP id s17mr3078616ejq.545.1606311885770; Wed, 25 Nov 2020 05:44:45 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311885; cv=pass; d=google.com; s=arc-20160816; b=dHjJuERu1TSBiyzDszhqY6N5g8W/VnOpfdvSzV0Td+6TvOVfgEBY3ythl73+27SP+u Pal0xtB0W8q2rDHkJSo2euywDUZ0CpCIZjH92paydNQ7z72XgZteXVwr67IVzTXy1qr8 CoMdniQPpnEylHjMv2g26FCeW6q56mDWraGl7l2SL99Fh5pYuOvz0R5yXhPSr/4jj0sd llIvwt5S2M/b0gXSf8Gb+2TpkiKf+Qpu03ci9KK8gKI4IqVtlckVUawMzxKWXvOxtNuj t/EE0PE1AqIbzgSF7ScLBESXiGk0bKRMs9HqPjn9bB0emLVHVsSoYgeFdwK+jF0kaEGZ 6v2w== 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=K+akWpj3R6dZexE9JDe3K4+R/9lUIUaNKUKxbqMdgcg=; b=FHZk4O03W3FtMKQNch2fbTUYZ1kXfUwSFbo4bviSGblBnYfaZwdJQJboFY41+Ee+2J SIHL7ptzf8+ttmvG9gpmbq0FhDPpue/HbPCKpssUesUtdQMvVj/2Lm/YWFd5S7NZdJAi /mfTld3c4xQw8xUqXBTVHhNe71osPBt2m/gKeMjGTBabzDbz8wkgwRM5EuZzUbT16L7C +dzRRkYtgKyt25uqrJ2eE7EPhjC6C7yp0V6OFasqOl6MhxBYkAgXoaml069Lb34yOkwz COh+IrH2H/65RwD3yUVmRWC/RuPPjk6arfJpIR6sEucg1joMhU2Tqx3HR3fqzNMfXc4T E0bw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=M8977bAF; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtn77h6qkgqetu3o4mq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBTN77H6QKGQETU3O4MQ@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 h3sor2192805edl.20.2020.11.25.05.44.45 (Google Transport Security); Wed, 25 Nov 2020 05:44:45 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtn77h6qkgqetu3o4mq@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=M8977bAF; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbtn77h6qkgqetu3o4mq@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBTN77H6QKGQETU3O4MQ@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311885; cv=pass; d=google.com; s=arc-20160816; b=hbnqe2TO6RXWHfubNjDWm6HGKE5iz3PT4aJk5FKP+ZmQspYWvOs8BQVwtvjwqGWzKT Sg6kooASvTMv2uvbHYJiEirm6MRpZUujaEp+sH75a2RrPSEXKhaKwCsfhu6FqeQTLfxQ 45N2pM12IQfB2lfFGhi/+5uEJY54s/kch4EkCd9fVcHK/j/xJUbikbDHs/ujGLM+1W3R DbeF8rNwAP7gi33EkRU0HIExxK+BSVJuXrk6zRPsquCbvrzJ8oxhPwkklOB4IccABZrx 3yrcIvvqbTqEw3uLkhUmnm0cSrrhKCgrwzB5Yh49Yl606c0/ZWSnVduoqQt4fmKoXel7 wa8Q== 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=K+akWpj3R6dZexE9JDe3K4+R/9lUIUaNKUKxbqMdgcg=; b=iCzofPt/tQBkDF2MxWkegPImvlqrbLxXKeoKIjrPjzk+w9N6g8sLTMVhQyu7JnxVdK KW+n59WCzVEWyXdWX2w4OuY6mx4rWfkV0Drv+1tcBTSrOQvxQ1pb16k9GN9LcXrv5xhu wj/YyoA6D14MKwHGFUpge/IFW05duWMOlg7111Uap12vMPNGoI6IjVNyBGEi71/aeO92 ymK7CLCfFTqawbghJ/t8SHNaIAYnHrS/I0st8s2NovPMdcH5Bu9H1ZdDh+7hAwvUuiso i430rfgpm5EVTpkb6ss+q40kRcWkrM4IAdwOj7mIACynD9mNzGgs3PlGrKf6Ks1JhJIc fyow== 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=K+akWpj3R6dZexE9JDe3K4+R/9lUIUaNKUKxbqMdgcg=; b=M8977bAFnOJQddbHdZBmDIa5lVUiQniFwuzinBDbcFLk9yZqDRjVIxzy2gclWSV8K8 f0POnAqzARQamcM2+ttT9jSWTwhESoMDSiICaBbKjKs7L1FI8xfJ4FM9EEWBbZC12CSO IlKgRhVRim17zep+Gc3bCxAS2napGVzaHlqfdsom5Y1eX1au/pykNjq730bCqtG/pUuZ +UIKPmDQDIgmY416hgmt1ID3FELZrGg/eA1tBSBAyP6n7mFPXw+EyoSR9i54xeMqToIR 65oj1jdeitMqD32lWtrhgJDClboYLehZbAm65Z2IWzZoQueHVfYl2iy/mVSzfvDfORUh af2A== 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=K+akWpj3R6dZexE9JDe3K4+R/9lUIUaNKUKxbqMdgcg=; b=l64LclG4dOLkYCYGWKuzsO2zccu3504E16MkuA0DYfsBcIuDcCKMIfBRrNe7RzzWyv A01nK4WnlqkiqIqgCJUvj5VCMtLQ01zOAVSVYi640YSnA/Tivece56U/xK7AwdCuZlCA tIC+hUuDaMybGCviXGnm1g8yCcnrdX8cfCCv28xg9kY3LZYYUnXHs6I3A/HFzRsMCrk1 V9s+f4HtS2HBNYknT9QiM+hCxkWaimkxsXKW67gZb+r/PLLPW3x3jPSpXZ1WV8hyehey RonIuaJGigBzDkgSoONWGUokksJ/C9FNDuHvQUY1zate9h/KRm7Ku5cl5Ft9Ebsk7g/Q 9awQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Enwtu3ppLkMQxrvLxnC3HcZZHquezVVU2ywGkJCPun9nCZTH5 b5SkEz62+bx+1ITIJGyh1Ts= X-Google-Smtp-Source: ABdhPJxzLBESBfNdV/FcMwB5QL92t9YBLaU8hMIMjvDtxg8EClPob0w4esgR/3mQeF7PvHpYv6pAHg== X-Received: by 2002:aa7:c54c:: with SMTP id s12mr3609638edr.175.1606311885521; Wed, 25 Nov 2020 05:44:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:4396:: with SMTP id ne6ls1105427ejb.2.gmail; Wed, 25 Nov 2020 05:44:44 -0800 (PST) X-Received: by 2002:a17:906:4059:: with SMTP id y25mr3206879ejj.498.1606311884587; Wed, 25 Nov 2020 05:44:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311884; cv=none; d=google.com; s=arc-20160816; b=qA8pf33FJRnB+4Ou7N0CdWBS1NG1QSP+z0G5fgB42wozXvGqPZ69AZ1IJesQ7rhXLi Q0wAtMIBCGn2hQUEJJcd9RdQhcapeLfUp0ZywwST4rFr/gBPLadIFLIbSXf0+r9O1HWo bBstbUzH38bUR88ytWtSNHoELaK048VwUL3KSLUoruHX2lZXOq0pZY3FX+TMoYW6m3mz wYKbcS9ShLDH0qYhoSos+CfDVEbPd6O2xwlrvOdT6WKH7A+yWRQJnv8dOuUgsvyWAHBo JumHUedByfLc1irkPQPJB4eOs96D3FHiw+hX41zGYJgH2ldl8TaUbvqOeQn8vzRihFxo M8wQ== 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=hSGBFjXTh7+TmTws0nMI/tRHv6R2L7fIYUp6rtKIA3mRBnJOrnIyuNfg+t7RSvLDf+ 4ut9ZAPNlrsV/+5m6+mWZCLG6GWsfyWuEeB7Kt7mqpz4SNtLYABXyHKqBxdIcYWKxS4j AFIW/PDtWoxieNnqxnboc3bFigvjO6R0YMS1sYK2EdtsRImVHxnBSOWYY5WCMOSyz2Ps xHYQEhvpg1maUWVDdDImwQbYvqvMgLnYbrM6frneJ25w9NxFfwv3/JV+TG3dvDAGDQiJ Oio4o953gO9sVQUnIA1Hm+NEEC6dnYWuECBP5FxBeDEW+hj+ti7g6hAtbNVCqWtGmB1U BUKg== 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 v7si130589edj.5.2020.11.25.05.44.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:44 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: qm6FSRRnCDqSNqxCgEv7Wz++kR2D6KwvLeGNtCvBNXOgoaklLZEGex3a5p4tuWxFWQ1slddY4d shG0dQmtA3d6wBQEg33QpHpCfhALxQGHpr+1HBm7G4jgYN2mRN5jaI6prIMp2U/eG0mUuJiCw+ AsD6YV9bgwuyGDnI1/UpzMSWnPGdDE+e3uJ2I5nqU/4K5HJ9VYzIboyOG5KL/HAf2jzRdsmhH9 njbCcnDffcMPBDB5QYPEGWF1Kc4dhs6HfVznccsedgrJyb15kPNd2n/b2tVaCJlm83QFUkxQ54 Rxc= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597780" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:43 -0800 IronPort-SDR: TcGe7QGCvqBSv3/YsRXw33AtYv1FydnqjUJOnSUD5u6FpnADgNjemvy6S+UTCGmV8I2vayWsnv F0OA10rqq9MVdogY4hzBPL8/Mb5h5mwND7HuYubGoKGP1OQfPvIoXE+j9IPKhtfoQbLrSOossx AF0jzIBD6LRVj4IqkJFbKScFltyoyHzCv/EdF63d26D5uIQkdh08gooXiBr6fr4feyNEolm1Xf g6BnmUA+FS74gHL1354zxBl8pzXRpdBH+jdvDdWcsUYrgmB/oQoIXkUbWPS1XQkpqy1v3OYh51 lao= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 07/14] deb-dl-dir: Fix skipping of removed files Date: Wed, 25 Nov 2020 19:14:07 +0530 Message-ID: <20201125134414.26061-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684340091695279670?= X-GMAIL-MSGID: =?utf-8?q?1684340091695279670?= 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 Wed Nov 25 03:44:08 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: 214 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp372419oou; Wed, 25 Nov 2020 05:44:48 -0800 (PST) X-Received: by 2002:a17:906:4699:: with SMTP id a25mr3183461ejr.284.1606311888569; Wed, 25 Nov 2020 05:44:48 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311888; cv=pass; d=google.com; s=arc-20160816; b=zhXQ2Q6T0TEtUEQIfmBM6Un70eflD5MwkEUOvzS31oVFFxkaKgQlQypfpP4lh9zvZQ 6PC8JWPj81sdzHG85uJDUfSvMJ27UxmPu3hbG4XB2oIn5DQa1TZUO0Ib/Xm6c7WppNnN Kl7dfhEcPHpB+O/ONfgeVC/S+xAweWu78Nnuv+eXV8FfLuaOG28yBNbHM6mQQr3U4jbB AslaK7AFDM9iZ3Yd85POXG/+NUBUCdUPL/0JJErdYVeWnCjLgXMN69WXZ9wXHAK3xSXQ BJsY1iRgEk998AyRmrC9d2VuKdZ29evXASd4/3kPxWjuQd5xhZQ9c3vjRLTQYOCpxUmi K4iQ== 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=OcRTle8hl7OCZHsPSCaBCJwczyXBVCpWFAxatGjiubE=; b=s3xAsWXsmuFWRXvhNTFSmPblH8I4yEtF9snNs+QOFIEtlxOjwFa8a1dcz7U52VMoqJ mzBAbwK716LVEb6NJHPk6d8v/6xx+gnHFSUAazcjS5aZPr9IwWPzPX5PwYp24ZmQ4gAn dR8M0y6F3GI9SQm0f2Lj5G86luZRCXdpyOTbGOYyAva/U14n7sxHAzCCj/c76ubY+dnS U8m6PMmTBp9UUILbWA5ZMH6pZCEQmCiDtYaI0+muIgyarVdipQGxqqXrGN/zPYIsh/UD myi7m0Frb/Kw7jI0Em29BTGrdly6v+HBMlNgiFkcEWBkglh8r5m90XgDww/ymrlMG8lv Pqug== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=YkGhaoCc; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuf77h6qkgqey27uxma@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBUF77H6QKGQEY27UXMA@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 m22sor2255653edq.7.2020.11.25.05.44.48 (Google Transport Security); Wed, 25 Nov 2020 05:44:48 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuf77h6qkgqey27uxma@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=YkGhaoCc; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbuf77h6qkgqey27uxma@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBUF77H6QKGQEY27UXMA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311888; cv=pass; d=google.com; s=arc-20160816; b=Ec24sje9zgkV0VRZWLVLfmrt61sL1CeDmx+GOJW+lPRkjmc4CgkUfdrw4KmFc4lhMJ 8uESZ8M9Bw/tHrwsWAF5wxdhuPs8RPj4VlOD31F3iENPy/IqeXVew22/njPAFp4M60mY Fhk/V+DCHQdrdEmJIzVmJgmJ/Q2czt+KrEIuhuF+BQnZrJki3JP6Gaa8bYdDp+AeehBc goPZo5x8SLkW7Mm9dpMGxy138AHtgVoBwh29OcRuf/NeHmgIUAA2xJAId426/hqXlJBi saRvYxQ+T90YgNiSrZHPQLFLGJc4P7G0RVFEVHYJbNOc4+vuXJpziAwrBygr63417NLP xDow== 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=OcRTle8hl7OCZHsPSCaBCJwczyXBVCpWFAxatGjiubE=; b=phOdhuXYnmQRVLbcqIUiOec7SnK9zwPwTlFvIh5WizYtj5MoyuQ52Afd7/8mi50tcz W59OtvmGeqGO3yr9bxE8SDUhapW3mJX+wN+SCSsCdKgbiJ2pVv957i7JWgvjeg8mo9yx gHYGdkD27B5/nsNqzIjNPqxKNlG7JQKumdJCDOsYGQHY1G8hkMOjL1iucJjvLosXCyqV Aw3Y2OUg8sS4GA8t64P5WqCbpphY2P5C13fnDuJcMBwpMSw12NsmknInrqfGAY2W71T8 UdhJRKOerv7H0cE3e6DRF375roAu/G6BlCqzz7m0FMy6wTE9C/HZcRASm3GsVi5U/+kw Gidg== 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=OcRTle8hl7OCZHsPSCaBCJwczyXBVCpWFAxatGjiubE=; b=YkGhaoCccDKtfvKhbxhXzcq99n3kA0kysFB2OCYYbP7vADIwPQD0XeSd0F8MNxUNQK T68Krcyg5C5WDAlcQRwDeHV08EzSyIB1gfZGY/Wr3L+RM5IozwZL6r/GvvlpfN+sZkY6 HRGQdkE1rvguvYK89gGAB2ltBK3Mvfk1qU19h7UtuJAqxoTjJgI8GOaMrO7IbIV5zt7f 72adjhE3fBsg4LNRnoda/ODilGsgwpD11dQbwy9vydsATHGzgJbi+Zohb3omNNelH9ZD wU8NX72DtCUC0u8Y43R9og4sfgz+UJqoHbWZKYYjRBh4C3NtuEB6Zebt3lFqnegiRy1r qSdQ== 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=OcRTle8hl7OCZHsPSCaBCJwczyXBVCpWFAxatGjiubE=; b=cSIO7txzBHnE2NTKHRITgguF00ezx7bHkgesJalXk85Jol03HFTPcNGgln4CC+dy7V eqLQ3WSUiNDK8SeplKsLRVolE/pf0o1H6T9rCO7wWurPWiBPgDujfoEstc9LV3W/+Q4P mUTbslkWtDlWT7MBStD4wEM6wxWA5kLaTk0xiw1drd0nViCld+0n3z0seOXZj9S7tBfB 1VxQi+5+xCqlCuKK5S3bcPHXbML1AAthL1i/+e0uaDzF0FlgGffEqMjjNEu83z8PBnrV irvEymMa1oj62oiqILOYUtPXIzs8CoNYumCsfNTCED29qQR6lgoAaHSNa5aAsOLZnMAl I3Lw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5330HSlDgIq9LSopNM9aqp7za1u5XRE18nxbGgOuYo96g8FoTar0 1wt6ktebVQzMHlx8QR98CGo= X-Google-Smtp-Source: ABdhPJyBB+YM8EsY5Fgtj86mtcw5pRzLdrG315mCXRUqFCMVHoxzsj8MEfnbjz/yANGGE8LAAKMqVQ== X-Received: by 2002:a50:d6c6:: with SMTP id l6mr3596975edj.80.1606311888326; Wed, 25 Nov 2020 05:44:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d151:: with SMTP id r17ls458581edo.1.gmail; Wed, 25 Nov 2020 05:44:47 -0800 (PST) X-Received: by 2002:a50:cfcf:: with SMTP id i15mr3487342edk.351.1606311887413; Wed, 25 Nov 2020 05:44:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311887; cv=none; d=google.com; s=arc-20160816; b=osFekebvu7a2H3tioPRajx71SZnQuNBn2MXXkzNVXRV0x3UH9S6S5Hfb6BF5cG+8+4 ooSls9IlSvcl82uDeSMtvoxb4HTNQPFtjk+1iqK3GtdNT9hSGWiQFpT1ZoUVVM3ZssQt hYBJsahRKWcndggDIFEfkI8noRcbgd5vPeFc76whEWCpiM4+ndhyz/vVDLrDOhK2kUJ4 H3aS/fNLSybwhO+dEiiFjhJMtQaQCHUOMiRRnAzs22IplvgxFxftLm34K5nVF1QNoO+K B59siT7dqnyQbAQUw9yVXGKb+SVO984s8zMyjO2mXj/4EwrJSyBA+OzRgQcpAidbsXZX nCkQ== 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=lYyyWV41QjzvLy8ogVX0DPIRK09ZN1714kVnTjs/ORwlA4yTyn3c5KkDg+AwUhwbq+ qvFkX8MXtmlBNM3b3kgrQEH7ZAbOVjJbyxfTmZPxuYd31ZOM/4KqLORjhXGoJP/TjQCl riwczt8aa4B3N0cFIKYFZNR55JYbPDnvsUgZv8lJzttdJNrZ0Fho1Wf66lawNNWinLeh 49dOYVQdNezD9bwCavfuj33lbp+Gm+CwsFpv1SMMQNzhwNgKr4TWLn6Fs7GqdNlsh3iG LkA3q9J2iCasGd5SQyxrJFeTJSCwRf+7jSH0XuXqO7PwFF7lv79eA9Tu74vgNRUGlF0y DfRA== 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 v7si130589edj.5.2020.11.25.05.44.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:47 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: 5pEajxCeo3KqMO4fNPyibW85WPv0PqD4AvdM3q8KfHZvCT+QPZ/Fpb143AWy1e/pp1XWBJicVh FH5C9rIXNRilgmhEPd/NFymtupIYEMFB4SW7ebVSf+gRUzjCHfyGLR09uBwLm84+f9QTAINChO zE4UEz/myy7B+7sELuBmmpvat9RB/L31lmObkzDGhrrKNY03CkjP0T2DQq8V6KQ6zmD9xW5ly7 1mPu4ThVvy87jNmVZFD5JaRtaYn0v3sbEaQ6JBAD5UfV+977WzTmD6zLaS6BANbkabgpZi/ChV /zs= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597781" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:46 -0800 IronPort-SDR: 28kZmAUV9G6kbxqTvHkDsTlawDGMKfPgT1fiwO6WovQmOMJG3gZ3qodlMTUB3K/nIn485Ju0kt taLtgR1SQZ/XspnEMmTWaP2+aeVGNwwO/0pmOigKwWOyH1QMP/J6n/EH8Y6H12WxhvvZIuSVTr OnGgQ0+LMvwTzlMLFkKNBaEhQ1A3wElyzJTWfI9w7OT8W0Kg9F29nWdyUeG5l4yg4RWof3zJZM okkime4ONUOazwNHT42foQflEz2QYxXtDp4q6IroQuIGHP2MWD0bX9lRONqJG39LKDNg+BIh2n bSU= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 08/14] repository: Add a sanity test to check missing sources Date: Wed, 25 Nov 2020 19:14:08 +0530 Message-ID: <20201125134414.26061-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684340094924817529?= X-GMAIL-MSGID: =?utf-8?q?1684340094924817529?= 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 Wed Nov 25 03:44:09 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: 215 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp372454oou; Wed, 25 Nov 2020 05:44:51 -0800 (PST) X-Received: by 2002:a17:906:17d1:: with SMTP id u17mr3162196eje.6.1606311891799; Wed, 25 Nov 2020 05:44:51 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311891; cv=pass; d=google.com; s=arc-20160816; b=kyYwBabdSoKLl8v1ZZWGGwv0RiU/RGUN4wIUVFFVfT7Ok9Odjie9CoqiMg4w1b6R89 qGtv0hI87WQTYZEVgY/imNZkoJqP3cI8w0NSgz44bbHYg7hd7kvOq/Se0NLPk+7yozbD GzMPTvNrEwempt1p43Hf8NfV96fBNFmZlJoN8mpATG7Dzpg21KxkM1uKfz5bqP0rfX5J oH3Xa+Bhx0RgEXVDRllmFky3zOrPYFks9R+haSubzKychp+pPlOOF2DGn9ab5S1A4f58 Ctfjv8z7UDjIgCNl8zm4/906MCB3cQWEZk+PTqvhVZZMHYi+3C2iwmcYjOH/2eB5y6HS 4i7Q== 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=5cELYBDm0/Zn3S7y5k7pp88YHSl/f/RVvzFDjUvwsJ8=; b=RkDB3OkyJ1f/mPDqnULLmu2M4MiQ5sUoDMFu/YHANwQClRzKEZTvqzGlABkeFGTi/B rCeZAmUS4Pg87Ymj8bZWO/aJ9CQbcHHu6Oq0U/XtZA9Ogk4oY1fuHChrhXL/7xN/9W2E cNdfUWYgJl9CB9qOxTvBpQVrpg8+hfQFhIIVkbeiupmxWLcrl+aoSxTXabNcSqbnn/DW SyJQLL/ABmzYK26wITxX+lyKSou9co995EIPka2fzLcDAvJTbf37fYIqlmugOOV/V7LR LyzurDf7HOhcDPjGHDn4SMD+eypI73V1YCwmPwu8ZP4N3rGIqmqOcVx1p8slwkJrcmRI e2TA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=elIIBdS3; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbu577h6qkgqehzicqsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBU577H6QKGQEHZICQSY@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 t11sor1452478eji.25.2020.11.25.05.44.51 (Google Transport Security); Wed, 25 Nov 2020 05:44:51 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbu577h6qkgqehzicqsy@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=elIIBdS3; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbu577h6qkgqehzicqsy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBU577H6QKGQEHZICQSY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311891; cv=pass; d=google.com; s=arc-20160816; b=MO84yHev966aVptllKB3v2hJNhigfcRZ+TsSsuRue9sZyAfsYnweSHOYQ6O/WBxp89 xkGlhlIGmmyizATJZh5juq4o48oPI55ZZofoz8d4B76KllTifzfh6XNbgifR8lskJ+cz XcnH6JygE44fZNZzNClmCy8uaQAj9yXdLQ8Oqg4MlH5GUknUrtKJwWvzkD6ZrX6YfPJI TReFA1ebjCggS7yh5sS/Ry7FnxPkohLbU60T1tWJBSM3r6GlrP33INO0XBbtvXBDyQ15 hhx7OrDaMIqtsqMJFeUeL5mQUoo3SLg7UqPI1SbzilKFEzjdVzq3kHUwgdx9iReIPZnl 1GcQ== 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=5cELYBDm0/Zn3S7y5k7pp88YHSl/f/RVvzFDjUvwsJ8=; b=pYlXy8UobtoO4dY5k9sJ5xtep0/Zgk6RGQM9gHwuinKNlRGz3MO/K6Ypif3cy8Jiw4 HRN/zjILtC7QiT7MD/+anwULSr12kV5olX+cY+MAVcXquuvUlntMQF56OOyANXfOtkYP dwORR6uh1ybQ4LVUw10DTk3rMlug34UyqMedQjp7D4C9Gv047JEGqG7Pf8hGrHII2d72 H9LLYe7kG89uYlPDVthCKCJv1BF4jJjOf05MdNeFXZ2pTKp6Zn0Hq9iDnhlfRgntwq3F n1qKKw4ozihQk/NQa6EwxrlWz1wshVW1LI7VstmkkpFHtmQXmaQCGjRxtQ1IzTcXXInA 25Vg== 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=5cELYBDm0/Zn3S7y5k7pp88YHSl/f/RVvzFDjUvwsJ8=; b=elIIBdS3BiiZB7p9nI5NqylF96TLaQWnEGmj02zWqvwoILgfrvCiSrMyNoWsuyry9G g7L69KFi3NF4p+zeaIP4omuylg8GhcwAMDJIkpdTM2qqGuZuERBfsSc+khEXuzD2BVvt PV+8DnKVsE5rD6bp9nELsGyH8MPnfxAITGC5n5AtCLD11Ckj5t90IMpT+Yx8aRRxLDkf WNYpgFbjd6oTNVDUoO7YMYFf72wsAwpMuf9/Wmiiu8EqtU0GhimzJxcHFo/xNkE143Y2 FFB0cM5HL30uxpsDf9p/yX5nsRgCWrXMTPGg9yu7xP8jhLAaVigGo0orOt+/XdUxW6Os 3OCQ== 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=5cELYBDm0/Zn3S7y5k7pp88YHSl/f/RVvzFDjUvwsJ8=; b=Hp6yX5mrUhzW2UnToPKcfpKqRNKvbunV07uB6ycyyGrdtrKFJoBEH1xT/36nPOnSwe 3GuEWPn71IBBDiLcFx0N933Tea6wWgKoeHqYX3LNzM2tqhyYZkfuXCuSDlaaSRAwrToK c8L5ZyWcYY2t+4JMa85vCsPw9B76grDRR48uRSJq59RZ8XtCQ9x4+DRFeU/6aa+N2OR1 oR4gPsSrh+uHnaPdRmSkHeW1X6pavLtViHRuFCeReW+wK6jkU9io7TjSo5btNVD23j8U PuSeo7CN23PNQEvV6E1F33RHVIzxZG3XnBIeGfqoGX6aLrVlPiZCnUe5txYTRz7o4fub JbNQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531YFLr8lYub7vCHT/6l6oiJDAN/OUKqvFZa/N0SY0V/3KjAxzNC 5WL4BvpOQ8S2FuULqZrLNng= X-Google-Smtp-Source: ABdhPJxcnnNhP3S3CWthbMrHQ7BN0/8gxB4gOVNJVnrnKphND2OC4XisfeBC5EWCvV2GYw/9b2uNaQ== X-Received: by 2002:a17:906:a186:: with SMTP id s6mr3220412ejy.193.1606311891398; Wed, 25 Nov 2020 05:44:51 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d151:: with SMTP id r17ls458697edo.1.gmail; Wed, 25 Nov 2020 05:44:50 -0800 (PST) X-Received: by 2002:a05:6402:19b4:: with SMTP id o20mr3538650edz.103.1606311890600; Wed, 25 Nov 2020 05:44:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311890; cv=none; d=google.com; s=arc-20160816; b=ienTgazD/K9p8IFLmTTMgKBM2X6a8o/Er4bIS5Ea614Dp6BCn6StCcdysghbzmiRJl puzh10rkxkfaJYppSNVXRUhkk+BrlsmITiPFCxNQ4IF6gplNqnV9jBJNwDIkslqFjOZF n6i170OQRZ76oiATofkQXJSs+DjQKHXtIhU86O+4NgKqcJ27F6Q+5TzIdyfX9lMsVVxv eJEY4kGJwQVq5tgrHxVIejwZe17FLGu4606RroEnRs87PxkRhtAMPhWPn0/ffMCI3VHj EyM6pk0j8k1+LKJNnduscKWQrwPUWzJwA3SuvCWDwfllPvdaAhENz8GItzML2ayH4EzX RzXA== 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=eD5nNJdjiXtfTBDCd6FrgK16Ls8aWkQrvlXUBABmzhYy7hcW6mWXhzv0fV4nV5q0as J8019n/kNb7sPFF8RTuCj7Aofmr0c4m4Rxb20A5dOP0Yg9zzgqfl2nmeJ8dRHVewThhJ KN+u/dxrCHTzyXLO7nPFpOyJCwYFrPZyHxAFjYJOVYElqjdh4EX/mX0uVEclR6AaAvmk RPWLvrSXgt7M+gYO5szGHfX3FUjllIkUN8Z6yUAbwpYyRoGqaYxAjFrNNXFsd0b6UI2E 5KRUrGkaSB335WElvDXpD+ckql8ZhaNo3vKZs/o8M5hh6eCJb91T90JnelvAAdgkBDFU tDkQ== 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 v7si130589edj.5.2020.11.25.05.44.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:44:50 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: w/70mdxXftQOsQXs4HBQY5p49SaGs10XrWEEd0D8jJYAqeashzQ7NKOR53/vOrn3KIXajHPl/w aeF6fpPTwEPz4AOE1bNFtFQw7pwvHC7fzEo5lJIuWbzf9tm0ZidqCHcNxiOWaaXgwWZPN/KLhH ewStThb3Ky1Lujvb1NWDL3MQMXEEPJ/1Fi8q4oOaH/ZmdeJlVnWygW2tdVYzzfIAXgKZgF6P6Q EZUfxZ38LDJwjBXm/6Kae15uvEAw4Iz637SmmxeEBq7Yd0E9LxVlYkVLsE89w+nO/A1lOcaoFk 8jo= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597783" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:44:49 -0800 IronPort-SDR: dTE+3DbF89EIwtTwwGIGrQ7HC0JwsXDV8dEhhmEdoQ9e61J/TWn8o8pc3u8HVk67gdncp9N2to 4JpcFRLwTzSmAVTXJoeZ0bonF7gp68g95sPMrOaSixl60BLCzXHc+6CNbfuuRKm8JCp8Po+yF1 n+RVe8nASo+3PJdqqXPHPjiNUBMiszBt5PtXLV0cyibebkd7WidM/ErSM8UapLl1w45/azsLlf 21uK+P/hnGa8SvuL89r+N8LgXk3ToLYa679oDHteCCTDn3pzK45+UwrT0Uum6VJubF3GXTKvGj IKo= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 09/14] base-apt: Introduce BASE_REPO_FEATURES Date: Wed, 25 Nov 2020 19:14:09 +0530 Message-ID: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134236.25878-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134414.26061-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: SVR-ORW-MBX-05.mgc.mentorg.com (147.34.90.205) To svr-orw-mbx-01.mgc.mentorg.com (147.34.90.201) X-Original-Sender: vijaikumar_kanagarajan@mentor.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) smtp.mailfrom=Vijaikumar_Kanagarajan@mentor.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1684340098247180390?= X-GMAIL-MSGID: =?utf-8?q?1684340098247180390?= 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 Wed Nov 25 03:45:54 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: 216 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp373615oou; Wed, 25 Nov 2020 05:46:24 -0800 (PST) X-Received: by 2002:a05:600c:256:: with SMTP id 22mr4019981wmj.120.1606311983899; Wed, 25 Nov 2020 05:46:23 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311983; cv=pass; d=google.com; s=arc-20160816; b=FKs9ibW3cSScf8Uu8sb3vsRszpV4iZkK9taCjU36WozedMEgJ44uJhJjIGjDx1A9r4 2lKcFq1a9GlObF97zLgBJGnwiPCU11iOpBW0Vly9CVWPyh5voAnioRa+OTAoMixbxkIs KuCp+n6RiVF830xA6L7+Smk4191v1r1a8sbKjGk0/hBiPMI2BCmo8lJxGtOsGtF1oE2A WMDSEIixIsb0O/0N5F1aXvaTkRkA9Nn2qz7FbyHWDQDrIRnm0d8taUA31jrwZSmAbeX9 H0YzVweCNjmJTSNHZcSCG3h3PVtbXz6m6+yrnzrNS1uYoZrzrTpHL7kVq8qpoTWV6fSQ JEOA== 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=7DFFbizbDu/NpdXvbnyE7npSA6XHmfDbvax4DlKhW/A=; b=Wl4VlZbxcc8ESp6pYvhNliojanzV0YaABDRZki+cmHhaN9zIwwvWSCJMjMwK8bhmvR esr41VuR1m0iBXHvEEQdoHEHLaFstajTXme+Kl+A1KFeV/r/bXXdevWs5oFCZP1DGW8f ZOa7a70p1xK7BtQ8M2BXMyALfjentb9gJ/jdQQDF92zSpyp6MFuAgGgd5DbbRSXIBebC Sprd27hkf+kUN74a9H7ZsH/sAK8ibC5/lBDD/zEHEh60CLpDDL5yh+LXST40iUbqq03x fPE1zYOGjgCAYzhulCmaB8c2lhvG9c0D4+nEHoOh8GwSizf1RnJYbGAZ1okUEhisTFzX gOHw== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=W1XJvF62; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbl6a7h6qkgqenvbsyiy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBL6A7H6QKGQENVBSYIY@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 f10sor1218432wme.23.2020.11.25.05.46.23 (Google Transport Security); Wed, 25 Nov 2020 05:46:23 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbl6a7h6qkgqenvbsyiy@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=W1XJvF62; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbl6a7h6qkgqenvbsyiy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBL6A7H6QKGQENVBSYIY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311983; cv=pass; d=google.com; s=arc-20160816; b=Ks1AK58ZgX8znTj+Rr6zk6gPrdINpyaQ/WMijcDEfbY1JR7Lo8U/Op+/vjX2qhKmvp npY/9TYridtDrA8LdDLnrFkM/j57LL6xub+Megg1GjAbDLYdCbHlF77G3bfRkLEBaKRS GzlRnHtG9tEXvtW+2E/bkmbRDNIKX0AkS2vZZ2tnHisUanswfSMc79tNZPEjKnWbbL2Y f2M8MsiK5yE7mijgGJTETNwVF2BnSY3c35oGvUjOdgPwQ5TUMR97U9lUGg05TnLFITAS nqFB4er8QTqTm8EXMo46ZiEioTMX9cvm83QL2N7jMANrNp+9/4zyG42YdSfYWQhtv5DX 3shw== 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=7DFFbizbDu/NpdXvbnyE7npSA6XHmfDbvax4DlKhW/A=; b=qIV5bBSogYexxcVlxVjvizpu2WgEAZuWOmvH6U+ZSBH7nTLHjKRnx1yAmdOiIemHff yMbJaQ4L4cv/toxJJb9HLwgo3Vsi7NEjdXK01rjXrxmQDofvNX4gOF3PVX0IWxt0+qBq vM+IoelnlyjMNGAz2MsO7smXGBdNG6fVS1/FRjpgdNhV95FHRZGc/wjZLMsXp23HG13y 7HK00yzEiMon2awIqkw+gftG0Zt8ASY/HUV9r/X1yTuN6DeFDInTTC/6MBWjizk8bYSf fDAcKE6L5EbPYlrNUe6CWJdwxQ1lwX4ZQVbzOavzNDRqSHbFyOl6N82uwusOKKqSxIdE rR1w== 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=7DFFbizbDu/NpdXvbnyE7npSA6XHmfDbvax4DlKhW/A=; b=W1XJvF627OLQgW83Wp5+aY6TFJ5FcRlHqp7VD33/zi12uxYMr9sbZY6oeRJ/KK2jXq nNhM5RRm90V21AvUlHwvRRY5QF6beG4h/N3BcLEvZ0SutTdz9Z4iAmwXSQQy+UfK8bYZ Tcs3OQHMPYqSkn34EB9o2iwVX8DwVm8TiEcK1A8Lf6kAS/3kxcR0F5dfPriEmppYZXVH vcY/48v7knt0zJUhy0wvcXSKpyIpvOtUVwCRFqRPVaOWMANm3wEs0R0p8qPUyQuPmS98 ba5XXEzvcWHYDU5giTSqJuEVkfOIEW/oQpQO2R7+om89+1QFXNcSH6hm81mamvCqNdFd H/Cw== 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=7DFFbizbDu/NpdXvbnyE7npSA6XHmfDbvax4DlKhW/A=; b=lAVmRX1N5htRap2Mp8MBlZ+uHBlwioPYQ47wNC38SRk9upg6Ztdj3M8WA3MZMv+oMl U5c5yWq6bZlfl8xAlBdaoh0unBI3foDm8xGEtxQNl8Zdg4FfS30EJ+axOwbcZtVA1vsu /Y/1yJWEA7xVy8HLwwiV8R+vAzA+aLLxU8boUUQZPQx76XGjCicAgDcYmYho3Ewp0L2P G2U7BBmZGz5tn4fQF8YOTxUVz4nE0kt34jfn6aJx6gbJ2RG2VjRUW0LFBAB2yHtk98kg o4Hssd6/YL/+nHGva9skluZO/ZyqIe1BFwejdBZ45XVk/2jyMwvGai4TKHxPlRADDwh7 rebw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532nBzi5p9zsAQIAgGRg6a+jEAwsCn3I+60/YN42UUcqfJapjOnT Oef6KU4lnzj0mue5Bq10BAQ= X-Google-Smtp-Source: ABdhPJwrMjsjMHFXKhvNwgvJb+hAG/tm5UTkIV9kS/u6PcQFM/9RaUN8xJSiKlfR3UrQcst58+Xw/g== X-Received: by 2002:a1c:40d4:: with SMTP id n203mr3985464wma.102.1606311983642; Wed, 25 Nov 2020 05:46:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:aa87:: with SMTP id h7ls2840398wrc.2.gmail; Wed, 25 Nov 2020 05:46:22 -0800 (PST) X-Received: by 2002:a5d:44d1:: with SMTP id z17mr4193683wrr.423.1606311982819; Wed, 25 Nov 2020 05:46:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311982; cv=none; d=google.com; s=arc-20160816; b=jkUF5Z+dLWU9DfpqgBn8u8+sEw3YMMzao93EQWovfhCdxa4/DZqwsjNMDKJWX7jAi9 Lkn+P0mbT6+ZZUj5a+gWG+ryeOsvqght2IUcI4ZF/ut3ouK02SGGsukrbWWwZ4vdz4FP 43JnZ8NvV57PcqzWs6Fa/kOo7MSHQTlE6iJmcl75moTe6XmficLxiJls44M2+4mHeu3w XIEYuHHecEyke1II7a1KFf6cxaGuKBkSauV25fbH6ZgeT2osXpRo/mnC4qmKVRx1DBKY FafPGA30E507OhpIe08uUFwDRewnYV8vaYOcuO+zyYnWdZMyGgEpkdnl8fijIf9Hpj74 bdyw== 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=AMwrsElPnMt8BoFxMmJqLBkvSPRZgCYBu7ASo6/1aSxkTuNu2a3gAvgPJfIPi+i1bd RocaQkzcEAUvRFVn9CIyvcDCVDYco5M8Gm77Qo0JvbRD1NDAetXR5IwxIVPQshJmggdW RAlbvZON2PnxIPDaSS5dKxnrMxAChEsVYTp0oZ80+yk+CRexK+xTC2vgKFpW79wfUQPU X+AezmMc5gXHa5GZrJRUuUOlo5ajW5dZEwkQtpNKlzZggJBFOzpNLG1Ra+gjq2y+/8Q5 DmovGFg7P7rISPMyk8tSSuxHn3z2jfmL1dxvODrO+/lU8Jx73e0D4vu43/FpmNq+cKOh utQA== 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 m5si64609wmc.0.2020.11.25.05.46.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:22 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: 6kPpJ3l5zekyF5Cn8oaANt01Hm/2pGujFyPM0Ccn7KsrySI2hJvzIYv/sqQzMM7Wj2PSTVSyEp SN+GmAbeWy0FsGKAEF4paBBzpJLFYlLUqFjNFFPamIu1uX+T9d8b4ZfAqj/hsyDWmknnCS0Hfh g1qhF/9SMhcVDv0n9nClRnjsCvSjvtsWq3kUY/gh+bnawgFYfo6mABrQHt6k+CnT7ExOvfkHqS zgLI/eAFcZaVIS1v2mEReMok7mlKx+Kvqg6SVa1hsehjmPc5AZmzGDRTtMxUsYnRWmtzQbM9Pd Js8= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597801" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:20 -0800 IronPort-SDR: aTx5dCSeAbNZ5BywLELGpsePGLb0XGszevzebcDrdd/JMPFRwAo1C/zYRr7fHGESW8MeEOkeBu cbiagDYiJXFjL+zb8y/+gFnWSjR/MbB5KZFThgbSNZ4uc4XtImP6lpDqvmxuz8IduQU5D37ejf I/HWlzBb11iVlYLnHXouH0QCsLJ7S10Hz2yMOqHzRxYBXOv/wOGGJUDeYD2+EhofbvFEnRfOAG neJVWoJRaIRF+46bkxeawFUHbNXFgB5ntRsnzwf+h3HuwMpLJpalnHvvznRhIrDirs5OvdMedG YFY= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 10/14] repository: Fix failures due to missing section Date: Wed, 25 Nov 2020 19:15:54 +0530 Message-ID: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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?1684340194715303127?= X-GMAIL-MSGID: =?utf-8?q?1684340194715303127?= 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 Wed Nov 25 03:45:55 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: 217 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp373634oou; Wed, 25 Nov 2020 05:46:26 -0800 (PST) X-Received: by 2002:a1c:df89:: with SMTP id w131mr4038130wmg.164.1606311986039; Wed, 25 Nov 2020 05:46:26 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311986; cv=pass; d=google.com; s=arc-20160816; b=0jKyX0w4hb0TyUF25VZusU6lDvBgD5ExRlAsq+4womDR+A9bHcRrRv9Axk/27X2d1E X7xw1j3WIBMSE9+b+FERkyVz5yvwHZNNlU8+BFTnfHgZXEUyMGwl83DFqy8fvkNXQxC5 Gn5mt5mk/EACHvw9n5XOLL0/AU/9+bWAYTOTg4Vnwks/Sv89NZAHf/nPhZpnbjIutC1W pBhgLOHSUuIADbBHZ7WV9Z+VkowWYl8jPrzISIm6CJBZas1/sj/oLEQz57+jqowYeMJX jumeeL9kMGoSYfqLNEmGH3Wq0dODA/bsRmc1eh4wcS0zbRX1bxbnps9kGRESZV+9BBQd h1lg== 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=ZtU0ffRsdebFRwDUA9Hr8gEr9rx9Nfvn9YfGBKRqE+4=; b=wU+BzhWZIUabZePHka7uSysbdZChE2OnTUDy/oLcrKlhAgaiH8J7HX58oawTyyBW4Z Uqz6AR/u4aFLoXYe2hvZDy2atTp2C8BwQK9AuVvZv9obuviRy9wgXlZEOCmKe5UUV3ht B+lV8HysxaIGSpoYTcBJH24zh/W4mo4QIKLI/leCqzTJf1Gu5OiRYCb7ijGUtsqxr4Rg w0aASH5XgB7zGhp2cWpy1gzUH1qgOqh78QJsjrWV1loYRr5zPbU93Jj9Lo73+yYh97z6 kq9bAiedA00ZI8GJqSoxdUJ8PnuYVsJalQ5zFmdQbfeVa7Kj/f3jBsOaJl5u8anpB/Dd yNiQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=mkfqQcjI; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbmoa7h6qkgqeg7r7eca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBMOA7H6QKGQEG7R7ECA@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 a81sor1208185wmc.7.2020.11.25.05.46.25 (Google Transport Security); Wed, 25 Nov 2020 05:46:26 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbmoa7h6qkgqeg7r7eca@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=mkfqQcjI; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbmoa7h6qkgqeg7r7eca@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBMOA7H6QKGQEG7R7ECA@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311985; cv=pass; d=google.com; s=arc-20160816; b=Kxp2/KkF/Qs12DyqN43WLXDaGSIEpSKAf3EMzZR4qBEOtmqNKGHn93W1FxmXYET//R ftc7x/ZK4UgqsdyRmjE5MxweQLTQzZZiZSmomcDsyPg+zt10Courwgyc+35n0uVs9eC7 uwMxPExgHKJIdKRb13baj5G6BDn3X3O/WoOtoMzHDEsjq6hs4T9yI+j2QisTO6xVLX8e jIY0DQ3n0UnGF4jhtp7Y2+6NnVJhLpfRkl0umGan2/O2lj8vlbfoILMyaXqkx1xgUOtF osEv6fMEWZOYAWMzTABF6EXvxGgIvugfP8As9ppu/Ytxjk/ETaKd0k59FrxYsprR6q0o w0lg== 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=ZtU0ffRsdebFRwDUA9Hr8gEr9rx9Nfvn9YfGBKRqE+4=; b=a7y9l+1uLsEhdyZhmkyIr9HNFdixoEzXrgzP5oHjUL7UgJcu72GLcCZKCRQI/vg085 enUkF/Ep3rYJ0Z+70/Tr1Xwcnk5VrbItqxH3sm3bVl3wExnhwoCJOl64AaXZuqV//RCO a5e/Q/DCNDVXVWtgcJ3lPpS8q94UP4VFR/NKHI1pWmRmvnvLHGqxlFRJejr5K+iOYi1A jVz3EzjSInCetUjppsDqM/mZGoZvXd5cE/YarnSzDigcXzfwbAR2sbrQ20pLNVF+QJ85 g6j8DV+GJbaysgmeS1SDxnUZxpsvzmGNrjfvRV1jTFMv152CMmJFrj5QUPRgtc6nRZaq Zrew== 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=ZtU0ffRsdebFRwDUA9Hr8gEr9rx9Nfvn9YfGBKRqE+4=; b=mkfqQcjIavhHtISLIP3umEORMmIAofC1qFptxQuwK4QLQO9WiDzEoNm8aJQoaqeM+m QCVPkwZ88i9HH1znVUkpHSMi64CzlCWbATn1oAWmE8E0WrBPC418TFRzXIn7GLW7yhVQ zh7giAUsXGyG5Xm45gOg9R2hyERZXKyYovAzYc6OHODjpq6AOJuq7vXm/WtW92lqhdcW atLUkn7ttqKsY9pCRgOUfzLW/Nru/AuY+sK1Ouq4Tx0s/rRs3JOTUSWkHvrGcU1iy+yb 9UaNotd/fWdkhNwtUhQQ0h2C6RS9GW6DX50qkIv+j9q3xS2OiSuiMMivZt7o+0d4gM5d +x6w== 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=ZtU0ffRsdebFRwDUA9Hr8gEr9rx9Nfvn9YfGBKRqE+4=; b=jjskRN8To/CTpVAUhUOl5u/LR0NPdoN02KLDC38d02gTPijWfl57pv+Mipx9te4brg ly+R+HFgl6JWCYr2QO1JjueEQt7SIvK969C87xcoeDE2q9MfubOc4rBjKNWEQRfVQgb2 jEF24nsNrWf77/Dq/ujHSh2i5KBlNdL6EwxZMkA80zSkz3QLr81F035JEGVu9XVx4nwM crPBHf+zgRl8zahLDG6Dl02bIV9gMnm3MY2UhwQ+nGpZ0B9n994CyFDpYHqKUoSDlJS2 Jd8E+WjzFrfsIg+jeBvTu9IzS1Dg/ujfqP0juK9E1/tjaDUyrHcPoP1zh0iFdpIpifL5 y7LA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530bo15YiNCfKFmfNAesf5eeZyx1iSLQeqxZ7beTDA1jm9nA3FwZ fX+xHMsxQqm4ieaaUAu3Lv0= X-Google-Smtp-Source: ABdhPJyaOFwKv7azzw788RUQSzXc008+W3MJvlElp2LoAAh7mh/ZDoTxk1o5zXXm1YqpgXTMVfMH+A== X-Received: by 2002:a1c:b082:: with SMTP id z124mr3898689wme.129.1606311985709; Wed, 25 Nov 2020 05:46:25 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2d14:: with SMTP id t20ls1293211wmt.3.canary-gmail; Wed, 25 Nov 2020 05:46:24 -0800 (PST) X-Received: by 2002:a05:600c:2541:: with SMTP id e1mr4160816wma.185.1606311984736; Wed, 25 Nov 2020 05:46:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311984; cv=none; d=google.com; s=arc-20160816; b=RkZgAIYhd0SoGQ767DqVtZQKs5UOTTPD92458dVH/6raDP3EL9ABUEuqE02DjKEQv8 ZUcF7vvF8OoNcMGn6y6ClieZMaYiueYYmwlhQv8zXvnIR17Hv0OTf/2vcDpVj3Ytkszg 78Zij0Ee3/yWFyXUEIvuInWkuw4hGEusENm4r2XRlPtA+0vcSgKOhZhfn9I4pjnKnt3F diCCYNG3mKVl3q94CoRZkzfDG2uqo/A4cvemt5k/Q94iUFsWte7M8fZ2keXWx8DTruvh oISNoVJ1Rb2ATCliHMj1g6n/HADsI3KxUtlvUUbbUHEHWhP8b7AvBeHg5/qyYu/iRPxJ clUQ== 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=PgjHucsqF/5jy4VUf2/7+PvUBRLnNRIogQh6tjNMyrs=; b=p4N292uj5kmYXMao668hz+pYDnJUxYnvRuG5aIoEOAZnLDP3Eqft//GsSOh6yQUQVH IsLckoEv59Tvg5ZgPKg7TyGGSoPJssDy2Bpt4Bjlswlt9juU9OQaPSXPfhvJrjkqd84Z yw95InhdlyQg78QDscRd2c77zMFtUsnWGtdYBEL+uppjNIiybJ6EnofEXQki4BIR7hUX bMcF4VUvJMW3AziGRK173B1U5dekxV5feRixrxPiTzX7jJyKLo57qL8VwSknQjoGMUBO MXihhnhRfj8IaRTnXyfsKPeWBarYJihY3PpCd3WQU9OAF/Z7UnVzJbrspR/TehFx2BNx 66Pw== 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 m5si64609wmc.0.2020.11.25.05.46.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:24 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: z6LzCRFjYwBYCc2zdNX9t849V14Cb9JJrye/7uVxfLOXo/wjPcvNZYNKkOsbv/+DvVs7XTd/Da GiBZq616kiBBNaUEfOzRS/Go/xWETn7yikuGHUlF4xFKlPEquT9HT+/awvAWbZsWJdX1OoCm6Z Y+o3Us5LxsWe017qjUpZMISTKe+n0hvmnXFV8Ga0mMG4mXSmO6350GetdDWyxCAmqzlQV0dj+F PbJ3L8b/vJatWRLhaRLK1NwcwuSyPzzLHkJM5DgbMUo1QXXqrWMM4I/DAW9O7LGVGXoVGkAz5g n0s= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597803" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:23 -0800 IronPort-SDR: soEwxaZqNO2ntIlFjkQoAefDeEwvzeiw8RqNZ5kn9zTPomQg0Xzs0zFZh43hau6YUY7ga5bTX6 1zhH4Nr5ofHqlMSH0EV8aOl90X8SAdqjTeo0NrI+lK2SkYFO2K4j/FeiYuq19Z7HnjUqPnTuY2 QeBJ8YfgFN6E+9xGNPqJC7KIM6po/xVq76N6Vx/y3VjFbkycfmJA1HEfEzO6vQ/P0pUMd8lEPm NMWVvpjAtCnRZFRgnioTa54NM57WPknyrOrj+fp/201+MvFbMRxs/ZkgpdXWgfijx8iXtpQtOC QBA= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 11/14] scripts/ci_build.sh: Enable deb-src caching Date: Wed, 25 Nov 2020 19:15:55 +0530 Message-ID: <20201125134558.26246-2-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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?1684340197127497094?= X-GMAIL-MSGID: =?utf-8?q?1684340197127497094?= Enable debsrc caching for CI builds. Signed-off-by: Vijai Kumar K --- scripts/ci_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index a5eee82..09a0b4b 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -184,6 +184,7 @@ if [ -n "$REPRO_BUILD" ]; then sed -i -e 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf fi +sed -i -e 's/^#BASE_REPO_FEATURES ?= "cache-deb-src"/BASE_REPO_FEATURES ?= "cache-deb-src"/g' conf/local.conf # Start cross build for the defined set of configurations sed -i -e 's/ISAR_CROSS_COMPILE ?= "0"/ISAR_CROSS_COMPILE ?= "1"/g' conf/local.conf bitbake $BB_ARGS $CROSS_TARGETS_SET From patchwork Wed Nov 25 03:45:56 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: 218 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp373669oou; Wed, 25 Nov 2020 05:46:29 -0800 (PST) X-Received: by 2002:a7b:cc8c:: with SMTP id p12mr3607028wma.22.1606311988796; Wed, 25 Nov 2020 05:46:28 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311988; cv=pass; d=google.com; s=arc-20160816; b=fIyl0aHriCayoN/1N2c1VyGsjRFvVCT52XEvobusdHoXPhzPgmTT950i/jOyzzQA40 6WWqnd4LFT9e/jNfQ7UsPx4+77QLgMwOaSqOYLNrPEBTuN5HU8ftjAHDjkGl5lGLeHxb m8bUhbTJ+Mk8My3M7Y3Yt4WPe0FAra0sciKtBIgvffC5kOLrwDCXfqY32/pOq2wAuWpz ihUuFKnLdwffw8ZXbAfFO5mnFh3u2H8t6k0B0BaUrtc/jNrzIOavDUUuvYO4PS24/O6E 2aywIaZPb9pMUa6UqdWqgp3wDAekGtlnsu0s7uf+ZVSBhztLPK+i/7f/I7qAsq2zM8xB Wjqg== 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=P9gtxliX5HKM0NH3s3IC4XZ69gcJGrZCKRtc3+AZNwg=; b=wNGQDFzxf4IDoazsHwNR18NIgfrUxkTdDKCCbn9GBEaV+kB68BRbW8YeuV/hW0Hlqj +W9LkfUTH40yIF8mNyLX3RtlUXgHyeoUDqqT5J6t1FeR1K22lurH2UPdISvPJNDflDrw fPTk0ZsBFP4wBrK6uA3Sa0B1MPxBSTGuzxLY0oQhIV+42c6/itt6fpsqIlDNn4NpVNIl 6umLxa8pHBdeG6CovTlb/EUKAEu2rwaxYEqQod0nEBPyFy2U/Zozh3TxhjPFSodu4zLD o6KS1TzoWUh6uuiKPFzQe219pKMSBxC0yw21p3mPrydflbKI42oI7VsEpQYlqbd6Kmw9 AS9Q== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=XolSD0EB; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnga7h6qkgqesu4sbfy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNGA7H6QKGQESU4SBFY@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 i18sor1127159wrs.26.2020.11.25.05.46.28 (Google Transport Security); Wed, 25 Nov 2020 05:46:28 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnga7h6qkgqesu4sbfy@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=XolSD0EB; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbnga7h6qkgqesu4sbfy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBNGA7H6QKGQESU4SBFY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311988; cv=pass; d=google.com; s=arc-20160816; b=HasDaAgqWt1ul2kJ7E0S30kejFND4Avp9OnRQBkusEwY2L0IZy1CRg3YarokJNqhJO lKcT5ZkztAmH5YLYZaqypjm9/pqOgM5uZQWnHHxF2VcaoI9Z8qTnSD+FWyFJ8B4n6ntO 15YM7oW3MGdUX8PMquWQL025jQYVvgiR+C5KhBAsm48HgrWprsa350k8AgH3u5eD6UWp 75eGlasUhEBuBc04YmZiVhnPpoeIN4cBSpLT/i9CUCSQnV0n/2ASo4x+a/15BHofgusB LREWAFqvIPSJjGQFfnG16/dSRMpHIxcqfVlAJAWr0RgfAjzZOOJjHIo8pnzq2ktUgqgK sSKQ== 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=P9gtxliX5HKM0NH3s3IC4XZ69gcJGrZCKRtc3+AZNwg=; b=O746m+tYfhocMAjnZ4lrNmFqYc8ODGVDXH3gTQxjhZOaZw4yEijuCBTi4HHAQHfIfA 5gVOMmwDCB+GXQo5WCPoYTI3ZoeqXJXKQWdY9wOxgAdFtxzMf4wAQ1P8m8zqakgo2kLn gkUQoC1OvFY85GgS073y2kwkRiES0pYTZ3pNUdptIqSP4I5s/5yDsybMCw+arQauy5hE WLcH7Irmv2Kt8tUazyxHcZPPl4HydDdgnoQn3r+BCXKUlHXIYubDkI8E12YJ5sww0HM1 Cmsk5ZqiQ36gw818WuTMTRLmzWQuHfRfJ3syQJS/s4c90hvLqvW64aMX376RbGk8XxEb /xVw== 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=P9gtxliX5HKM0NH3s3IC4XZ69gcJGrZCKRtc3+AZNwg=; b=XolSD0EBOZ890vIA4MpGQpBHrqx21PaygGA5geYX2tI44lhQ5BToKj1eh6jP0LiHFT xnPkzrtwoG6aVcl4J5ze7VQkIL2riGJopOyi3RJJu/Vivnl7FPIYpeV2ECJBkZk7tTLp x26T9VqU8YmIByGBds4KQXN9yac4yJPSB7iQXuY51FmCWt+HCeEgswXHpGK4bFcvLl5K r4/OX00Yt1I8n+3taqQe/4OvP0NU57vAs+axQGypG+WvhTNm5Jq4Aa6D60swh8LGsnf2 RuLC+BQ98FVx7OyceSq004zKabXbi3g3XChg66Jc07xaBiZfEFFKgUj0roAoNVRntizc UWFA== 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=P9gtxliX5HKM0NH3s3IC4XZ69gcJGrZCKRtc3+AZNwg=; b=NeWX9nnYEEufJ8xHfvgYmi2//KqmkLpu2k4jD8JeUpMVLme5n96/rFG2p3h0gPMka8 QV7xiGZHX5HPybZOOybpP4xJfh30KW8dA29lXyGt7gh5Yc7L5UIkzQsqbIHQUOQE4j+9 ctrE4AQIhqxawuFoPovp4YNxOeu/ZUulphxWjFsN93M0IKlMS/nr/syBYL0E3Agf50H4 ULClgdcbmWqPGS0R2Jn0QOMAfeoRmBPrtYp09YfYh0rqfC1ut/zpF2xaE5xDmoesJUxE 1SwPdbS/0nuz06icTA/AjgpdHAjY71/gww4kpfzu4gjJv1lHUzmiIS8hBr3nLwolbboJ shUg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532FV3ihvCf3R71NiJhRmW0VJWxJxN+bNMheWeXUHN//P/b1EKrr HoOKNuUTQ1Ow6EaHhV+D16E= X-Google-Smtp-Source: ABdhPJw7YuhtJzeLMi1Z1AcrZy6RBn1AykGrlU4ipY3fRVsAFdDS+DmZY71dWzYbXhH75mqDnSTJCA== X-Received: by 2002:a5d:4bc7:: with SMTP id l7mr4434930wrt.105.1606311988535; Wed, 25 Nov 2020 05:46:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f70d:: with SMTP id r13ls2844154wrp.1.gmail; Wed, 25 Nov 2020 05:46:27 -0800 (PST) X-Received: by 2002:adf:9e4d:: with SMTP id v13mr4115340wre.135.1606311987659; Wed, 25 Nov 2020 05:46:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311987; cv=none; d=google.com; s=arc-20160816; b=heG89UdUvVF+jpDKOkqjC3QxR3eXFgSgHznGrdjchSR7/QSgMplKZd4o5sjj3Wm8QM pZOEwtpFCZAqg8R1P2iEsYZ1ONEw5s88pCio3gkpIYuYtcQPu2KUABQsymmtWWbaI16N LL83c3g0pPdaHvvOKPglFQrGRqi8052AH0LioMkLvJsMIz49LcweC7YcTbeEYR9L+qYC C/x/n8itOayNv8poZliz7LJcMK4HHqFZTfk3sx7TQbWeG9D2z0/GI3OllSQba0KqtEqn C5l7pSd0aINzsqGA+50FBH+Y58LWNv1PrvIMy4YTF9OoXMDIrUEksFyOruBnuXb7m2kd bYDw== 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=GUsSK7RlSUciLhYpCQXivlUkBv0sKQflEk1W/KTzXbowbOm06eZOyw3qC/T1DLBpXu IRIwYOA9Fm/cOPo+T+BMwIXj98hEx1IaqSii5ZoVPKI5Qq1lGCIvwfVcybIJmKKyhHWv 50FuETYNunXa6ItxS/BfB4HGWKc7RePvxjSyytAeZiUzau9DYd4oB+9mSdi2QNMZLPX6 +jTzoFeK6POqHxAPnmHHcZ+7g2CkDazL/yLD1IYA0WwheDGTrFL7cH9PnqBe4scDH9EF P/YUxWgZMJ2DeGs9haS0iIXCTYbmJNvNg3f0fxRlZJcpziw+VRH9ARYEHM3IinchjR3e Txdg== 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 m5si64609wmc.0.2020.11.25.05.46.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:27 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: SAWOln2JuUldPckDx6xrLl3JHlAjJjSQcanvfsU7gkwvfIqhB5lLxORXUS27pEUgM4F0vWywBp nk48o7BkMdH0paoNp36umkVTQsTaYaiWwFRIXKX3Bd7RpK9eFEdbUIPVeBFmeF17WeY5YGDaDG qeEcNuZ/Q6hd1/lJVyNGtHMwPvcCh7cuCgm32VlZClgKuAHx0Bx6BfGF60Tfg9t8kmKjJCa/2Z WbblOHtGXoLZr5ypARj5xd/V8UQZIXRF3ZBlqAQeKTuUtezYZGXlvFhDvCcvttSxecFyZYPewz Y/I= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597805" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:26 -0800 IronPort-SDR: kh/JK3dD3ZL/ThJ32e1F8YuGZSdQWRB9t5XIqQoZpJgD5OE1NoL0w4a8XUhz9ortkXSn+7Xw7P F4mcdu81oWrX2sTM2pK0M2zrt1qw48RTr260EWrpD1bnsWtzgJb5Fgof+tlcj36NExhJ/orPLM bNmKDj4kgBhJEpr+LQZTnq/4nVYt3jWgG3syZ7gpyUKIRRyFgErPIioQKfOeyD6Z8s02468yrj gR5hG88ratWhP47G8JuKsvhLA30IVe26XdfdpzPEehLEfJfAjRePpAtUGyk5JpuKRYzxizvqk1 sSk= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 12/14] rootfs: Fix possible overwrite of existing resolv.conf Date: Wed, 25 Nov 2020 19:15:56 +0530 Message-ID: <20201125134558.26246-3-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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?1684340200197644948?= X-GMAIL-MSGID: =?utf-8?q?1684340200197644948?= 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 Wed Nov 25 03:45:57 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: 219 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp373704oou; Wed, 25 Nov 2020 05:46:32 -0800 (PST) X-Received: by 2002:a1c:25c3:: with SMTP id l186mr3866737wml.113.1606311992001; Wed, 25 Nov 2020 05:46:32 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311991; cv=pass; d=google.com; s=arc-20160816; b=m6mIlM0FVu/jUedQFimNFInFp65U6+0nigezCmgziakuAer9tib4eROCXv0AkRijTW nHVH1FzErLLlmzjQG53PowebWjFFVej9r4JBncRTaRLcNY+aXmmxKvlWZ4jWNV4/oGvU K+iO40dqTOY+ATJTiVzaWgGxreNW8O+EJT2Qbpg9TSrEpCJ/gZfkXEN0ndAILoVBWIeA 6aSd1u3RNWccziObt7QweE3ZoEesM6jdtjvQrVeBnxVGKTiyZcGSUmKlmhferD/1grhq EevxS0gvuB9/fYlrsAbPRanqh0rfSr6S/4qqx4vySlcMLC5CW8PtfhkGyl8ZvvVh8fMa wplg== 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=mA57XMAH9HVDt5BOhLNVP9t4GBZS1MGcZiBn11uLBSo=; b=DOCzgaqjFv7YWYAsgGOnSGxcFOa+oU5U6ELTIsD4yyRckHuNafzMaQzfi1TaOX0WVz TpEb0k7HS19l9ilPNLBtVoBu/mHP8wEv12vh3btY1Zo6n3cnC7qeBnJe5gtuqeJ73IbZ qT+nfXu1WFJy8DNZrPBViI8j6DpQF91haSZy5o+2wPXiMq9/beDGmwu/EsKSsbPcCS3w 4A2ub2cMkQHoQq4fgY1jSAmiYXjM1T4KJybxxSATWK/6hOdLWqx28mmDgKV8UsS7FJkx yrr5o+RwfOXpip7ZaZbLlySX6RbH6rs4Ul97QgkOPzzSVAo+SQyp6L5AlWoD9DuT3wFL RkAQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=mz4qOFzL; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbn6a7h6qkgqe3cmb42i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBN6A7H6QKGQE3CMB42I@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 f1sor1093269wre.11.2020.11.25.05.46.31 (Google Transport Security); Wed, 25 Nov 2020 05:46:31 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbn6a7h6qkgqe3cmb42i@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=mz4qOFzL; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbn6a7h6qkgqe3cmb42i@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBN6A7H6QKGQE3CMB42I@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311991; cv=pass; d=google.com; s=arc-20160816; b=Ai4rlAvpFk6RkbXu2OVn2X+hkBRfRwKe6vOgfXlpbQ5VDjzO9FTQZnQwAbY+h1z+J6 yxTIDDfpXDci3i9ycNt9Lh4XJ45yTAmo/dgw2Sx98ilh2APLMvhNAnaTI2p939qUJ6K4 z2j3c0TVRa3hDlnUSC/tH33Uo7qRBkRPzcOrxA/MLUxHPY2wIRycKs6wHOO0y9kLVlgk 1R2YYlijLZyF58tscWiCzZCv1m7Q8V/KbDSAQZ4sOjGG6T5AQYAu/azCUHPSC0qKvNLJ OA9xRxBRpbpUeM/8VLH1L935s+M1P1PMhWh18ty0xsGtsoFciS7ioJNk8WVpP0AqfeaU ZKBw== 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=mA57XMAH9HVDt5BOhLNVP9t4GBZS1MGcZiBn11uLBSo=; b=yDKl+eioUyc8fx0lbAVmitzg8YUCO3s2O4qNA3WT422aqJOfI4PjNtLglTaAUhyR4l uKkPseAy+glk8HGV/n4qruqM8bKY1DF/qnfo1JnHBajHT+h7L6zNQU3HmkH7biIciQqn CXQNaLcs2bx4t52E2D5j+3IX8C70yiyC5xHma71NvMsdNb6BdHp2l5+qLpdpWdp3fsRE 4o/QxGENI/ggaTVsUkvZ7Fr7t/d+5ilZT6+6qhSVQek43cBnAQ+/zGmZLxTS7obBlzv+ O44Ml0rRW7MPgsNRUqGngqKSbSNlWGVa8+eegk6PHIUH7H+WwjVEWiKDDSLMhDL+SkFL YUPw== 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=mA57XMAH9HVDt5BOhLNVP9t4GBZS1MGcZiBn11uLBSo=; b=mz4qOFzLPWqjcOBdbbkIo/qFBIUaLnFcNyUY8YkEm2haJeVh92D2O10e3GS3oVEhJX zgr6BxHkShfJHHP13xJneB3rv7KcSRH6gy+1x+RQc+kgo3r9HBRvGPx6+AGQ711qaVXl qAXUDz7pZrglz/LtceADp9A2gOkMJCvfq+07+ctpkdvYmp3U4TOJPmCljw0s6QlHjby9 G9x4/pbo5fgtqwlOD6FNectnjpdVvkF55VywyAhdapm8GWFGirnGBddVbEIlgb4bIuQT Lpo1OC3MXEDzrhaYWhu4uH3NDbyRJNkTIDN++5um1x6HZya3EZpZIkTM9A6vwnbumXAv Eoaw== 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=mA57XMAH9HVDt5BOhLNVP9t4GBZS1MGcZiBn11uLBSo=; b=IXio15KBA3SKJJZpaNET+AEb1taDBHShQsW3GeVmHFVtWcXC3Fp7YtcpnRkco23v+9 h77rTlUnEwyqg0veou3/XsFoEPY1NdB2Jhy8O4VPV7+FX2ur78wylAvHxEjQFWdUzmju rxN+RdeShn8DyOk1KTjisVh3/eKXRnNRVkGOHQbfJ1DmAkBF7GJV535Gbm+02Xj4sPSy nK6/f1gU7wGqY+JDpKJyoJQ04jQS2I4eidjokVuYlgoxcB6eztCl4mwbpszEKdx0ZHe2 quFDeCqpzWSjIJfvwf3hBZu2JwIMbL39ooFWmxVKx6JyXgQpGOroeQB2j70XjYDag0Ky 9/6w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Im0ioxrtZcDZq94mnWdqte+Rce+QgbbKRt1SYVDtQb+VgvMU+ Js127tATMOEwajf/HRWWhc0= X-Google-Smtp-Source: ABdhPJxEOOXD3aTM7T2vbxKNsVq1FdB/Hf9jDpAtse9TbYknXhzt7INdVPOJ3MMQQZaU8kYT+7d4sg== X-Received: by 2002:adf:de12:: with SMTP id b18mr4247885wrm.187.1606311991661; Wed, 25 Nov 2020 05:46:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f70d:: with SMTP id r13ls2844292wrp.1.gmail; Wed, 25 Nov 2020 05:46:30 -0800 (PST) X-Received: by 2002:adf:a198:: with SMTP id u24mr4243084wru.219.1606311990888; Wed, 25 Nov 2020 05:46:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311990; cv=none; d=google.com; s=arc-20160816; b=GJVyoE2A2eXYOH+X4Qz0lWOEmSAH5eekiARblOVMSgu7azvyGbfnOpt0pvWZgWUKIA FUWfCK7cX9Z38HMZKdoJMOvJskq1OAtaXQz6UHGl1qrXQyezKLkl1TVDCVdG4arN9JsK fHY41609Hcb/og/dq8rPwcn2z4Rl6LfGPVEgebMhDUKZakl0BSpVE72m38bOOD0ww/hK JXuvzfyZnvbWO/+SwWRmHhuv880uwSrP+JlhTT9IrHedNMEAM9DL3PBzv9ZROM25rPS3 dsXoQl5XrYkWhoq59bLbnteD1na+YU57DkNsGVIxpyqU5loMIxorKuoXT6kZ63dN4xke DHVg== 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=qNaIBr5tyBUTVNO/7unLKC0CvOugR3l1Eqs4ADh22ARxXWQpwXXVxG8Z0lwIxX7eum CWLsXmplq1RSPB/+wAkhZdGrsYDj7T2YYCISpXdii0W0llBw7yET46+ShqiAWTvxr6b7 R0RqCLykom+NU2m/vzoe4veBoSk8cxw0h2yDjwGDyfzAar3gJnDY0MbeWpixEwHmDqqq Gh8DxtGxg/fXOuJaxzwPepfjSY9NJbgGYLRVGyfq1R5c9oOW2KSJRtjBTfzXCJKz8x8o UnZ/shEzHXmphdj7lzhbXggPw2Wbiou8DW8RaR5HML6bXTjBI2mqRhuhUakpwxPgm4ha Pgow== 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 m5si64609wmc.0.2020.11.25.05.46.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:30 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: U7chLFthAzKCfi5sIB5fgBXWb7xTKYkP03ROiIPNRTpH4Bhzd3aRfIVGx4ezhfPM8l5VfLaDqc +FfooVpxQktlXD2fZIwjVoDOn37rizyGo0pcnFKanIXIX/RX3QYSBzR8CxT/ZBC3ypTWz54Nty Fex8y7bF7yHoERRMu8z8H6L1L+Sany6fXM9lL1LkocKd6VQ+tBgjazloLxyF05WdddDK6oGYjn TCyOZlmM5cpl3tgO2CHIx3G6rqOVm/e6uBAGD4/8IV4GCoexG7zVooICRloKf9Ez5/pyOBcAOi W2I= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597809" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:29 -0800 IronPort-SDR: myLVuZ5N+ntKYTWE95lf29vpyf7eA5qWYWctVv++XtMrys+MuK9/xVb/mGONcxWILmmCqw0as4 cOkl4Y1MilJJcmk4IsNsX9/UJ3BTovTENqTZ150r8FCDxTqgeJKCIqmvMhrj7Z6V+GKtqLrhzh WWaM6JUZoKyMFhtq7/zheEID5eFkDRsmIEvcGzdX+zszyKYTpvWF3nBSM5AZDJmQ7smE5kylsi b8/ookoC10qT70HfTGMK719VueF1bQZVKNV1vrUpLP7hNvVQ27D7hURaqf459vSU2Lp7519z1S d4w= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 13/14] rootfs: Handle failures when postprocess is rerun Date: Wed, 25 Nov 2020 19:15:57 +0530 Message-ID: <20201125134558.26246-4-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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?1684340203576756328?= X-GMAIL-MSGID: =?utf-8?q?1684340203576756328?= 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} From patchwork Wed Nov 25 03:45: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: 220 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df02:0:0:0:0:0 with SMTP id i2csp373741oou; Wed, 25 Nov 2020 05:46:35 -0800 (PST) X-Received: by 2002:adf:fb90:: with SMTP id a16mr4210041wrr.192.1606311995198; Wed, 25 Nov 2020 05:46:35 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1606311995; cv=pass; d=google.com; s=arc-20160816; b=LO9dVCmnA5eN5K6TzwHMo9bypv46hlTwZiyIkCLnt86HDt6UOOB8O312lwqxH8KGV5 UFkc6Wg8Vo9WV9ntLp38vexTpwiXMcdr42HBwvE/e7/kwQtDvFMh4QPaWZdpaZAvt/mD DswmX/6jAKPKBo1D2wH7gKOA0CHxqS3eDNX0SIw3WRCyHsF/BlKr3EOiOgvkGqYXbFSQ v9eAmICTFlGIhCR1j52Etxgb7VmJmOtcziqSdMV7FgTTiCXzjH1X1gea5vbk79WI/We2 KjimgnJbtPQqIWt/RUVCj/VQQoZCBhOP5V9gJRTBsjqeHIY8XGwqgbZ61BJHm6cHrSOl Z8Hw== 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=/m8Er6t4fBHQoKT1oEPK7EfC0G/3YxATZfkMoNnimzM=; b=HeEwjlXtwUhMRZJnmuKdA1DSab6UGRvgLTgnAmUkqPMKPyvb8e4e1Hukquv05YfK8n BRHsJDc6p9r2TX/XKMrFi/w5SI2awDRL55lPyAivExpGHKMoaWanaAw8DFYP5Z+v0NfQ n2Xeef62VHoazqJBHslnJyZFcbYYMFZpCvrRafd7Hdxm3RvBKH4cyXcyHPcAelcYI9vN aqJqNsex9/auwNoW/X+ZWtbpZ4+w//EjFCnNo3S9WfdSAJXINpi+hxeYs1KBF1XUIKSi a0vbmaIJWxg+pEriLh7f8DltssKJ7vsb4MPJvXFkfbHnQzxRxbpUU17uykO+DIPAOp/x 2hbg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=WXbHI+1B; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbowa7h6qkgqejoewazy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOWA7H6QKGQEJOEWAZY@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 v187sor1260586wmb.17.2020.11.25.05.46.35 (Google Transport Security); Wed, 25 Nov 2020 05:46:35 -0800 (PST) Received-SPF: pass (google.com: domain of isar-users+bncbcwp7lf37ukrbowa7h6qkgqejoewazy@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=WXbHI+1B; arc=pass (i=2 spf=pass spfdomain=mentor.com); spf=pass (google.com: domain of isar-users+bncbcwp7lf37ukrbowa7h6qkgqejoewazy@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCWP7LF37UKRBOWA7H6QKGQEJOEWAZY@googlegroups.com ARC-Seal: i=2; a=rsa-sha256; t=1606311995; cv=pass; d=google.com; s=arc-20160816; b=DYGs3ScjakoXZFikL8L3N1Ny4I27fCeOsDVhd2juqgB4A58Wo2xKqG9/xS9AW6Zyfv MmwOW5SYmXZ5bm2k+nHteQIfztvgVZqL118myAJBbd+ybKNLCZeK5GdZPKk8vkgbsd0t hZVy5Sjv9ZGnVxdPHWkxxD4fvlLq9jxYDTvYALMXZYkU7BHrweOqvbTHrhmRnynsSjIo fMeU+6kfUbqvhfns2OW7d5haGcgfA29EbyOT/Rm05L2+3kTsXfPU+FIRlUdV5zyTVr4C VvcjEwt/8/FtsOHKj0t8vLQMxHS+ac7rfJcZ/+Cm0gXyAR5QlKQKQNIUb1Ljza5DJVwC OMDg== 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=/m8Er6t4fBHQoKT1oEPK7EfC0G/3YxATZfkMoNnimzM=; b=qqM44ECCVRb+KvvkK9aR3EqNx6imXcEAd+T63Pt7q4Ih2cZYLTHKAPJzrMN2qODiaU RUJ49wGNCkCaM12qXqenv65beBtcVULlWZB/oOmVH/Ni6/QzzPGOydoVlvIPEfvEZTNd 7vzyaCGP/KQw3meW3fvn7zbL9ckWcmVBXju2UedloU/sDjKEto24yhziKa/iwp0FYRQM 5FupHe6b73kVBV2g7T6ClqdEVzvXj56I6qojrXGGGTe+gMfAGgxGn/hhLE7EqlD4FhRd IEqKwpWgh3fHyhouGiycnGTiHyaFu+2QMSd3cl2nZN4vAngYuQOvr77POvRKqTMYsbs7 DGFQ== 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=/m8Er6t4fBHQoKT1oEPK7EfC0G/3YxATZfkMoNnimzM=; b=WXbHI+1BGPrejF790E/8aob0kheGZiDc/B8krOQbzt/I29OjnyxOtUXsHA+EqAH4gY cvMjOctyaYTcx8EIIckYwxnJM9D+CoM+tFfd64BSYMQL9UqN06BG5MzbrONMPn5SJK4z oLxFvsC2L0qFzwmpO/THro9a8CLGxHEer8dURClpa6wJV4mOR4YcJDYcvKJpCfGLpMF+ 30tE7fGYiOosMSr+6v+kKUiwAla96KORM7o7YBI1TAkpNNz8ZhBrdR3cP+znu4NqEwgs L8dapTXMjEeoFtDaRz2INul/P4DD36wcdpCt55Lyl8LS32Zd6KAFWLuH7IOnhs8hOWuI OHwQ== 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=/m8Er6t4fBHQoKT1oEPK7EfC0G/3YxATZfkMoNnimzM=; b=K6G7hBLLrY+sAbYxbx5XjJXZ8qYJGIqwkgSOHBtPvlpmedxPnmGM755A+19rGC338T 5bB1tKb4q7uwg94a6e4Cxa7iU6ovMtaRcSsAKtmn/wCdIDO5dUYJTD9kHBLzJ7Fxq3vF mhCksLeBiE2d/v2DxOL/3GIsDqnV5Plu0zHbuOb6gZnaqTTANxcoho85NXDpBPSWZer7 AT2sZC6lEow1k6+u1wLIqAWs8quxPc7VXJQro9s+M6IF2ZwpyeWh/aHuIU8x0zxr2rCB 9a/Cz/mUGoT8gMd3Du11cB0B66oQqqiQHgWBuVsaky0aZwilLP6eVHXx4SWMmrqeFULq hK/w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530OHh2q7BCCov4tHFrE/KaxBn69TZ5VltYVYtSQH76FvKGiLzqh sQLHoOvnORSkGBZ/cHxMZis= X-Google-Smtp-Source: ABdhPJzgm2aZKW/8bmxvx27/BScmLVR6vLIuD0XrgxNTbtZx0jo4gZilsF7ZZZHZxvTXxNQuf/5/Mg== X-Received: by 2002:a1c:6284:: with SMTP id w126mr3926287wmb.145.1606311994955; Wed, 25 Nov 2020 05:46:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:c689:: with SMTP id j9ls2859062wrg.0.gmail; Wed, 25 Nov 2020 05:46:34 -0800 (PST) X-Received: by 2002:adf:f7c7:: with SMTP id a7mr4224422wrq.347.1606311994203; Wed, 25 Nov 2020 05:46:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606311994; cv=none; d=google.com; s=arc-20160816; b=yt5kAEXluXOb1PSyRi27WbhGbX+i8EnGmNTtEggjG861c0YxvKffeZN4+yVuIslgtp DeeotFAmFYM3FaI7vCKlB7widB80WIbK6nvMXXJi83cgUGsFd930H9o4tnpaeLcsE4Wz cusIZaXHA7Vb6DPaSKOb37A0ADtBD/UwS2El2yG/f7dMWCHh4qoQYynDqqYK//MgS+mE ti4Yuugex2Z19D7K8YIRGzNFxc/st58iDijsIrX64IgR5sxZ9b3RXzHIithQAtCFSX93 F96VzQXui8hZw0n5qYmHgrloT1Xvpx5UQeeEldXPHOCt43+YYlnDuB6x4UGGdmIPiQtu SJTQ== 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=ScOXwfGUHUIcum4pd9ZKltNGlrCtTZYOy0dWn1UehKg=; b=pL7uZIXew8lXC4YIR8MVwWLZHBurXV4yWbyqmZIVoGqP9hfr+nfoXnP9hG29SLQtyl VlVQCxqA/6StQPkzKzV45VXDu+UbKwB6kAQkt+80TILeNqXVPROuWO6LNbOHBt6+ZBoC XgS9Arb3fay2eZ8qUCGvEOB/PyDrvaDuvw6XqZ6Esy7sIeeAMnWPF6d1ICp3jC+vMvxf BZ3/T5gzY7ED9AE4ncCAazBdxenfsDFdui0Sxm4Ur+UHblAbNCy620wSuOsge3m5jh6q Hyi6wcLj5rJP2g8ZUz7xZ6IpBdN30s0EcgdiHLNWjfg07iV4nARpE1AHfIGH29skIF+Y Rlig== 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 m5si64609wmc.0.2020.11.25.05.46.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Nov 2020 05:46:34 -0800 (PST) Received-SPF: pass (google.com: domain of vijaikumar_kanagarajan@mentor.com designates 68.232.137.252 as permitted sender) client-ip=68.232.137.252; IronPort-SDR: ZPdHYlNRxP3k8T27weZMeN9T+yYQBszmcUblPbk8YEv1nIvIhASJijJ5xljPmtM+50J7mC9m1t XJHC6+veJC6YuZnbhLhjPHNDOfe7eOuOynK5mD255YWGnZvhNdjchhwAhLdsloRcZ3dQG84wRV 03T91qZyb+l0h0ryS0U8jTC7aznNh/3St6dNgAhih9iwMtQjvSmiG7O/mBueYJfL+YCQyCWjRC RBxSikReemjUGipR8xXrwr7FsPrW+moFyHjm7eh/rsf7OkKZ/bTUhlgSt8eEZYH4h9TiLxrkP2 BqU= X-IronPort-AV: E=Sophos;i="5.78,368,1599552000"; d="scan'208";a="55597814" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa4.mentor.iphmx.com with ESMTP; 25 Nov 2020 05:46:33 -0800 IronPort-SDR: qlTapQoHOPz0YLK1/FnrfT89zc6aklkAFG7/j4NtxDH28AVZIB5qILJeOcfFp2BNCTXbT/dprB lfCCgkmUsRYJApyRVJS8A+04JNzjMvy9JukZgH7ZypiIqfxsqT7zDYTH3d1o4GKL06eQXkdL9W qABtEYwfgRBk3vmJfwtIW+QHqhfsb1DL2NxKwfAxb2YePFIS1NHMqEqiGRRwh9leAx2uis5RGq wugCgCvo5kvAEjgivFVHy8o0AXxTZF/bL5qNAvB4PXJsYesl7cOUSmzdqffMnY/16cbkXwLtYT I5Q= From: Vijai Kumar K To: CC: Vijai Kumar K Subject: [PATCH v8 14/14] doc/user_manual.md: Document details about deb-src caching Date: Wed, 25 Nov 2020 19:15:58 +0530 Message-ID: <20201125134558.26246-5-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> References: <20201125134414.26061-5-Vijaikumar_Kanagarajan@mentor.com> <20201125134558.26246-1-Vijaikumar_Kanagarajan@mentor.com> MIME-Version: 1.0 X-ClientProxiedBy: svr-orw-mbx-08.mgc.mentorg.com (147.34.90.208) 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?1684340206777216855?= X-GMAIL-MSGID: =?utf-8?q?1684340206777216855?= Add details about deb-src caching. Signed-off-by: Vijai Kumar K --- doc/user_manual.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/doc/user_manual.md b/doc/user_manual.md index 8d04cd2..cc7e47f 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -918,3 +918,33 @@ And build the corresponding image target: ``` bitbake mc:qemuarm64-buster:isar-image-base ``` +## Cache all upstream Debian source packages in local apt + +### Motivation + +OSS license compliance: Some licenses require to provide the corresponding sources code, +other require copyright attributions that may be best provided via the source code. In +addition, you may want to archive the code locally in order to ensure reproducibility (and +modifiability) in the future. + +Currently the local-apt generated has only Debian binary packages. Extend the local-apt +to have Debian source packages as well. + +### Solution + + - Trigger download of Debian source packages as part of rootfs postprocess. + +With the current base-apt implementation, we already cache all the binary packages that +we download and install onto the target rootfs and buildchroot. This is then used to +generate a local-apt for offline build. + +Use rootfs postprocessing to parse through the the list fo deb files in ${DEDDIR} and +download the corresponding Debian source file using "apt-get source" command. +This caches the sources of all the Debian packages that are downloaded and installed onto +the target rootfs and buildchroots. + +By default, the Debian source caching is not enabled. +To enable it, add the below line to your local.conf file. +``` +BASE_REPO_FEATURES = "cache-deb-src" +```