summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-01-05 22:09:58 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2012-01-06 12:35:43 +0100
commit7c1dec115cff4d4fc5bc24d65019ed67d4367b92 (patch)
tree78ffac84e49e84cb07aa4eb15ca0678e694853c3
parent32e3a92ca97d9ea9c944ab329e9645aa68d3ddca (diff)
downloadmeta-java-7c1dec115cff4d4fc5bc24d65019ed67d4367b92.tar.gz
llvm, openjdk: Use bb.error instread of oefatal
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> Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
-rw-r--r--classes/java.bbclass6
-rw-r--r--recipes-core/llvm/llvm.inc2
-rw-r--r--recipes-core/openjdk/openjdk-6-common.inc2
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() {
39 destname=$1 39 destname=$1
40 ;; 40 ;;
41 -*) 41 -*)
42 oefatal "oe_jarinstall: unknown option: $1" 42 bbfatal "oe_jarinstall: unknown option: $1"
43 ;; 43 ;;
44 *) 44 *)
45 break; 45 break;
@@ -105,7 +105,7 @@ oe_makeclasspath() {
105 fi 105 fi
106 ;; 106 ;;
107 -*) 107 -*)
108 oefatal "oe_makeclasspath: unknown option: $1" 108 bbfatal "oe_makeclasspath: unknown option: $1"
109 ;; 109 ;;
110 *) 110 *)
111 file=$dir/$1.jar 111 file=$dir/$1.jar
@@ -146,7 +146,7 @@ oe_java_simple_wrapper() {
146 output=$1 146 output=$1
147 ;; 147 ;;
148 -*) 148 -*)
149 oefatal "oe_java_simple_wrapper: unknown option: $1" 149 bbfatal "oe_java_simple_wrapper: unknown option: $1"
150 ;; 150 ;;
151 *) 151 *)
152 if [ $mainclass ] 152 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):
208 elif arch == "powerpc": 208 elif arch == "powerpc":
209 arch = "PowerPC" 209 arch = "PowerPC"
210 else: 210 else:
211 oefatal("Your target architecture is not supported by this recipe"); 211 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
212 212
213 return arch 213 return arch
214 214
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):
158 elif arch == "powerpc": 158 elif arch == "powerpc":
159 arch = "powerpc" 159 arch = "powerpc"
160 else: 160 else:
161 oefatal("Your target architecture is not supported by this recipe"); 161 bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
162 162
163 return arch 163 return arch
164 164