summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/icecc.bbclass35
-rw-r--r--meta/classes/rootfs_rpm.bbclass6
2 files changed, 13 insertions, 28 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 724074231d..be37318d91 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -39,7 +39,6 @@ def create_cross_env(bb,d):
39 """ 39 """
40 Create a tar.bz2 of the current toolchain 40 Create a tar.bz2 of the current toolchain
41 """ 41 """
42
43 # Constin native-native compilation no environment needed if 42 # Constin native-native compilation no environment needed if
44 # host prefix is empty (let us duplicate the query for ease) 43 # host prefix is empty (let us duplicate the query for ease)
45 prefix = bb.data.expand('${HOST_PREFIX}', d) 44 prefix = bb.data.expand('${HOST_PREFIX}', d)
@@ -54,7 +53,6 @@ def create_cross_env(bb,d):
54 target_prefix = bb.data.expand('${TARGET_PREFIX}', d) 53 target_prefix = bb.data.expand('${TARGET_PREFIX}', d)
55 float = bb.data.getVar('TARGET_FPU', d) or "hard" 54 float = bb.data.getVar('TARGET_FPU', d) or "hard"
56 name = socket.gethostname() 55 name = socket.gethostname()
57
58 56
59 # Stupid check to determine if we have built a libc and a cross 57 # Stupid check to determine if we have built a libc and a cross
60 # compiler. 58 # compiler.
@@ -94,7 +92,6 @@ def create_cross_env(bb,d):
94 92
95 93
96def create_native_env(bb,d): 94def create_native_env(bb,d):
97
98 import tarfile, socket, time 95 import tarfile, socket, time
99 ice_dir = bb.data.expand('${CROSS_DIR}', d) 96 ice_dir = bb.data.expand('${CROSS_DIR}', d)
100 prefix = bb.data.expand('${HOST_PREFIX}' , d) 97 prefix = bb.data.expand('${HOST_PREFIX}' , d)
@@ -103,8 +100,7 @@ def create_native_env(bb,d):
103 target_prefix = bb.data.expand('${TARGET_PREFIX}', d) 100 target_prefix = bb.data.expand('${TARGET_PREFIX}', d)
104 float = bb.data.getVar('TARGET_FPU', d) or "hard" 101 float = bb.data.getVar('TARGET_FPU', d) or "hard"
105 name = socket.gethostname() 102 name = socket.gethostname()
106 103
107
108 archive_name = "local-host-env" + "-" + name 104 archive_name = "local-host-env" + "-" + name
109 tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz') 105 tar_file = os.path.join(ice_dir, 'ice', archive_name + '.tar.gz')
110 106
@@ -120,7 +116,6 @@ def create_native_env(bb,d):
120 # directory already exists, continue 116 # directory already exists, continue
121 pass 117 pass
122 118
123
124 #check if user has specified a specific icecc-create-env script 119 #check if user has specified a specific icecc-create-env script
125 #if not use the OE provided one 120 #if not use the OE provided one
126 cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" 121 cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env"
@@ -135,7 +130,6 @@ def create_native_env(bb,d):
135 130
136 131
137def create_cross_kernel_env(bb,d): 132def create_cross_kernel_env(bb,d):
138
139 import tarfile, socket, time 133 import tarfile, socket, time
140 ice_dir = bb.data.expand('${CROSS_DIR}', d) 134 ice_dir = bb.data.expand('${CROSS_DIR}', d)
141 prefix = bb.data.expand('${HOST_PREFIX}' , d) 135 prefix = bb.data.expand('${HOST_PREFIX}' , d)
@@ -146,7 +140,6 @@ def create_cross_kernel_env(bb,d):
146 name = socket.gethostname() 140 name = socket.gethostname()
147 kernel_cc = bb.data.expand('${KERNEL_CC}', d) 141 kernel_cc = bb.data.expand('${KERNEL_CC}', d)
148 kernel_cc = kernel_cc[:-1] 142 kernel_cc = kernel_cc[:-1]
149
150 143
151 # Stupid check to determine if we have built a libc and a cross 144 # Stupid check to determine if we have built a libc and a cross
152 # compiler. 145 # compiler.
@@ -197,8 +190,8 @@ def create_env(bb,d):
197 return create_native_env(bb,d) 190 return create_native_env(bb,d)
198 else: 191 else:
199 return create_cross_env(bb,d) 192 return create_cross_env(bb,d)
200 193
201 194
202def create_path(compilers, type, bb, d): 195def create_path(compilers, type, bb, d):
203 """ 196 """
204 Create Symlinks for the icecc in the staging directory 197 Create Symlinks for the icecc in the staging directory
@@ -208,7 +201,6 @@ def create_path(compilers, type, bb, d):
208 #check if the icecc path is set by the user 201 #check if the icecc path is set by the user
209 icecc = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1] 202 icecc = bb.data.getVar('ICECC_PATH', d) or os.popen("%s icecc" % "which").read()[:-1]
210 203
211
212 # Create the dir if necessary 204 # Create the dir if necessary
213 try: 205 try:
214 os.stat(staging) 206 os.stat(staging)
@@ -225,28 +217,22 @@ def create_path(compilers, type, bb, d):
225 return staging + ":" 217 return staging + ":"
226 218
227 219
228
229
230
231def use_icc_version(bb,d): 220def use_icc_version(bb,d):
232
233 icecc_ver = "yes" 221 icecc_ver = "yes"
234 system_class_blacklist = [ "none" ] 222 system_class_blacklist = [ "none" ]
235 223
236 for black in system_class_blacklist: 224 for black in system_class_blacklist:
237 if bb.data.inherits_class(black, d): 225 if bb.data.inherits_class(black, d):
238 icecc_ver = "no" 226 icecc_ver = "no"
239 227
240
241 user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none" 228 user_class_blacklist = bb.data.getVar('ICECC_USER_CLASS_BL', d) or "none"
242 user_class_blacklist = user_class_blacklist.split() 229 user_class_blacklist = user_class_blacklist.split()
243 230
244 for black in user_class_blacklist: 231 for black in user_class_blacklist:
245 if bb.data.inherits_class(black, d): 232 if bb.data.inherits_class(black, d):
246 icecc_ver = "no" 233 icecc_ver = "no"
247
248 return icecc_ver
249 234
235 return icecc_ver
250 236
251 237
252def icc_path(bb,d,compile): 238def icc_path(bb,d,compile):
@@ -295,11 +281,11 @@ def icc_path(bb,d,compile):
295def icc_version(bb,d): 281def icc_version(bb,d):
296 return create_env(bb,d) 282 return create_env(bb,d)
297 283
298def check_for_kernel(bb,d):
299 if bb.data.inherits_class("kernel", d):
300 return "yes"
301 284
302 return "no" 285def check_for_kernel(bb,d):
286 if bb.data.inherits_class("kernel", d):
287 return "yes"
288 return "no"
303 289
304 290
305def get_cross_kernel_ver(bb,d): 291def get_cross_kernel_ver(bb,d):
@@ -332,4 +318,3 @@ do_compile_prepend() {
332 export ICECC_VERSION="NONE" 318 export ICECC_VERSION="NONE"
333 fi 319 fi
334} 320}
335
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index dd0257625f..105a1d78a1 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -184,7 +184,7 @@ EOF
184 # remove no longer used yum.conf 184 # remove no longer used yum.conf
185 rm -f ${IMAGE_ROOTFS}/etc/yum.conf 185 rm -f ${IMAGE_ROOTFS}/etc/yum.conf
186 186
187 log_check rootfs 187 log_check rootfs
188} 188}
189 189
190rootfs_rpm_log_check() { 190rootfs_rpm_log_check() {
@@ -193,14 +193,14 @@ rootfs_rpm_log_check() {
193 193
194 lf_txt="`cat $lf_path`" 194 lf_txt="`cat $lf_path`"
195 for keyword_die in "Cannot find package" "exit 1" ERR Fail 195 for keyword_die in "Cannot find package" "exit 1" ERR Fail
196 do 196 do
197 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 197 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
198 then 198 then
199 echo "log_check: There were error messages in the logfile" 199 echo "log_check: There were error messages in the logfile"
200 echo -e "log_check: Matched keyword: [$keyword_die]\n" 200 echo -e "log_check: Matched keyword: [$keyword_die]\n"
201 echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" 201 echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
202 echo "" 202 echo ""
203 do_exit=1 203 do_exit=1
204 fi 204 fi
205 done 205 done
206 test "$do_exit" = 1 && exit 1 206 test "$do_exit" = 1 && exit 1