[OE-core] [PATCH] oeqa/controllers/beaglebonetarget.py: fix conditions for files copied to /boot

[Saul Wold]

On 05/27/2014 04:14 AM, Stefan Stanacar wrote:
> On Tue, May 27, 2014 at 12:50 PM, Corneliu Stoicescu
> <corneliux.stoicescu at intel.com> wrote:
>
>> ---
>>   meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>
> As this patch is for meta-yocto-bsp this should be sent to
> poky at yoctoproject.org list...
>
>> diff --git a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
>> index 53f454b..af56bda 100644
>> --- a/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
>> +++ b/meta-yocto-bsp/lib/oeqa/controllers/beaglebonetarget.py
>> @@ -41,12 +41,12 @@ class BeagleBoneTarget(MasterImageHardwareTarget):
>>                   'mount -L testrootfs /mnt/testrootfs',
>>                   'rm -rf /mnt/testrootfs/*',
>>                   'tar xzvf ~/test-rootfs.tar.gz -C /mnt/testrootfs',
>> -                '[ ! -e /mnt/testrootfs/boot/uImage ] && cp ~/test-kernel /mnt/testrootfs/boot/uImage',
>> +                'if [ ! -e /mnt/testrootfs/boot/uImage ]; then cp ~/test-kernel /mnt/testrootfs/boot/uImage; fi',
>
> How about reversing the check: [ -e /mnt/testrootfs/boot/uImage] || cp
> ~/test-kernel /mnt/testrootfs/boot/uImage
> That would work in both cases, if it exists it won't copy the kernel
> and returns 0, if it doesn't it will copy and returns the result of
> cp.
>
>>                   ]
>>
>>           for _, dtbfn in self.dtbs:
>>               # Kernel and dtb files may not be in the image, so copy them if not
>> -            self.deploy_cmds.append('[ ! -e /mnt/testrootfs/boot/{0} ] && cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn))
>> +            self.deploy_cmds.append('if [ ! -e /mnt/testrootfs/boot/{0} ]; then cp ~/{0} /mnt/testrootfs/boot/'.format(dtbfn) + '; fi')
>>
>
> Same here.
>

I agree with Stephan here along with Anders comments and this should 
really be on poky@ list, so a v3 to the poky at yoctoproject would be best.

Thanks
	Sau!

>
> Cheers,
> Stefan
>
>>           if not self.serialcontrol_cmd:
>>               bb.fatal("This TEST_TARGET needs a TEST_SERIALCONTROL_CMD defined in local.conf.")
>> --
>> 1.8.3.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core