[PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Chris Larson]

From: Tom Rini <tom_rini@mentor.com>

This works around one relocation issue.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
---
 classes/package.bbclass |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 062f782..72c9053 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -155,11 +155,12 @@ def runstrip(file, d):
     import commands, stat
 
     pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+    magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) 
 
-    ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
+    ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
 
     if ret:
-        bb.error("runstrip: 'file %s' failed (forced strip)" % file)
+        bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
 
     if "not stripped" not in result:
         bb.debug(1, "runstrip: skip %s" % file)
-- 
1.6.3.3

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I don't have 'file/' in STAGING_DATADIR_NATIVE so I now have lots of
unstripped stuff (150MB libxul.so). Could you please add an extra check
to see if file/magic exists?

regards,

Koen

On 19-02-10 19:47, Chris Larson wrote:
> From: Tom Rini <tom_rini@mentor.com>
> 
> This works around one relocation issue.
> 
> Signed-off-by: Tom Rini <tom_rini@mentor.com>
> Signed-off-by: Chris Larson <chris_larson@mentor.com>
> ---
>  classes/package.bbclass |    5 +++--
>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/classes/package.bbclass b/classes/package.bbclass
> index 062f782..72c9053 100644
> --- a/classes/package.bbclass
> +++ b/classes/package.bbclass
> @@ -155,11 +155,12 @@ def runstrip(file, d):
>      import commands, stat
>  
>      pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
> +    magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) 
>  
> -    ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
> +    ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
>  
>      if ret:
> -        bb.error("runstrip: 'file %s' failed (forced strip)" % file)
> +        bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
>  
>      if "not stripped" not in result:
>          bb.debug(1, "runstrip: skip %s" % file)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLi4YRMkyGM64RGpERAoPBAKCdNJV1xR2zZTGU6XSn/jHIDfrNCQCbBFWS
DrZI2u7qsGPg1ABHQh4loHU=
=spj2
-----END PGP SIGNATURE-----

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I think I know what's happening.

On my (debian) buildhost I have file 4.26. (Re)building file-native 5.04
gives me:

./staging/x86_64-linux/usr/share/misc/magic.mgc

Graeme has file 5.03 on his buildhost and has

./staging/x86_64-linux/usr/share/file/magic

So it seems that the buildhost contamination also affects file-native :(

regards,

Koen

On 01-03-10 10:17, Koen Kooi wrote:
> Hi,
> 
> I don't have 'file/' in STAGING_DATADIR_NATIVE so I now have lots of
> unstripped stuff (150MB libxul.so). Could you please add an extra check
> to see if file/magic exists?
> 
> regards,
> 
> Koen
> 
> On 19-02-10 19:47, Chris Larson wrote:
>> From: Tom Rini <tom_rini@mentor.com>
> 
>> This works around one relocation issue.
> 
>> Signed-off-by: Tom Rini <tom_rini@mentor.com>
>> Signed-off-by: Chris Larson <chris_larson@mentor.com>
>> ---
>>  classes/package.bbclass |    5 +++--
>>  1 files changed, 3 insertions(+), 2 deletions(-)
> 
>> diff --git a/classes/package.bbclass b/classes/package.bbclass
>> index 062f782..72c9053 100644
>> --- a/classes/package.bbclass
>> +++ b/classes/package.bbclass
>> @@ -155,11 +155,12 @@ def runstrip(file, d):
>>      import commands, stat
> 
>>      pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
>> +    magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) 
> 
>> -    ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
>> +    ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
> 
>>      if ret:
>> -        bb.error("runstrip: 'file %s' failed (forced strip)" % file)
>> +        bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
> 
>>      if "not stripped" not in result:
>>          bb.debug(1, "runstrip: skip %s" % file)
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLi4poMkyGM64RGpERAjszAJ9OFI03ODoZTYp40teNRyKwkK38uQCdGlo6
5QfkyN8ldZ/E67X8ETrxtb8=
=X6Dm
-----END PGP SIGNATURE-----

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Graeme Gregory]

On Mon, Mar 01, 2010 at 10:35:36AM +0100, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> I think I know what's happening.
> 
> On my (debian) buildhost I have file 4.26. (Re)building file-native 5.04
> gives me:
> 
> ./staging/x86_64-linux/usr/share/misc/magic.mgc
> 
> Graeme has file 5.03 on his buildhost and has
> 
> ./staging/x86_64-linux/usr/share/file/magic
> 
> So it seems that the buildhost contamination also affects file-native :(
> 
Its not contamination, its just simply that file 5.XX moved its magic
file to /usr/share/misc/

Im still building 4.21 for some reason so dont see this.

Graeme

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01-03-10 10:45, Graeme Gregory wrote:
> On Mon, Mar 01, 2010 at 10:35:36AM +0100, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> I think I know what's happening.
>>
>> On my (debian) buildhost I have file 4.26. (Re)building file-native 5.04
>> gives me:
>>
>> ./staging/x86_64-linux/usr/share/misc/magic.mgc
>>
>> Graeme has file 5.03 on his buildhost and has
>>
>> ./staging/x86_64-linux/usr/share/file/magic
>>
>> So it seems that the buildhost contamination also affects file-native :(
>>
> Its not contamination, its just simply that file 5.XX moved its magic
> file to /usr/share/misc/
> 
> Im still building 4.21 for some reason so dont see this.

Bitbake 1.8.x? I'm using bitbake master from git, that has a different
sorting algo AIUI.

regards,

Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFLi40oMkyGM64RGpERAjEIAJ4+rW+07FQBjx9std0w7ZE1tYcdtQCgtgI6
X6RRtXw6ttRVlMSfzyUAUBk=
=QSlm
-----END PGP SIGNATURE-----

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Chris Larson]

Ugh, lovely.  Okay, I'll take care of it today, sorry for the hassle.

On Mon, Mar 1, 2010 at 2:47 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 01-03-10 10:45, Graeme Gregory wrote:
> > On Mon, Mar 01, 2010 at 10:35:36AM +0100, Koen Kooi wrote:
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA1
> >>
> >> I think I know what's happening.
> >>
> >> On my (debian) buildhost I have file 4.26. (Re)building file-native 5.04
> >> gives me:
> >>
> >> ./staging/x86_64-linux/usr/share/misc/magic.mgc
> >>
> >> Graeme has file 5.03 on his buildhost and has
> >>
> >> ./staging/x86_64-linux/usr/share/file/magic
> >>
> >> So it seems that the buildhost contamination also affects file-native :(
> >>
> > Its not contamination, its just simply that file 5.XX moved its magic
> > file to /usr/share/misc/
> >
> > Im still building 4.21 for some reason so dont see this.
>
> Bitbake 1.8.x? I'm using bitbake master from git, that has a different
> sorting algo AIUI.
>
> regards,
>
> Koen
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFLi40oMkyGM64RGpERAjEIAJ4+rW+07FQBjx9std0w7ZE1tYcdtQCgtgI6
> X6RRtXw6ttRVlMSfzyUAUBk=
> =QSlm
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [PATCH] package.bbclass: when running 'file', be explicit about the path to the magic

[Philip Balister]

On 03/01/2010 08:42 AM, Chris Larson wrote:
> Ugh, lovely.  Okay, I'll take care of it today, sorry for the hassle.

It is Monday after all :)

Philip

>
> On Mon, Mar 1, 2010 at 2:47 AM, Koen Kooi<k.kooi@student.utwente.nl>  wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> On 01-03-10 10:45, Graeme Gregory wrote:
>>> On Mon, Mar 01, 2010 at 10:35:36AM +0100, Koen Kooi wrote:
>>>> -----BEGIN PGP SIGNED MESSAGE-----
>>>> Hash: SHA1
>>>>
>>>> I think I know what's happening.
>>>>
>>>> On my (debian) buildhost I have file 4.26. (Re)building file-native 5.04
>>>> gives me:
>>>>
>>>> ./staging/x86_64-linux/usr/share/misc/magic.mgc
>>>>
>>>> Graeme has file 5.03 on his buildhost and has
>>>>
>>>> ./staging/x86_64-linux/usr/share/file/magic
>>>>
>>>> So it seems that the buildhost contamination also affects file-native :(
>>>>
>>> Its not contamination, its just simply that file 5.XX moved its magic
>>> file to /usr/share/misc/
>>>
>>> Im still building 4.21 for some reason so dont see this.
>>
>> Bitbake 1.8.x? I'm using bitbake master from git, that has a different
>> sorting algo AIUI.
>>
>> regards,
>>
>> Koen
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.5 (Darwin)
>>
>> iD8DBQFLi40oMkyGM64RGpERAjEIAJ4+rW+07FQBjx9std0w7ZE1tYcdtQCgtgI6
>> X6RRtXw6ttRVlMSfzyUAUBk=
>> =QSlm
>> -----END PGP SIGNATURE-----
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>
>
>