| Submitter | Aeschbacher, Fabrice |
|---|---|
| Date | July 17, 2011, 6:50 p.m. |
| Message ID | <09D9BE2AC4AA764DABAA8C91E48D819E0157569594@DEMCHP99E35MSX.ww902.siemens.net> |
| Download | mbox | patch |
| Permalink | /patch/7725/ |
| State | New, archived |
| Headers | show |
Comments
Dear Fabrice, thank you for your patch. Am Sonntag, den 17.07.2011, 20:50 +0200 schrieb Aeschbacher, Fabrice: > Packaged-staging: > > * This patch fixes fetching pre-built staging packages from PSTAGE_MIRROR having file:// uri > (thanks to Tom Rini for helping me fixing this) A link to the discussion in the archive would be great in my opinion. http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-July/033938.html Since your Signed-off-by line and From line differ slightly, you should add From: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com> to the beginning of your patches, i. e. first line of your message. > Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com> > --- > classes/packaged-staging.bbclass | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 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,10 +200,13 @@ 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)) > + bb.debug(1, "Failed to fetch staging package %s: %s" % (bn, ex)) > else: > - bb.debug(1, "Fetched staging package %s" % bn) > + bb.debug(1, "Fetched staging package %s" % bn) White space changes always make reviews harder for me. > + > + 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" > > @@ -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) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> 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,10 +200,13 @@ 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)) + bb.debug(1, "Failed to fetch staging package %s: %s" % (bn, ex)) else: - bb.debug(1, "Fetched staging package %s" % bn) + 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" @@ -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)
Packaged-staging: * This patch fixes fetching pre-built staging packages from PSTAGE_MIRROR having file:// uri (thanks to Tom Rini for helping me fixing this) Signed-off-by: Fabrice Aeschbacher <fabrice.aeschbacher@siemens.com> --- classes/packaged-staging.bbclass | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)