[OE-core] U-boot file is being removed when image-recipe is rebuild which uses wic.bz2

[Ahsan, Noor]

This is my wks file 

part u-boot --source rawcopy --sourceparams="file=u-boot-mx6-solox.imx" --ondisk mmcblk --no-table --align 1
part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 8M --extra-space 0
part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 4096

u-boot-mx6-solox.imx gets removed after wic is called.

It is in fsimage.py. see os.rename(source, image_file + '.p%d' % part['num']).


def assemble(self, image_file):
        msger.debug("Installing partitions")

        for part in self.partitions:
            source = part['source_file']
            if source:
                # install source_file contents into a partition
                cmd = "dd if=%s of=%s bs=%d seek=%d count=%d conv=notrunc" % \
                      (source, image_file, self.sector_size,
                       part['start'], part['size'])
                exec_cmd(cmd)

                msger.debug("Installed %s in partition %d, sectors %d-%d, "
                            "size %d sectors" % \
                            (source, part['num'], part['start'],
                             part['start'] + part['size'] - 1, part['size']))

                os.rename(source, image_file + '.p%d' % part['num'])

-----Original Message-----
From: Ed Bartosh [mailto:ed.bartosh at linux.intel.com] 
Sent: Tuesday, October 27, 2015 8:27 PM
To: Ahsan, Noor
Cc: openembedded-core at lists.openembedded.org
Subject: Re: U-boot file is being removed when image-recipe is rebuild which uses wic.bz2

On Tue, Oct 27, 2015 at 02:28:02PM +0000, Ahsan, Noor wrote:
> Hello,
> 
> I have identified the issue and sent and RFC on mailing list. One feedback I received was replace dd_cmd = "cp src dst" with dd_cmd = "cp %s %s" % (src, dst) which was and off sight from me. I need more detailed review of it.

Can you point me out where the renaming you've mentioned is happening?

Anyway it would be good if I could reproduce the issue to better understand it. Can you provide more details about your configuration?

Regards,
Ed


> 
> Noor
> 
> -----Original Message-----
> From: Ed Bartosh [mailto:ed.bartosh at linux.intel.com]
> Sent: Tuesday, October 27, 2015 6:41 PM
> To: Ahsan, Noor
> Cc: openembedded-core at lists.openembedded.org
> Subject: Re: U-boot file is being removed when image-recipe is rebuild 
> which uses wic.bz2
> 
> Hi Noor,
> 
> Sorry for delay. I missed your e-mail somehow.
> 
> Can you please show your recipe, wks file and the details of your build configuration(MACHINE, bblayers, etc) ?
> 
> ---
> Regards,
> Ed

> Date: Thu, 22 Oct 2015 10:14:02 +0000
> From: "Ahsan, Noor" <Noor_Ahsan at mentor.com>
> To: "openembedded-core at lists.openembedded.org"
>  <openembedded-core at lists.openembedded.org>
> Subject: Re: [OE-core] [RFC] rawcopy.py: Copy source file in image 
> creation  build folder
> 
> 
> 
> -----Original Message-----
> From: Ahsan, Noor
> Sent: Wednesday, October 21, 2015 9:04 PM
> To: openembedded-core at lists.openembedded.org
> Cc: Ahsan, Noor
> Subject: [RFC] rawcopy.py: Copy source file in image creation build 
> folder
> 
> From: Noor <noor_ahsan at mentor.com>
> 
> * When a file is given using --sourceparams then wic directly use that file
>   instead of copying them to build folder. At time of assmebling it os.rename
>   is called which rename all the files to name. In that process the original
>   file get renamed. When image recipe is rebuilt then wic complains about
>   missing file which renamed in previous build.
> 
> Signed-off-by: Noor Ahsan <noor_ahsan at mentor.com>
> ---
>  scripts/lib/wic/plugins/source/rawcopy.py |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/scripts/lib/wic/plugins/source/rawcopy.py 
> b/scripts/lib/wic/plugins/source/rawcopy.py
> index f0691ba..f17da27 100644
> --- a/scripts/lib/wic/plugins/source/rawcopy.py
> +++ b/scripts/lib/wic/plugins/source/rawcopy.py
> @@ -74,6 +74,10 @@ class RawCopyPlugin(SourcePlugin):
>              dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \
>                      (src, dst, source_params['skip'])
>              exec_cmd(dd_cmd)
> +        else:
> +            dst = os.path.join(cr_workdir, source_params['file'])
> +            dd_cmd = "cp src dst"
> +            exec_cmd(dd_cmd)
> 
> 
> dd_cmd will be replaced by cp_cmd but I need review of all impact of this so that I can send proper patch.
> 
> 
>          # get the size in the right units for kickstart (kB)
>          du_cmd = "du -Lbks %s" % dst
> --
> 1.7.9.5
> 
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


--
--
Regards,
Ed