[OE-core] [PATCH] package.bbclass: don't error when the root doesn't exist in do_split_packages

[Martin Jansa]

On Wed, Jul 25, 2012 at 05:41:16PM +0100, Ross Burton wrote:
> If nothing has been installed in the root automake 1.12 won't install the
> directory, which means os.walk will throw a file not found exception.
> 
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/classes/package.bbclass |    8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index fc83424..85d6e81 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -74,6 +74,12 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
>      given package, usually plugins or modules.
>      """
>  
> +    dvar = d.getVar('PKGD', True)
> +
> +    # If the root doesn't exist, return early
> +    if not os.path.exists(dvar + root):
> +        return
> +
>      ml = d.getVar("MLPREFIX", True)
>      if ml:
>          if not output_pattern.startswith(ml):
> @@ -88,8 +94,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
>          if newdeps:
>              extra_depends = " ".join(newdeps)
>  
> -    dvar = d.getVar('PKGD', True)
> -
>      packages = d.getVar('PACKAGES', True).split()
>  
>      if postinst:

Isn't this real error which shouldn't be covered by this?

e.g. if someone removes or loose tmp-eglibc/work/foo/image (happens
to me all the time because tmp-eglibc is on tmpfs) then do_package is
reexecuted when sstate checksum is changed (even with
BB_SIGNATURE_HANDLER = "OEBasic") and in some cases it successfully
repackage .ipk files which are now empty and in some cases it fails
(e.g. with systemd.bbclass checking that requested .service files are
available in package during do_package).

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20120725/5c4e4ace/attachment-0002.sig>