* [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake
@ 2010-07-06 23:29 Khem Raj
2010-07-06 23:48 ` Samuel Sieb
2010-07-07 9:38 ` Frans Meulenbroeks
0 siblings, 2 replies; 5+ messages in thread
From: Khem Raj @ 2010-07-06 23:29 UTC (permalink / raw)
To: openembedded-devel
This patch seems to work with both bitbakes
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/base.bbclass | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 2da0b7a..b30310d 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -219,14 +219,25 @@ def oe_unpack_file(file, data, url = None):
# The "destdir" handling was specifically done for FILESPATH
# items. So, only do so for file:// entries.
if type == "file":
- dest = os.path.dirname(path) or "."
+ if not host:
+ dest = os.path.dirname(path) or "."
+ else:
+ # this case is for backward compatiblity with older version
+ # of bitbake which do not have the fix
+ # http://cgit.openembedded.org/cgit.cgi/bitbake/commit/?id=ca257adc587bb0937ea76d8b32b654fdbf4192b8
+ # this should not be needed once all releases of bitbake has this fix
+ # applied/backported
+ dest = host + os.path.dirname(path) or "."
else:
dest = "."
bb.mkdirhier("%s" % os.path.join(os.getcwd(),dest))
cmd = 'cp %s %s' % (file, os.path.join(os.getcwd(), dest))
if not cmd:
return True
- dest = os.path.join(os.getcwd(), path)
+ if not host:
+ dest = os.path.join(os.getcwd(), path)
+ else:
+ dest = os.path.join(os.getcwd(), os.path.join(host, path))
if os.path.exists(dest):
if os.path.samefile(file, dest):
return True
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake
2010-07-06 23:29 [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake Khem Raj
@ 2010-07-06 23:48 ` Samuel Sieb
2010-07-07 8:35 ` Jan Paesmans
2010-07-07 9:38 ` Frans Meulenbroeks
1 sibling, 1 reply; 5+ messages in thread
From: Samuel Sieb @ 2010-07-06 23:48 UTC (permalink / raw)
To: openembedded-devel
Khem Raj <raj.khem <at> gmail.com> writes:
>
> This patch seems to work with both bitbakes
>
> Signed-off-by: Khem Raj <raj.khem <at> gmail.com>
> ---
> classes/base.bbclass | 15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
This patch works for me using bitbake 1.8.18.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake
2010-07-06 23:29 [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake Khem Raj
2010-07-06 23:48 ` Samuel Sieb
@ 2010-07-07 9:38 ` Frans Meulenbroeks
2010-07-15 7:21 ` Graham Gower
1 sibling, 1 reply; 5+ messages in thread
From: Frans Meulenbroeks @ 2010-07-07 9:38 UTC (permalink / raw)
To: openembedded-devel
2010/7/7 Khem Raj <raj.khem@gmail.com>:
> This patch seems to work with both bitbakes
>
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> classes/base.bbclass | 15 +++++++++++++--
> 1 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/classes/base.bbclass b/classes/base.bbclass
> index 2da0b7a..b30310d 100644
> --- a/classes/base.bbclass
> +++ b/classes/base.bbclass
> @@ -219,14 +219,25 @@ def oe_unpack_file(file, data, url = None):
> # The "destdir" handling was specifically done for FILESPATH
> # items. So, only do so for file:// entries.
> if type == "file":
> - dest = os.path.dirname(path) or "."
> + if not host:
> + dest = os.path.dirname(path) or "."
> + else:
> + # this case is for backward compatiblity with older version
> + # of bitbake which do not have the fix
> + # http://cgit.openembedded.org/cgit.cgi/bitbake/commit/?id=ca257adc587bb0937ea76d8b32b654fdbf4192b8
> + # this should not be needed once all releases of bitbake has this fix
> + # applied/backported
> + dest = host + os.path.dirname(path) or "."
> else:
> dest = "."
> bb.mkdirhier("%s" % os.path.join(os.getcwd(),dest))
> cmd = 'cp %s %s' % (file, os.path.join(os.getcwd(), dest))
> if not cmd:
> return True
> - dest = os.path.join(os.getcwd(), path)
> + if not host:
> + dest = os.path.join(os.getcwd(), path)
> + else:
> + dest = os.path.join(os.getcwd(), os.path.join(host, path))
> if os.path.exists(dest):
> if os.path.samefile(file, dest):
> return True
> --
> 1.7.1
>
This fixes things for me so:
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake
2010-07-07 9:38 ` Frans Meulenbroeks
@ 2010-07-15 7:21 ` Graham Gower
0 siblings, 0 replies; 5+ messages in thread
From: Graham Gower @ 2010-07-15 7:21 UTC (permalink / raw)
To: openembedded-devel
On 7 July 2010 19:08, Frans Meulenbroeks <fransmeulenbroeks@gmail.com> wrote:
> 2010/7/7 Khem Raj <raj.khem@gmail.com>:
>> This patch seems to work with both bitbakes
>>
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>> classes/base.bbclass | 15 +++++++++++++--
>> 1 files changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/classes/base.bbclass b/classes/base.bbclass
>> index 2da0b7a..b30310d 100644
>> --- a/classes/base.bbclass
>> +++ b/classes/base.bbclass
>> @@ -219,14 +219,25 @@ def oe_unpack_file(file, data, url = None):
>> # The "destdir" handling was specifically done for FILESPATH
>> # items. So, only do so for file:// entries.
>> if type == "file":
>> - dest = os.path.dirname(path) or "."
>> + if not host:
>> + dest = os.path.dirname(path) or "."
>> + else:
>> + # this case is for backward compatiblity with older version
>> + # of bitbake which do not have the fix
>> + # http://cgit.openembedded.org/cgit.cgi/bitbake/commit/?id=ca257adc587bb0937ea76d8b32b654fdbf4192b8
>> + # this should not be needed once all releases of bitbake has this fix
>> + # applied/backported
>> + dest = host + os.path.dirname(path) or "."
>> else:
>> dest = "."
>> bb.mkdirhier("%s" % os.path.join(os.getcwd(),dest))
>> cmd = 'cp %s %s' % (file, os.path.join(os.getcwd(), dest))
>> if not cmd:
>> return True
>> - dest = os.path.join(os.getcwd(), path)
>> + if not host:
>> + dest = os.path.join(os.getcwd(), path)
>> + else:
>> + dest = os.path.join(os.getcwd(), os.path.join(host, path))
>> if os.path.exists(dest):
>> if os.path.samefile(file, dest):
>> return True
>> --
>> 1.7.1
>>
>
> This fixes things for me so:
> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
>
This change appears to have broken lsof_4.83.bb.
lsof has a weird tar within a tar, and thus a custom do_unpack(). The
result is that the inner tar is not extracted, and do_configure fails
to find a configure script.
-Graham
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-07-15 7:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-06 23:29 [PATCH][v2] base.bbclass: re-add backward compatibility with bitbake w.r.t decodeurl fix in bitbake Khem Raj
2010-07-06 23:48 ` Samuel Sieb
2010-07-07 8:35 ` Jan Paesmans
2010-07-07 9:38 ` Frans Meulenbroeks
2010-07-15 7:21 ` Graham Gower
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox