From patchwork Thu Oct 19 05:39:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 32555 X-Patchwork-Delegate: reatmon@ti.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 144ECCDB482 for ; Thu, 19 Oct 2023 05:39:48 +0000 (UTC) Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.64]) by mx.groups.io with SMTP id smtpd.web11.20869.1697693985801564584 for ; Wed, 18 Oct 2023 22:39:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: denix.org, ip: 64.68.198.64, mailfrom: denis@denix.org) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id C618040D75; Thu, 19 Oct 2023 05:39:44 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo14-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DaED1oCum6pP; Thu, 19 Oct 2023 05:39:44 +0000 (UTC) Received: from mail.denix.org (pool-100-15-87-159.washdc.fios.verizon.net [100.15.87.159]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 9C75A40D19; Thu, 19 Oct 2023 05:39:43 +0000 (UTC) Received: from thorin.denix (thorin.denix [192.168.30.9]) by mail.denix.org (Postfix) with ESMTP id 9A3A4163D09; Thu, 19 Oct 2023 01:39:42 -0400 (EDT) From: Denys Dmytriyenko To: meta-arago@lists.yoctoproject.org Cc: Denys Dmytriyenko Subject: [master/kirkstone][PATCH] tisdk-bundle: bring this class on par with current image.bbclass Date: Thu, 19 Oct 2023 05:39:40 +0000 Message-Id: <20231019053940.2441103-1-denis@denix.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 19 Oct 2023 05:39:48 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arago/message/14953 From: Denys Dmytriyenko As tisdk-bundle was based on the image class long time ago, it inherited some of its old attributes and artifacts used back in the days. There were several updates and reworks done to this class through the years to keep it up to date and in sync with upstream image class, but some pieces fell through the cracks. In recent and not so recent years upstream image class have deprecated some things, changed and extended others, such as consolidated umask handling, improved sstate handling, expanded list of cleaned directories and changed stamping and locking policy. Since tisdk-bundle inherits image class, corresponding attributes for do_rootfs, do_image and do_image_complete don't need to be modified here and can be left to their default values, as well as the order of those tasks. This change addresses the issue with sstate/deploy file collisions we've been seeing at times lately resulting in pseudo abort errors. And it improves long term maintainability of tisdk-bundle class as well. Signed-off-by: Denys Dmytriyenko --- meta-arago-distro/classes/tisdk-bundle.bbclass | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index 193181be..9054e742 100644 --- a/meta-arago-distro/classes/tisdk-bundle.bbclass +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass @@ -88,10 +88,6 @@ do_rootfs[depends] += "${@string_set('%s:do_image_complete' % pn for pn in (d.ge do_rootfs[depends] += "${@string_set('%s:do_populate_sdk' % pn for pn in (d.getVar("TISDK_TOOLCHAIN") or "").split())}" do_rootfs[mcdepends] += "${@string_set('%s:do_populate_sdk' % pn for pn in (d.getVar("TISDK_TOOLCHAIN_K3R5") or "").split())}" -do_rootfs[nostamp] = "1" -do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock" -do_rootfs[cleandirs] += "${S}" - # Call the cleanup_host_packages to remove packages that should be removed from # the host for various reasons. This may include licensing issues as well. OPKG_POSTPROCESS_COMMANDS = "cleanup_host_packages; " @@ -132,9 +128,6 @@ fakeroot python do_image () { execute_pre_post_process(d, pre_process_cmds) } -do_image[dirs] = "${TOPDIR}" -do_image[umask] = "022" -addtask do_image after do_rootfs before do_build fakeroot python do_image_complete () { from oe.utils import execute_pre_post_process @@ -143,9 +136,6 @@ fakeroot python do_image_complete () { execute_pre_post_process(d, post_process_cmds) } -do_image_complete[dirs] = "${TOPDIR}" -do_image_complete[umask] = "022" -addtask do_image_complete after do_image before do_build tisdk_image_setup () { set -x