[krogoth][wic][PATCH] wic: rawcopy: make source filenames unique

[krogoth][wic][PATCH] wic: rawcopy: make source filenames unique

[Ed Bartosh]

Rawcopy plugin copies source files to build folder before using them
to assemble result image. After assembling the image wic renames
source files to <image>.p<partition number>. If the same source file
is used in multiple partitions wic breaks trying to rename file that
doesn't exist.

Added <line number> suffix to the files when copying them to the
build dir. This should make filename unique even if the same source
file is used for multiple partitions.

[YOCTO #9826]

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
 scripts/lib/wic/plugins/source/rawcopy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/plugins/source/rawcopy.py b/scripts/lib/wic/plugins/source/rawcopy.py
index 0472f53..7ce0cc4 100644
--- a/scripts/lib/wic/plugins/source/rawcopy.py
+++ b/scripts/lib/wic/plugins/source/rawcopy.py
@@ -67,7 +67,7 @@ class RawCopyPlugin(SourcePlugin):
             return
 
         src = os.path.join(bootimg_dir, source_params['file'])
-        dst = os.path.join(cr_workdir, source_params['file'])
+        dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'], part.lineno))
 
         if 'skip' in source_params:
             dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \
-- 
2.1.4

Re: [krogoth][wic][PATCH] wic: rawcopy: make source filenames unique

[Fabio Berton]

[-- Attachment #1: Type: text/plain, Size: 1743 bytes --]

Hi Ed,

This patch was already tested, can be applied to krogoth?

Regards,

Fabio

On Fri, Jul 1, 2016 at 5:05 AM, Ed Bartosh <ed.bartosh@linux.intel.com>
wrote:

> Rawcopy plugin copies source files to build folder before using them
> to assemble result image. After assembling the image wic renames
> source files to <image>.p<partition number>. If the same source file
> is used in multiple partitions wic breaks trying to rename file that
> doesn't exist.
>
> Added <line number> suffix to the files when copying them to the
> build dir. This should make filename unique even if the same source
> file is used for multiple partitions.
>
> [YOCTO #9826]
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
>  scripts/lib/wic/plugins/source/rawcopy.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/plugins/source/rawcopy.py
> b/scripts/lib/wic/plugins/source/rawcopy.py
> index 0472f53..7ce0cc4 100644
> --- a/scripts/lib/wic/plugins/source/rawcopy.py
> +++ b/scripts/lib/wic/plugins/source/rawcopy.py
> @@ -67,7 +67,7 @@ class RawCopyPlugin(SourcePlugin):
>              return
>
>          src = os.path.join(bootimg_dir, source_params['file'])
> -        dst = os.path.join(cr_workdir, source_params['file'])
> +        dst = os.path.join(cr_workdir, "%s.%s" % (source_params['file'],
> part.lineno))
>
>          if 'skip' in source_params:
>              dd_cmd = "dd if=%s of=%s ibs=%s skip=1 conv=notrunc" % \
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 2878 bytes --]

[OE-core] problem with blacklisted packages

[piotr.lewicki]

Hi,
I'm having problem with some of the recipes which are blacklisted due to 
problems with compilation using GCC-6.

I wonder if there is a way to "whitelist" those packages without 
changing content of original recipe?

For now I have:

GCCVERSION = "5.%"

in my distro.conf so if a recipe is not building due to problems with 
gcc6 I simply edit the recipe and remove the line with PNBLACKLIST.

Is there a better way to deal with those problems?
Can this blacklisting depend on "GCCVERSION" ?

Example of problematic recipe : crda (from crda_3.18.bb)



Thanks,
Piotr Lewicki

Re: [OE-core] problem with blacklisted packages

[Gary Thomas]

On 2016-07-06 17:01, piotr.lewicki wrote:
> Hi,
> I'm having problem with some of the recipes which are blacklisted due to problems with compilation using GCC-6.
>
> I wonder if there is a way to "whitelist" those packages without changing content of original recipe?
>
> For now I have:
>
> GCCVERSION = "5.%"
>
> in my distro.conf so if a recipe is not building due to problems with gcc6 I simply edit the recipe and remove the line
> with PNBLACKLIST.
>
> Is there a better way to deal with those problems?
> Can this blacklisting depend on "GCCVERSION" ?
>
> Example of problematic recipe : crda (from crda_3.18.bb)
>

I asked this same question last week :-)  I agree that not everyone
is using the leading edge compilers and making those of us have to
take such pains is a bit unfair.

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [OE-core] problem with blacklisted packages

[Davis, Michael]

You can override the blacklist to off.  That is what I have been doing.
Put the following in your local.conf or distro conf file.
PNBLACKLIST[crda] = ""

On Wednesday, July 06, 2016 05:01:56 PM piotr. lewicki wrote:
> Hi,
> I'm having problem with some of the recipes which are blacklisted due to 
> problems with compilation using GCC-6.
> 
> I wonder if there is a way to "whitelist" those packages without 
> changing content of original recipe?
> 
> For now I have:
> 
> GCCVERSION = "5.%"
> 
> in my distro.conf so if a recipe is not building due to problems with 
> gcc6 I simply edit the recipe and remove the line with PNBLACKLIST.
> 
> Is there a better way to deal with those problems?
> Can this blacklisting depend on "GCCVERSION" ?
> 
> Example of problematic recipe : crda (from crda_3.18.bb)
> 
> 
> 
> Thanks,
> Piotr Lewicki
> 

Re: [OE-core] problem with blacklisted packages

[piotr.lewicki]

Awesome.
Then maybe some comment should be added to 
meta/classes/blacklist.bbclass for clarity.
Like this:

# * Package can be unblacklisted by setting:
#   PNBLACKLIST[pn] = ""
#


Thanks,
Piotr Lewicki


On 06.07.2016 17:35, Davis, Michael wrote:
> You can override the blacklist to off.  That is what I have been doing.
> Put the following in your local.conf or distro conf file.
> PNBLACKLIST[crda] = ""
>
> On Wednesday, July 06, 2016 05:01:56 PM piotr. lewicki wrote:
>> Hi,
>> I'm having problem with some of the recipes which are blacklisted due to
>> problems with compilation using GCC-6.
>>
>> I wonder if there is a way to "whitelist" those packages without
>> changing content of original recipe?
>>
>> For now I have:
>>
>> GCCVERSION = "5.%"
>>
>> in my distro.conf so if a recipe is not building due to problems with
>> gcc6 I simply edit the recipe and remove the line with PNBLACKLIST.
>>
>> Is there a better way to deal with those problems?
>> Can this blacklisting depend on "GCCVERSION" ?
>>
>> Example of problematic recipe : crda (from crda_3.18.bb)
>>
>>
>>
>> Thanks,
>> Piotr Lewicki