[PATCH 1/2] waf.bbclass: Throw error if waf doesn't exist

[PATCH 1/2] waf.bbclass: Throw error if waf doesn't exist

[Changhyeok Bae]

From: Amanda Brindle <amanda.r.brindle@intel.com>

Before, waf.bbclass would fail to catch FileNotFoundError. Now, it will
catch this error and say that waf doesn't exist.

Fixes [YOCTO 12553]

Signed-off-by: Amanda Brindle <amanda.r.brindle@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/waf.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index f9a851d..19e9376 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -15,6 +15,8 @@ python waf_preconfigure() {
             d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --libdir=${libdir}")
     except subprocess.CalledProcessError as e:
         bb.warn("Unable to execute waf --version, exit code %d. Assuming waf version without bindir/libdir support." % e.returncode)
+    except FileNotFoundError:
+        bb.fatal("waf does not exist in %s" % subsrcdir)
 }
 
 do_configure[prefuncs] += "waf_preconfigure"
-- 
2.7.4

[PATCH 2/2] distcc: Change SRC_URI

[Changhyeok Bae]

From: Armin Kuster <akuster@mvista.com>

ERROR: distcc-3.2-r0 do_fetch: Fetcher failure: Unable to find revision d8b18df3e9dcbe4f092bed565835d3975e99432c in branch 3.2 even from upstream
ERROR: distcc-3.2-r0 do_fetch: Fetcher failure for URL: 'git://github.com/distcc/distcc.git;branch=3.2'. Unable to fetch URL from any source.
ERROR: distcc-3.2-r0 do_fetch: Function failed: base_do_fetch

[v2]
upstream deleted the branch and the hash no longer exists.

Took the git snapshot from yocto and created a copy on my github.
There was no offical 3.2 release, only rc versions.

Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-devtools/distcc/distcc_3.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2.bb
index ea3d7c1..ff0e22f 100644
--- a/meta/recipes-devtools/distcc/distcc_3.2.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
@@ -14,7 +14,7 @@ PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
 
 RRECOMMENDS_${PN} = "avahi-daemon"
 
-SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \
+SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
            file://separatebuilddir.patch \
            file://0001-zeroconf-Include-fcntl.h.patch \
            file://default \
-- 
2.7.4

Re: [PATCH 2/2] distcc: Change SRC_URI

[Changhyeok Bae]

[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]

Sorry. Please ignore those 2 patches.

Thanks
Changhyeok

2018-03-27 9:40 GMT+09:00 Changhyeok Bae <changhyeok.bae@gmail.com>:

> From: Armin Kuster <akuster@mvista.com>
>
> ERROR: distcc-3.2-r0 do_fetch: Fetcher failure: Unable to find revision
> d8b18df3e9dcbe4f092bed565835d3975e99432c in branch 3.2 even from upstream
> ERROR: distcc-3.2-r0 do_fetch: Fetcher failure for URL: 'git://
> github.com/distcc/distcc.git;branch=3.2'. Unable to fetch URL from any
> source.
> ERROR: distcc-3.2-r0 do_fetch: Function failed: base_do_fetch
>
> [v2]
> upstream deleted the branch and the hash no longer exists.
>
> Took the git snapshot from yocto and created a copy on my github.
> There was no offical 3.2 release, only rc versions.
>
> Signed-off-by: Armin Kuster <akuster@mvista.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-devtools/distcc/distcc_3.2.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb
> b/meta/recipes-devtools/distcc/distcc_3.2.bb
> index ea3d7c1..ff0e22f 100644
> --- a/meta/recipes-devtools/distcc/distcc_3.2.bb
> +++ b/meta/recipes-devtools/distcc/distcc_3.2.bb
> @@ -14,7 +14,7 @@ PACKAGECONFIG[popt] = "--without-included-popt,--
> with-included-popt,popt"
>
>  RRECOMMENDS_${PN} = "avahi-daemon"
>
> -SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \
> +SRC_URI = "git://github.com/akuster/distcc.git;branch=${PV} \
>             file://separatebuilddir.patch \
>             file://0001-zeroconf-Include-fcntl.h.patch \
>             file://default \
> --
> 2.7.4
>
>


-- 
Thanks
Changhyeok

[-- Attachment #2: Type: text/html, Size: 3129 bytes --]

✗ patchtest: failure for "waf.bbclass: Throw error if wa..." and 1 more

[Patchwork]

== Series Details ==

Series: "waf.bbclass: Throw error if wa..." and 1 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/11579/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at aee44c6b1c)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe