Patchwork [v2] packaged-staging: fixed fetching from PSTAGE_MIRROR with file:// uri

login
register
mail settings
Submitter Aeschbacher, Fabrice
Date July 17, 2011, 7:42 p.m.
Message ID <09D9BE2AC4AA764DABAA8C91E48D819E0157569595@DEMCHP99E35MSX.ww902.siemens.net>
Download mbox | patch
Permalink /patch/7727/
State New, archived
Headers show

Comments

Aeschbacher, Fabrice - July 17, 2011, 7:42 p.m.
From: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>

Packaged-staging:
 
 * This patch fixes fetching pre-built staging packages from PSTAGE_MIRROR having file:// uri
   see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033938.html
   (thanks to Tom Rini for helping me fixing this)

Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>
---
 classes/packaged-staging.bbclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Paul Menzel - July 17, 2011, 8:26 p.m.
Am Sonntag, den 17.07.2011, 21:42 +0200 schrieb Aeschbacher, Fabrice:
> From: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>
> 
> Packaged-staging:
>  
>  * This patch fixes fetching pre-built staging packages from PSTAGE_MIRROR having file:// uri
>    see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033938.html
>    (thanks to Tom Rini for helping me fixing this)
> 
> Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>

[…]

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

I would still waiting for Tom’s Acked-by or Signed-off-by line.


Thanks,

Paul
Tom Rini - July 17, 2011, 10:57 p.m.
On 07/17/2011 01:26 PM, Paul Menzel wrote:
> Am Sonntag, den 17.07.2011, 21:42 +0200 schrieb Aeschbacher, Fabrice:
>> From: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>
>>
>> Packaged-staging:
>>  
>>  * This patch fixes fetching pre-built staging packages from PSTAGE_MIRROR having file:// uri
>>    see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033938.html
>>    (thanks to Tom Rini for helping me fixing this)
>>
>> Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com>
> 
> […]
> 
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
> 
> I would still waiting for Tom’s Acked-by or Signed-off-by line.

Acked-by: Tom Rini <tom_rini@mentor.com>

And for the records, I forget if we found that in poky at the time, I
came up with it or Chris Larson did.   But it's kosher any which way :)
Aeschbacher, Fabrice - July 28, 2011, 8:44 a.m.
Hi,

Would it be possible for someone having write access to commit this patch:

http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033967.html

With kind regards,
Fabrice

> -----Ursprüngliche Nachricht-----
> Von: openembedded-devel-bounces@lists.openembedded.org 
> [mailto:openembedded-devel-bounces@lists.openembedded.org] Im 
> Auftrag von Tom Rini
> Gesendet: Montag, 18. Juli 2011 00:58
> An: openembedded-devel@lists.openembedded.org
> Betreff: Re: [oe] [PATCH v2] packaged-staging: fixed fetching 
> from PSTAGE_MIRROR with file:// uri
> 
> >> Signed-off-by: Fabrice Aeschbacher 
...
> > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
...
> Acked-by: Tom Rini <tom_rini@mentor.com>
Paul Menzel - July 28, 2011, 9:16 a.m.
Dear Fabrice,


Am Donnerstag, den 28.07.2011, 10:44 +0200 schrieb Aeschbacher, Fabrice:

> Would it be possible for someone having write access to commit this patch:
> 
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033967.html

[…]

I am sorry for the delay. I will push your patch as soon as possible.


Thanks,

Paul

Patch

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 29a3238..c60e271 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -200,11 +200,14 @@  def staging_fetch(stagepkg, d):
         try:
             bb.fetch.init([srcuri], pd)
             bb.fetch.go(pd, [srcuri])
+            stagepkg = bb.fetch.localpath(srcuri, pd)
         except Exception, ex:
 	    bb.debug(1, "Failed to fetch staging package %s: %s" % (bn, ex))
         else:
 	    bb.debug(1, "Fetched staging package %s" % bn)
 
+        return stagepkg
+
 PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_locales compile sizecheck install deploy package populate_sysroot package_write_deb package_write_ipk package_write package_stage qa_staging"
 
 SCENEFUNCS += "packagestage_scenefunc"
@@ -222,7 +225,7 @@  python packagestage_scenefunc () {
 
     stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
     if not os.path.exists(stagepkg):
-        staging_fetch(stagepkg, d)
+        stagepkg = staging_fetch(stagepkg, d)
 
     if os.path.exists(stagepkg):
         pstage_set_pkgmanager(d)