Patchwork [meta-java,1/2] llvm, openjdk: Use bb.error instread of oefatal

login
register
mail settings
Submitter Khem Raj
Date Jan. 5, 2012, 10:09 p.m.
Message ID <1325801399-24880-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/18523/
State New, archived
Headers show

Comments

Khem Raj - Jan. 5, 2012, 10:09 p.m.
oefatal is not available in oe-core so replace
it with bbfatal in classes and oe.error in recipes
which use it in anonymous python. bb.fatal aborts
parsing. So we want to give an error but not
stop parsing.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 classes/java.bbclass                      |    6 +++---
 recipes-core/llvm/llvm.inc                |    2 +-
 recipes-core/openjdk/openjdk-6-common.inc |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
Henning Heinold - Jan. 8, 2012, 4:33 p.m.
On Thu, Jan 05, 2012 at 02:09:58PM -0800, Khem Raj wrote:
> oefatal is not available in oe-core so replace
> it with bbfatal in classes and oe.error in recipes
> which use it in anonymous python. bb.fatal aborts
> parsing. So we want to give an error but not
> stop parsing.
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  classes/java.bbclass                      |    6 +++---
>  recipes-core/llvm/llvm.inc                |    2 +-
>  recipes-core/openjdk/openjdk-6-common.inc |    2 +-
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/classes/java.bbclass b/classes/java.bbclass
> index 6a45065..fe24648 100644
> --- a/classes/java.bbclass
> +++ b/classes/java.bbclass
> @@ -39,7 +39,7 @@ oe_jarinstall() {
>        destname=$1
>        ;;
>      -*)
> -      oefatal "oe_jarinstall: unknown option: $1"
> +      bbfatal "oe_jarinstall: unknown option: $1"
>        ;;
>      *)
>        break;
> @@ -105,7 +105,7 @@ oe_makeclasspath() {
>                fi
>                ;;
>            -*)
> -              oefatal "oe_makeclasspath: unknown option: $1"
> +              bbfatal "oe_makeclasspath: unknown option: $1"
>                ;;
>            *)
>                file=$dir/$1.jar
> @@ -146,7 +146,7 @@ oe_java_simple_wrapper() {
>        output=$1
>        ;;
>      -*)
> -      oefatal "oe_java_simple_wrapper: unknown option: $1"
> +      bbfatal "oe_java_simple_wrapper: unknown option: $1"
>        ;;
>      *)
>        if [ $mainclass ]
> diff --git a/recipes-core/llvm/llvm.inc b/recipes-core/llvm/llvm.inc
> index c675c4d..5cc9957 100644
> --- a/recipes-core/llvm/llvm.inc
> +++ b/recipes-core/llvm/llvm.inc
> @@ -208,7 +208,7 @@ def get_llvm_arch(d):
>    elif arch == "powerpc":
>      arch = "PowerPC"
>    else:
> -    oefatal("Your target architecture is not supported by this recipe");
> +    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
>  
>    return arch
>  
> diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
> index 1a3c52b..461ccd9 100644
> --- a/recipes-core/openjdk/openjdk-6-common.inc
> +++ b/recipes-core/openjdk/openjdk-6-common.inc
> @@ -158,7 +158,7 @@ def get_llvm_configure_arch(d):
>    elif arch == "powerpc":
>      arch = "powerpc"
>    else:
> -    oefatal("Your target architecture is not supported by this recipe");
> +    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
>  
>    return arch
>  
> 1.7.5.4

Thanks Khem,

it is applied.

Bye Henning

Patch

diff --git a/classes/java.bbclass b/classes/java.bbclass
index 6a45065..fe24648 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -39,7 +39,7 @@  oe_jarinstall() {
       destname=$1
       ;;
     -*)
-      oefatal "oe_jarinstall: unknown option: $1"
+      bbfatal "oe_jarinstall: unknown option: $1"
       ;;
     *)
       break;
@@ -105,7 +105,7 @@  oe_makeclasspath() {
               fi
               ;;
           -*)
-              oefatal "oe_makeclasspath: unknown option: $1"
+              bbfatal "oe_makeclasspath: unknown option: $1"
               ;;
           *)
               file=$dir/$1.jar
@@ -146,7 +146,7 @@  oe_java_simple_wrapper() {
       output=$1
       ;;
     -*)
-      oefatal "oe_java_simple_wrapper: unknown option: $1"
+      bbfatal "oe_java_simple_wrapper: unknown option: $1"
       ;;
     *)
       if [ $mainclass ]
diff --git a/recipes-core/llvm/llvm.inc b/recipes-core/llvm/llvm.inc
index c675c4d..5cc9957 100644
--- a/recipes-core/llvm/llvm.inc
+++ b/recipes-core/llvm/llvm.inc
@@ -208,7 +208,7 @@  def get_llvm_arch(d):
   elif arch == "powerpc":
     arch = "PowerPC"
   else:
-    oefatal("Your target architecture is not supported by this recipe");
+    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
 
   return arch
 
diff --git a/recipes-core/openjdk/openjdk-6-common.inc b/recipes-core/openjdk/openjdk-6-common.inc
index 1a3c52b..461ccd9 100644
--- a/recipes-core/openjdk/openjdk-6-common.inc
+++ b/recipes-core/openjdk/openjdk-6-common.inc
@@ -158,7 +158,7 @@  def get_llvm_configure_arch(d):
   elif arch == "powerpc":
     arch = "powerpc"
   else:
-    oefatal("Your target architecture is not supported by this recipe");
+    bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
 
   return arch