From patchwork Thu Apr 3 12:58:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4133 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 03 Apr 2025 14:58:29 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 533CwSbZ007238 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 3 Apr 2025 14:58:28 +0200 Received: by mail-wm1-f55.google.com with SMTP id 5b1f17b1804b1-43ce8f82e66sf4915105e9.3 for ; Thu, 03 Apr 2025 05:58:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1743685103; cv=pass; d=google.com; s=arc-20240605; b=Ph6PlFgI/QF7U+0tz2Z1SOWhBLXMLaIf5kDFMijDBFgIb7uBf9lVOTBM491mPfGzF6 mmD7e9+MjPyDRF2nCw+QYGd48EXBDoCJr8GnkR0JcIbujHVWf1ju8Y6roT0zUTQyK2KB 0q7IbaQEgYWHoXgVlMpPSjZtDl1xwmr+tBReKR3cSu6SIwo2OAacrLk+fjEirLEvCatH UDs1mIUOw3hkon57TWlalheFBNZIZ2vqFCgsS6eyFokrFUH5uYE0u+GuCWuvqdRjs9/k z290CCxZ86+/6fAOkhjGIKcxvXi+NF4C/Gx87YKIG8Wklg0IQPqfyMNa8wKXvTa2stNq aCgw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OnNV2vpQIrZjWIkH6lHaE+YxQGLJiS9Tq94R8BnHyK8=; fh=z2Ns1PjDTPQriK16YXtThxDaX7Gx3nnvkmcbEoVxMEM=; b=YNGOFj9WlHVcUbkdG4DP1an0GQYLg7D0j9D6tObbNMGJaAsPuqBUtM6f7BiaCx1Ozf o1adBttETZSTPXqzzxyUAN8YUyl2Sl1ch1LHxABHWJ/UbRonawC+cMo99/4PtpW6PREy apzlexvyzR6tCIED+JoXXhMNu5sQfOUshROSkurWc21RjhJFCzyp1hKikVgupnnwQGzN mN8jhUElUyfaWJwTO9Nu7LTQlVYsqJarthbaMMzFx9yDCcWIlo5rYn/UnyuAVGixIIAk 3Z+4cvf4XlTC27uJl8jwD10ImlwwU0BB1gehllRQ6Ichw4/fQS6v4bwAOtT9izsWBDMJ ZjAw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUqYRMvp; spf=pass (google.com: domain of fm-1324425-20250403125818df6366050cd4aea120-xtquhb@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1324425-20250403125818df6366050cd4aea120-Xtquhb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1743685103; x=1744289903; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=OnNV2vpQIrZjWIkH6lHaE+YxQGLJiS9Tq94R8BnHyK8=; b=j+kXG4PKt9g1O/Cbwxst4b4B1NKfNk7zHyu2ef9uxlOoJJuDaMUaj3ie9t3jECJFOq mIRAxs7RiSJfARmHXre2kU9YYNxeOIVVzAc2pHQFgs+PKRAcCSx/w2NODOTfR/2Rf/p8 7PjF/aZU9ztbMUzrDTpVQ8LUrjO7MGdcequ/YBFQHcEJjMKi8Hrfg+UFcPpu4QSBfUs5 PnbE+DlkboBfnYA2CPhp8F+aBB/qYZjgkSM728g2/u8G3NXvQsAJkK42gOo3FdGrceiR aNsHA8lh8WA2ciHToCBDiABQtt7k5fvzG+BiQtE+/5pBphyT5MM6cBqzAiutIY9CybjM tUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743685103; x=1744289903; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OnNV2vpQIrZjWIkH6lHaE+YxQGLJiS9Tq94R8BnHyK8=; b=sNE4oB/wyWJNrzi0J0rAetWmDeTGvd+A81fRIbguBBss6jzzHB0dHmLAO1g+AdZILD azZNz62CTQx5p7bkdW5SYnGdKSj9/QzO7m9q0grVblD9t9kSipP4Ls1NyAFXDWtxqzod PBodhUspcb55wqHuqqGy6wF8VXcTqUWLG1mdYTa6tBm+uYcOeg3eyBuZoZ2rf/luLyWU u5Xy3jpJbWXh9rEbXh6VMgqzSNUGxWoU+QlVR3dm4shRLMpV9OFcoeSLzc9wQfc0lNOA j4rhuOjnNBWGa84uBDNhXoJR2iblFDANwkYCokmmy3KWDo4OuIOzSKmLI21HQ1xcShrf U7Lg== X-Forwarded-Encrypted: i=2; AJvYcCUFkhUWTICuKnk8E4Ra6dwEOpmEGGz6q1iLQJCP1GChxv1qhNtQzjGsPID3xcqRPwa/01hD4Tg=@isar-build.org X-Gm-Message-State: AOJu0YxVRu2vryV+nyPaSYdp2bMkbymzU+m/Ky7+N/RDLgWx2WIlF1mo 4q/vooP7zVtGKF6b94YKxJpySNahymnGlka6AAk3l9SH+Xw+G0Qa X-Google-Smtp-Source: AGHT+IHg14exPRGhnHYc4cu4Llq9V/FmAvjodDHzsnF9wCumnej9gUv9x8T9E2lnHa33w8X4ustQjw== X-Received: by 2002:a05:600c:1c1c:b0:43c:fd72:f028 with SMTP id 5b1f17b1804b1-43db62b5d7emr172914045e9.29.1743685101678; Thu, 03 Apr 2025 05:58:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAKgyn3PS6oOZwvf9AzVvBNGxOzNbIWw9r05GJKgjnLvHQ== Received: by 2002:a05:600c:1d03:b0:43d:1776:2ebe with SMTP id 5b1f17b1804b1-43ebec78c06ls6060435e9.2.-pod-prod-08-eu; Thu, 03 Apr 2025 05:58:19 -0700 (PDT) X-Received: by 2002:a05:600c:3d0c:b0:43d:8ea:8d7a with SMTP id 5b1f17b1804b1-43e8eeb6696mr142556465e9.28.1743685098775; Thu, 03 Apr 2025 05:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743685098; cv=none; d=google.com; s=arc-20240605; b=g1585dt88Vi/cDjzaaoSay8T8oKYIadGUAOUxp8X2mT1aIv/puggip5NFP3ICIyF91 aIT2FI/BBpwD1D/vFad5KttGeEYUVM8X/93FgcQTgfglJ24ujRuVTtu+xZdT43pgKbmw mI+6lax1jyNBb9P4MVNJ6egdtbF9Mff13nHEjV20VpzdKeBOzuzoba8jR+W9c/EEwGI2 RNIqK9ndvifbSbqWrdy7MMhXVbNVPOjDbjgMFeoxY9frtiJRXSkKNE4eHInZ9t1qIb+/ rt5buSmgiv3JZrRuG7KpmP5CpF+JAFWGiZDLmIIfEbl3RY+IgnOvv8OfjWFJdYi7lECp 97Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=yOVjg9mzDYkkku6vIk9cZ1znXNopFsD4ibNVsMVRpCE=; fh=8FjR+eCpauVZhKjl62lGY5IVgnJRyvTOjoFZetZ3BF8=; b=bTt+uZ4X06uPlavfZfZ6W2o+bSiv/e+v5zubIN82x8HhjmnYG6fGRKa1h0P24TNrOL 7OdRKEyZA6+bRt4ySXeop7+YauuKvP9RYWVLnjYF+DVBGr3Jliub/pZ1Gb0ZwHM1KHAZ Vv6MbsBK1xY7xTWdTVfbAD+YrNQeL+Yn76UflleFyYNWSS2pqaGzzedCtwPsFwNT3pEr xlH3QbYVKBxrihnSzH6APm6hr4pha7gN3DDlIxrQai3kkZDBFAUQyJIAerIB2g8S4fsy u6pZ3G3QZz2pZSUpA2g6R+mRQTgkI9oMwUjvCA1XIWK+QfS0tqgfZe9YZbySczrqBcpY HQng==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUqYRMvp; spf=pass (google.com: domain of fm-1324425-20250403125818df6366050cd4aea120-xtquhb@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1324425-20250403125818df6366050cd4aea120-Xtquhb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43ea8d166f4si1046955e9.0.2025.04.03.05.58.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 Apr 2025 05:58:18 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1324425-20250403125818df6366050cd4aea120-xtquhb@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 20250403125818df6366050cd4aea120 for ; Thu, 03 Apr 2025 14:58:18 +0200 X-Patchwork-Original-From: "srinuvasan.a via isar-users" From: "srinuvasan.a" To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, ubely@ilbers.de, srinuvasan Subject: [PATCH 2/2] image: move deb-src-caching functionality after image creation Date: Thu, 3 Apr 2025 18:28:57 +0530 Message-Id: <20250403125857.2525698-2-srinuvasan.a@siemens.com> In-Reply-To: <20250403125857.2525698-1-srinuvasan.a@siemens.com> References: <20250403125857.2525698-1-srinuvasan.a@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1324425:519-21489:flowmailer X-Original-Sender: srinuvasan.a@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=IUqYRMvp; spf=pass (google.com: domain of fm-1324425-20250403125818df6366050cd4aea120-xtquhb@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1324425-20250403125818df6366050cd4aea120-Xtquhb@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: srinuvasan.a@siemens.com Reply-To: srinuvasan.a@siemens.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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: srinuvasan When we do deb-src caching, we are missing to cache imager related packages, because the deb-src-caching functionality runs in the stage of ROOTFS_POSTPROCESS_COMAMND, but image creation task runs after the rootfs creation, hence imager related packages are missing in rootfs's var/cache/apt/archives. To solve this issue run the deb-src-caching after image creation, now we can able to download deb-src for all the deb packages. Signed-off-by: srinuvasan --- meta/classes/image.bbclass | 7 ++++++- meta/classes/rootfs.bbclass | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index ff3cd737..0789e0b6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -72,7 +72,12 @@ ROOTFS_MANIFEST_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_DPKGSTATUS_DEPLOY_DIR ?= "${DEPLOY_DIR_IMAGE}" ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" -ROOTFS_POSTPROCESS_COMMAND:prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " +CACHE_DEB_SRC = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', '1', '0', d)}" +python () { + if bb.utils.to_boolean(d.getVar('CACHE_DEB_SRC')): + bb.build.addtask('do_cache_deb_src', 'do_deploy', 'do_image', d) +} + ROOTFS_POSTPROCESS_COMMAND:prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-dbg-pkgs', 'cache_dbg_pkgs', '', d)} " inherit rootfs diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 406e9192..3055b0fc 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -272,7 +272,8 @@ python do_rootfs_install() { } addtask rootfs_install before do_rootfs_postprocess after do_unpack -cache_deb_src() { +do_cache_deb_src[network] = "${TASK_USE_SUDO}" +do_cache_deb_src() { if [ -e "${ROOTFSDIR}"/etc/resolv.conf ] || [ -h "${ROOTFSDIR}"/etc/resolv.conf ]; then sudo mv "${ROOTFSDIR}"/etc/resolv.conf "${ROOTFSDIR}"/etc/resolv.conf.isar