From patchwork Wed Mar 5 14:25:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "srinuvasan.a" X-Patchwork-Id: 4078 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 05 Mar 2025 15:25:15 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f60.google.com (mail-pj1-f60.google.com [209.85.216.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 525EPDKt017114 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 5 Mar 2025 15:25:15 +0100 Received: by mail-pj1-f60.google.com with SMTP id 98e67ed59e1d1-2fe93bb62c6sf2481319a91.2 for ; Wed, 05 Mar 2025 06:25:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1741184708; cv=pass; d=google.com; s=arc-20240605; b=Fo+At2lxvuh9PuY2JpGa4g+c85c3h1XndDhs5ULkR9i9fd2IKR2l7PRUspx2+BHP8L pHppfNpjz9ZWwT2BASIHAcnakvo5UAv6r75xB5BNhcdtQ+1T6re4jsVCwiE932257wFo ZtTK4Tdk0D32CLKkeO8Nxp5YNfcB3IkkADJ9vb8Q+xu0IMOvnLVRKdMrfhbPbLYW6/5U hqyruM0+p8PvpvRYsMeuhKuXUh+G44O2gCiWuHEF1OtOu6VQjV6P1+y6flSP11g1sRWD VjECbq/YRM/83wc7iY5LxFRvxOaLSdiXmirBOmA9b2N5aWBr5n7qGPZTnBhJQv9QQbJp 1WSw== 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=Kuk3RMk1WUPEA/G3D2A07q08Fr9Tz8U1IAyAj7ZxJ4s=; fh=iq1t2Xi/vSPbWPhVYouQwQDbcIOqsKzQKaAyJ6+3UcQ=; b=dw3vNSmHsINOgpYa0mHFaB+R5MXIohrBqyO7BtHPFTl+ZLgCJYaYPtRGJvUSoY00OE Lwa5PVjHpnHj5s6MundywrYssDtrs+Bqh9Fs0xF0i+XFpSFGUmQPsjTiM99/OWONkax3 fdWT7384vKkVjQz+fD7JF4SoX0y2qAb6dZHyGg8E7JdgWJ3N/dy+yWLc/yoTYqqPLQsm k9LjIpDbWf/WG2vxhzbLN5sz8BGb3J6foRYMXBkIzGP44dhmNkGpjVuK6NcywMTrxAJu BdssxSbSW0waxqE1dcTilP6iW7WE2vMdJVsFmI7TSET46Nfj+p6oQD5kckgLmC43e/xA QCRg==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EMCKWcza; spf=pass (google.com: domain of fm-1324425-20250305142502a9aff8d01bcd373013-crldgq@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20250305142502a9aff8d01bcd373013-CRLdGq@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=1741184708; x=1741789508; 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=Kuk3RMk1WUPEA/G3D2A07q08Fr9Tz8U1IAyAj7ZxJ4s=; b=SCmgvTRgz7k9E4nzwQyiUIMfUW4YZQLKTR95tK2ht+vwnb7S5/8X+sO/oOZRW8gzSr LD2YMc8jjOHoYr178OtnrSVRInq4zOQfq3A/t9ofh/HbPsEroHzchZdiSA7sn0CJG170 4y+gd2vEpTgHYqFo+tA9lCRGpAsbo76ud1SMFfvgcM3XoFUsZ+hn6WLbzp5W38zlBkX5 177d7MuHGb2IXIRftcEP/BDDUJcy/pO2qFyxUrIf5pXVqZVAJ8mrcCJce+YG0tN8v+vc +24M2tzKi89rfXmHTXIUm4v/vrV0wqg8rTY3vx4/VPW5X+A031v4PETI3jGEr/1CX4vS y1yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741184708; x=1741789508; 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=Kuk3RMk1WUPEA/G3D2A07q08Fr9Tz8U1IAyAj7ZxJ4s=; b=I1OwUf6t7ayv1U9FnUfw8eCPA6L6DCBHLeMvln3OBLI2vk6gBKv1J55CRuWf9P9yd2 CkYxA8EBVnvNA480y3oDwUrJBVlkwGEOPiNCYEfW3WN4KFDM5CeJYNVqiZuTpJ84YQzN jwbX/UQQoT2IwP9KAXi16k2Tz1Jw9/ddNEen3Pr8ybJfAkx2N+NusAZFQsakOfIq6U3t iC/UPuvA7Sz7vGsThzrVgjDArm/PqchuR1h0/h5mlB7s2SvylivQpXwRfKDD7m2JXUjL gc8aG9TdhkESJ0IueQ5R5rw3mvkCp+XhxVnT8Ry5lCZGYL5KvnbZXj+k1cwT/DDG+MDV 8KcQ== X-Forwarded-Encrypted: i=2; AJvYcCVnYUNql/Q3QoIjxaw3emfoWp5OalLSealTRQjOyER122utS0NjzGF1y1OWMiPbj7O2kj6KKXI=@isar-build.org X-Gm-Message-State: AOJu0YzMrN84p65ZaWXhY6rHE8rSIsmgUCBXWmDwMJnzuysKQ4kG8k5U nkv4iN9WSX45n+AaBXvpUHIyWED7UQWKsPDgukhW+payAFbjs5w4 X-Google-Smtp-Source: AGHT+IFJkCuFq9RxJroVipSU1CEmWWny+sxHykCGqDcG9pNg1LpN8vYwDnYf6NVELCqb2A2JgGxxnQ== X-Received: by 2002:a17:90b:1a85:b0:2fe:a8b1:7cd with SMTP id 98e67ed59e1d1-2ff4971882cmr2237897a91.2.1741184708058; Wed, 05 Mar 2025 06:25:08 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVEnbh3k63yiCayyMVrDqKm+2k7281b5RxocCdexl9kbug== Received: by 2002:a17:90a:c57:b0:2ff:5214:c080 with SMTP id 98e67ed59e1d1-2ff5214ccb7ls341870a91.2.-pod-prod-00-us-canary; Wed, 05 Mar 2025 06:25:06 -0800 (PST) X-Received: by 2002:a05:6a21:6b18:b0:1f3:383e:7739 with SMTP id adf61e73a8af0-1f3391176eamr11929115637.7.1741184706138; Wed, 05 Mar 2025 06:25:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1741184706; cv=none; d=google.com; s=arc-20240605; b=InhNTt7KiK8SiKacwjVWRtdv+Hk8gWn0Tij6QoECBzCWn5DhZpho3ZBfuoNm4ANL1o h4rB/g+gP4JwSNaYOyOL3p31dxCaBb5euhUseBfb8iUdrrfhS4TGSriYN3LfrPHCoBn0 i7N7V7AHbRfTAYMsNLo6Zw8XbXMYIgZ74a7+5lOiwh69XkabQikN+KiiU9gKjsjdTlQZ Q4ALCp3vYN7BbExztK6cyPfNRWI+J7cRTqFLs+s2SZEcx/2MrBqAOsjAtx84LZZMybAy 1ysP9xR2v/Di+pl3AfU0rJbxQ4ytGgF0QXeUh6ZuXQpJWZb8FWFdllX9tkw4BP4team/ iAyw== 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=I9XrquFPm+mY2fbadFJ32313FJ03XGm1w+NHIJyKr6U=; fh=8FjR+eCpauVZhKjl62lGY5IVgnJRyvTOjoFZetZ3BF8=; b=GH6tWT33OZ6dTQU7icwgO+bpJjd66j8lQkzQobJoHV55aZjCo0stgXVtvER3iCoRPu oK/LHhcYc0AhPhour3D4ZMvxpntOA/BKv9sClDlstAY6QFU2SeOD41nqGWAO9zT5XtNe qwf6CNajSuYYFJdMGgrU+2Ap1llzVOG2T2DicoP8pFHmOnOE6UMXosNuctNcmwaO4t2O ez5tb0lxa30o4k9ACCqG5iy7N1yQ1TJtT4eUagioj6xZlUU5qU2H5I9G2vAiNa2xuRvk 9lw1pWb6a0CjWGcA16Cn7l1y9fES2mw5HP+ktoWtPpF7sMrw9Uh+uk4YqmxphEtbpnVR mJxw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=EMCKWcza; spf=pass (google.com: domain of fm-1324425-20250305142502a9aff8d01bcd373013-crldgq@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20250305142502a9aff8d01bcd373013-CRLdGq@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id 41be03b00d2f7-aee7ded1481si726572a12.5.2025.03.05.06.25.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Mar 2025 06:25:06 -0800 (PST) Received-SPF: pass (google.com: domain of fm-1324425-20250305142502a9aff8d01bcd373013-crldgq@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20250305142502a9aff8d01bcd373013 for ; Wed, 05 Mar 2025 15:25:02 +0100 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/3] image: download deb-src packages after imager creation Date: Wed, 5 Mar 2025 19:55:12 +0530 Message-Id: <20250305142513.1841415-2-srinuvasan.a@siemens.com> In-Reply-To: <20250305142513.1841415-1-srinuvasan.a@siemens.com> References: <20250305142513.1841415-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=fm1 header.b=EMCKWcza; spf=pass (google.com: domain of fm-1324425-20250305142502a9aff8d01bcd373013-crldgq@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-1324425-20250305142502a9aff8d01bcd373013-CRLdGq@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_H3,RCVD_IN_MSPIKE_WL, 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 With the present implementation, deb-src packages are missing for imager related deb packages (packages listed in IMAGER_INSTALL). Copy the /var/log/dpkg.log file from the sbuild environment to outside With that, use the list to download deb-src packages for IMAGER_INSTALL related deb packages. Presently, cache_deb_src function running as part of ROOTFS_POSTPROCESS_COMMAND, this will not be helpful to get the imager related deb-src packages, hence make cache_deb_src as a separate task and running always after do_image to get the imager deps related deb-src packages. Signed-off-by: srinuvasan --- meta/classes/image-tools-extension.bbclass | 8 +++++++- meta/classes/image.bbclass | 8 +++++++- meta/classes/rootfs.bbclass | 3 ++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/meta/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass index e8ace8f5..156dfcb3 100644 --- a/meta/classes/image-tools-extension.bbclass +++ b/meta/classes/image-tools-extension.bbclass @@ -7,6 +7,9 @@ inherit sbuild +PP = "/home/builder/${PN}-${MACHINE}" +ext_root="${PP}/rootfs" + IMAGER_INSTALL ??= "" IMAGER_BUILD_DEPS ??= "" DEPENDS += "${IMAGER_BUILD_DEPS}" @@ -59,9 +62,11 @@ EOAPT deb_dl_dir_export ${schroot_dir} ${distro} schroot -r -c ${session_id} -d / -u root -- sh -c " \ + rm -f /var/log/dpkg.log apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y \ --allow-unauthenticated --allow-downgrades install \ - ${local_install}" + ${local_install} + cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" fi schroot -r -c ${session_id} "$@" @@ -70,4 +75,5 @@ EOAPT remove_mounts schroot_delete_configs + sbuild_dpkg_log_export "${WORKDIR}/rootfs/dpkg_partial.log" } diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 56eca202..66b4d313 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -72,7 +72,13 @@ 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) +} + inherit rootfs inherit sdk diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index 205da640..b9d360e7 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