Message ID | 20231019063335.3009239-1-denis@denix.org |
---|---|
State | Accepted |
Delegated to: | Ryan Eatmon |
Headers | show |
Series | [master/kirkstone,v2] tisdk-bundle: bring this class on par with current image.bbclass | expand |
On 10/19/2023 1:33 AM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko <denys@konsulko.com> > > 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. You are a rockstar, Denys. Thank you. > Signed-off-by: Denys Dmytriyenko <denys@konsulko.com> > --- > v2 - drop couple more lines > > meta-arago-distro/classes/tisdk-bundle.bbclass | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass > index 193181be..49504089 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 > @@ -345,6 +335,3 @@ tisdk_image_cleanup () { > license_create_manifest() { > : > } > - > -EXPORT_FUNCTIONS do_rootfs > -addtask rootfs before do_build after do_install
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass index 193181be..49504089 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 @@ -345,6 +335,3 @@ tisdk_image_cleanup () { license_create_manifest() { : } - -EXPORT_FUNCTIONS do_rootfs -addtask rootfs before do_build after do_install