Patchwork [1/1] populate_sdk_base: modify the recrdeptask of do_populate_sdk

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date May 5, 2014, 8:11 a.m.
Message ID <70f2774fe13948f7f044c202325762d48cd1369e.1399275082.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/71503/
State New
Headers show

Comments

Qi.Chen@windriver.com - May 5, 2014, 8:11 a.m.
If 'rm_work' is enabled, `bitbake core-image-xxx -c populate_sdk'
doesn't clean things up for the nativesdk packages.

This patch modifies the 'recrdeptask' for do_populate_sdk to fix this
problem.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
---
 meta/classes/populate_sdk_base.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Purdie - May 5, 2014, 8:18 a.m.
On Mon, 2014-05-05 at 16:11 +0800, Chen Qi wrote:
> If 'rm_work' is enabled, `bitbake core-image-xxx -c populate_sdk'
> doesn't clean things up for the nativesdk packages.
> 
> This patch modifies the 'recrdeptask' for do_populate_sdk to fix this
> problem.
> 
> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
> ---
>  meta/classes/populate_sdk_base.bbclass |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
> index 10d04ed..278d1b7 100644
> --- a/meta/classes/populate_sdk_base.bbclass
> +++ b/meta/classes/populate_sdk_base.bbclass
> @@ -333,5 +333,5 @@ populate_sdk_log_check() {
>  do_populate_sdk[dirs] = "${TOPDIR}"
>  do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
>  do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
> -do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
> +do_populate_sdk[recrdeptask] += "do_packagedata do_${BB_DEFAULT_TASK}"

No. This task has no such dependency on do_build of the other tasks. We
don't create invalid dependencies just for the sake of it.

If you run "bitbake X -c populate_sysroot" or -c package_write_ipk or
101 other options, it will not run rm_work either. Are you proposing we
add do_${BB_DEFAULT_TASK} to every task in the system?

Cheers,

Richard
Qi.Chen@windriver.com - May 5, 2014, 8:58 a.m.
On 05/05/2014 04:18 PM, Richard Purdie wrote:
> On Mon, 2014-05-05 at 16:11 +0800, Chen Qi wrote:
>> If 'rm_work' is enabled, `bitbake core-image-xxx -c populate_sdk'
>> doesn't clean things up for the nativesdk packages.
>>
>> This patch modifies the 'recrdeptask' for do_populate_sdk to fix this
>> problem.
>>
>> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
>> ---
>>   meta/classes/populate_sdk_base.bbclass |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
>> index 10d04ed..278d1b7 100644
>> --- a/meta/classes/populate_sdk_base.bbclass
>> +++ b/meta/classes/populate_sdk_base.bbclass
>> @@ -333,5 +333,5 @@ populate_sdk_log_check() {
>>   do_populate_sdk[dirs] = "${TOPDIR}"
>>   do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
>>   do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
>> -do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
>> +do_populate_sdk[recrdeptask] += "do_packagedata do_${BB_DEFAULT_TASK}"
> No. This task has no such dependency on do_build of the other tasks. We
> don't create invalid dependencies just for the sake of it.
>
> If you run "bitbake X -c populate_sysroot" or -c package_write_ipk or
> 101 other options, it will not run rm_work either. Are you proposing we
> add do_${BB_DEFAULT_TASK} to every task in the system?
>
> Cheers,
>
> Richard
>
>
>

Thanks for making things clear.

Best Regards,
Chen Qi

Patch

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 10d04ed..278d1b7 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -333,5 +333,5 @@  populate_sdk_log_check() {
 do_populate_sdk[dirs] = "${TOPDIR}"
 do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])}"
 do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
-do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
+do_populate_sdk[recrdeptask] += "do_packagedata do_${BB_DEFAULT_TASK}"
 addtask populate_sdk