diff options
| author |   Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com> | 2011-07-17 21:42:09 +0200 |
|---|---|---|
| committer |   Paul Menzel <paulepanter@users.sourceforge.net> | 2011-07-28 11:18:46 +0200 |
| commit | 1aeea48674d3e831a5830e43ad4fdcfab295ebd2 (patch) | |
| tree | ecd3e9bcba76b2e8e7a7d20864d132a958572aa6 /classes | |
| parent | 672aea60bb086a78c9fa52a5c442e104e7dfd6ce (diff) | |
| download | openembedded-1aeea48674d3e831a5830e43ad4fdcfab295ebd2.tar.gz | |
packaged-staging: Fix fetching from PSTAGE_MIRROR with file:// URI
* 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>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
Acked-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
(minor improvement to commit message)
Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/packaged-staging.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 29a3238719..9417150946 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) |