[OE-core] [PATCH] archive-*-source.bbclass: have do_dumpdata_create_diff_gz task run before do_rootfs

[Kevin Strasser]

Hi Laurentiu,

On Fri, May 03, 2013 at 12:01:04PM +0300, Laurentiu Palcu wrote:
> do_rootfs[cleandirs] contains ${S} and, if do_rootfs task starts before
> the do_dumpdata_create_diff_gz is finished, an error will occur in the
> process because the directory will be removed while still needed by the
> create_diff_gz() function.
> 
> This patch will force the do_dumpdata_create_diff_gz task to run before
> do_rootfs when the final image is created.
> 
> [YOCTO #4310]
> 
> Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
> ---
>  meta/classes/archive-configured-source.bbclass |    2 +-
>  meta/classes/archive-original-source.bbclass   |    2 +-
>  meta/classes/archive-patched-source.bbclass    |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/archive-configured-source.bbclass b/meta/classes/archive-configured-source.bbclass
> index d346f69..a481b14 100644
> --- a/meta/classes/archive-configured-source.bbclass
> +++ b/meta/classes/archive-configured-source.bbclass
> @@ -14,7 +14,7 @@ addtask do_archive_configured_sources after do_configure
>  addtask do_archive_scripts_logs
>  
>  # Get dump date and create diff file 
> -addtask do_dumpdata_create_diff_gz
> +addtask do_dumpdata_create_diff_gz before do_rootfs
This will always add the task to the build, and break our ability to
filter out packages. I would suggest handling this dependency in the
anonymous python function after filtering has been applied.
>  
>  python () {
>      pn = d.getVar('PN', True)
> diff --git a/meta/classes/archive-original-source.bbclass b/meta/classes/archive-original-source.bbclass
> index 7258293..2796ff9 100644
> --- a/meta/classes/archive-original-source.bbclass
> +++ b/meta/classes/archive-original-source.bbclass
> @@ -14,7 +14,7 @@ addtask do_archive_original_sources_patches after do_unpack
>  addtask do_archive_scripts_logs
>  
>  # Get dump date and create diff file 
> -addtask do_dumpdata_create_diff_gz
> +addtask do_dumpdata_create_diff_gz before do_rootfs
ditto
>  
>  python () {
>      pn = d.getVar('PN', True)
> diff --git a/meta/classes/archive-patched-source.bbclass b/meta/classes/archive-patched-source.bbclass
> index 9e5ec74..995a259 100644
> --- a/meta/classes/archive-patched-source.bbclass
> +++ b/meta/classes/archive-patched-source.bbclass
> @@ -14,7 +14,7 @@ addtask do_archive_patched_sources after do_patch
>  addtask do_archive_scripts_logs
>  
>  # Get dump date and create diff file 
> -addtask do_dumpdata_create_diff_gz
> +addtask do_dumpdata_create_diff_gz before do_rootfs
ditto

Thanks,
Kevin
>  
>  python () {
>      pn = d.getVar('PN', True)
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core