From patchwork Sun Jul 17 19:42:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] packaged-staging: fixed fetching from PSTAGE_MIRROR with file:// uri Date: Sun, 17 Jul 2011 19:42:09 -0000 From: Aeschbacher, Fabrice X-Patchwork-Id: 7727 Message-Id: <09D9BE2AC4AA764DABAA8C91E48D819E0157569595@DEMCHP99E35MSX.ww902.siemens.net> To: "openembedded-devel@lists.openembedded.org" From: Fabrice Aeschbacher 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 Acked-by: Paul Menzel Acked-by: Tom Rini --- 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 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)