public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
From: "Richard Purdie" <richard.purdie@linuxfoundation.org>
To: Mark Hatle <mark.hatle@kernel.crashing.org>,
	 openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [master][PATCH 1/5] package_tar.bbclass: Sync to the other package_* classes
Date: Tue, 25 Aug 2020 11:49:42 +0100	[thread overview]
Message-ID: <65d6973c588c636725c857bfb4fb8e8db68fb254.camel@linuxfoundation.org> (raw)
In-Reply-To: <20200824232930.150388-2-mark.hatle@kernel.crashing.org>

On Mon, 2020-08-24 at 18:29 -0500, Mark Hatle wrote:
> Sync up the task definitions with the other package classes.  This may not
> have been strictly necessary but will make overall maintenance easier as
> the various package classes are now in sync.
> 
> Additional, there was a missing deltask in the nopackages.bbclass related
> to the package_tar which has been corrected.  This could cause problems on
> native recipes when package_tar was enabled.
> 
> Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
> ---
>  meta/classes/nopackages.bbclass  |  1 +
>  meta/classes/package_tar.bbclass | 11 ++++++-----
>  2 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass
> index 559f5078bd..7a4f632d71 100644
> --- a/meta/classes/nopackages.bbclass
> +++ b/meta/classes/nopackages.bbclass
> @@ -2,6 +2,7 @@ deltask do_package
>  deltask do_package_write_rpm
>  deltask do_package_write_ipk
>  deltask do_package_write_deb
> +deltask do_package_write_tar
>  deltask do_package_qa
>  deltask do_packagedata
>  deltask do_package_setscene

This part makes sense.

> diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
> index ce3ab4c8e2..8946bc212a 100644
> --- a/meta/classes/package_tar.bbclass
> +++ b/meta/classes/package_tar.bbclass
> @@ -57,10 +57,8 @@ python do_package_tar () {
>  
>  python () {
>      if d.getVar('PACKAGES') != '':
> -        deps = (d.getVarFlag('do_package_write_tar', 'depends') or "").split()
> -        deps.append('tar-native:do_populate_sysroot')
> -        deps.append('virtual/fakeroot-native:do_populate_sysroot')
> -        d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps))
> +        deps = ' tar-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot'
> +        d.appendVarFlag('do_package_write_tar', 'depends', deps)

This is effectively no change but standardises so ok...

>          d.setVarFlag('do_package_write_tar', 'fakeroot', "1")
>  }
>  
> @@ -70,4 +68,7 @@ python do_package_write_tar () {
>      bb.build.exec_func("do_package_tar", d)
>  }
>  do_package_write_tar[dirs] = "${D}"
> -addtask package_write_tar before do_build after do_packagedata do_package
> +do_package_write_tar[depends] += "${@oe.utils.build_depends_string(d.getVar('PACKAGE_WRITE_DEPS'), 'do_populate_sysroot')}"

Does package_tar need those dependencies? it doesn't handle postinsts
so it basically doesn't.

> +addtask package_write_tar after do_packagedata do_package
> +
> +do_build[recrdeptask] += "do_package_write_tar"

This is also incorrect since tar's have no dependencies on other things
and I suspect this difference is deliberate.

Cheers,

Richard





  reply	other threads:[~2020-08-25 10:49 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-24 23:29 [master][PATCH 0/5] Allow PR Service and hash equiv together Mark Hatle
2020-08-24 23:29 ` [master][PATCH 1/5] package_tar.bbclass: Sync to the other package_* classes Mark Hatle
2020-08-25 10:49   ` Richard Purdie [this message]
2020-08-24 23:29 ` [master][PATCH 2/5] hash equivalency and pr service Mark Hatle
2020-08-25 12:50   ` [OE-core] " Joshua Watt
2020-08-25 14:16     ` Mark Hatle
2020-08-25 18:36       ` Richard Purdie
2020-08-24 23:29 ` [master][PATCH 3/5] package.bbclass: Move package_get_auto_pr to packagedata.bbclass Mark Hatle
2020-08-24 23:29 ` [master][PATCH 4/5] package / packagedata bbclass: Change the way PRAUTO and AUTOINC are handled Mark Hatle
2020-08-25 10:56   ` [OE-core] " Richard Purdie
2020-08-25 14:14     ` Mark Hatle
     [not found]     ` <162E885FFA00831B.12036@lists.openembedded.org>
2020-08-25 16:52       ` Mark Hatle
2020-08-25 17:04         ` Richard Purdie
2020-08-25 22:10           ` Mark Hatle
2020-08-25 11:00   ` Richard Purdie
2020-08-24 23:29 ` [master][PATCH 5/5] buildhistory.bbclass: Rework to use read_subpackage_metadata Mark Hatle
2020-08-24 23:32 ` ✗ patchtest: failure for Allow PR Service and hash equiv together Patchwork
2020-08-25  1:17   ` Mark Hatle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=65d6973c588c636725c857bfb4fb8e8db68fb254.camel@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --cc=mark.hatle@kernel.crashing.org \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox