[PATCH v2] Add ${S} to do_unpack[cleandirs]

[PATCH v2] Add ${S} to do_unpack[cleandirs]

[Markus Lehtonen]

Resending this second iteration of the patch.

Markus Lehtonen (1):
  base.bbclass wipe ${S} before unpacking source

 meta/classes/base.bbclass | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

-- 
2.6.2

[PATCH v2] base.bbclass wipe ${S} before unpacking source

[Markus Lehtonen]

Make sure that we have a pristine source tree after do_unpack.

[YOCTO #9064]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 meta/classes/base.bbclass | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 1372f38..aa107d4 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -133,23 +133,15 @@ python base_do_fetch() {
 
 addtask unpack after do_fetch
 do_unpack[dirs] = "${WORKDIR}"
+do_unpack[cleandirs] = "${@d.getVar('S', True) if d.getVar('S', True) != d.getVar('WORKDIR', True) else ''}"
 python base_do_unpack() {
     src_uri = (d.getVar('SRC_URI', True) or "").split()
     if len(src_uri) == 0:
         return
 
-    rootdir = d.getVar('WORKDIR', True)
-
-    # Ensure that we cleanup ${S}/patches
-    # TODO: Investigate if we can remove
-    # the entire ${S} in this case.
-    s_dir = d.getVar('S', True)
-    p_dir = os.path.join(s_dir, 'patches')
-    bb.utils.remove(p_dir, True)
-
     try:
         fetcher = bb.fetch2.Fetch(src_uri, d)
-        fetcher.unpack(rootdir)
+        fetcher.unpack(d.getVar('WORKDIR', True))
     except bb.fetch2.BBFetchException as e:
         raise bb.build.FuncFailed(e)
 }
-- 
2.6.2

Re: [PATCH v2] base.bbclass wipe ${S} before unpacking source

[Richard Purdie]

On Tue, 2016-03-22 at 09:24 +0200, Markus Lehtonen wrote:
> Make sure that we have a pristine source tree after do_unpack.
> 
> [YOCTO #9064]
> 
> Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
> ---
>  meta/classes/base.bbclass | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
> index 1372f38..aa107d4 100644
> --- a/meta/classes/base.bbclass
> +++ b/meta/classes/base.bbclass
> @@ -133,23 +133,15 @@ python base_do_fetch() {
>  
>  addtask unpack after do_fetch
>  do_unpack[dirs] = "${WORKDIR}"
> +do_unpack[cleandirs] = "${@d.getVar('S', True) if d.getVar('S',
> True) != d.getVar('WORKDIR', True) else ''}"

Should this be else '${S}/patches'?

If we don't do that, there might be a case where we don't clean up the
patches directory when we could/should compared to the existing code?

Cheers,

Richard

Re: [PATCH v2] base.bbclass wipe ${S} before unpacking source

[Markus Lehtonen]

On 22/03/16 09:47, "Richard Purdie" <richard.purdie@linuxfoundation.org> wrote:


>On Tue, 2016-03-22 at 09:24 +0200, Markus Lehtonen wrote:
>> Make sure that we have a pristine source tree after do_unpack.
>> 
>> [YOCTO #9064]
>> 
>> Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
>> ---
>>  meta/classes/base.bbclass | 12 ++----------
>>  1 file changed, 2 insertions(+), 10 deletions(-)
>> 
>> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>> index 1372f38..aa107d4 100644
>> --- a/meta/classes/base.bbclass
>> +++ b/meta/classes/base.bbclass
>> @@ -133,23 +133,15 @@ python base_do_fetch() {
>>  
>>  addtask unpack after do_fetch
>>  do_unpack[dirs] = "${WORKDIR}"
>> +do_unpack[cleandirs] = "${@d.getVar('S', True) if d.getVar('S',
>> True) != d.getVar('WORKDIR', True) else ''}"
>
>Should this be else '${S}/patches'?
>
>If we don't do that, there might be a case where we don't clean up the
>patches directory when we could/should compared to the existing code?

Yes, it should. Good catch, thank you Richard!

Cheers,
  Markus