summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/archiver.bbclass3
-rw-r--r--meta/classes/base.bbclass10
-rw-r--r--meta/classes/bugzilla.bbclass2
-rw-r--r--meta/classes/buildhistory.bbclass3
-rw-r--r--meta/classes/copyleft_compliance.bbclass1
-rw-r--r--meta/classes/distrodata.bbclass3
-rw-r--r--meta/classes/imagetest-qemu.bbclass1
-rw-r--r--meta/classes/kernel-yocto.bbclass2
-rw-r--r--meta/classes/libc-package.bbclass2
-rw-r--r--meta/classes/license.bbclass2
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass3
-rw-r--r--meta/classes/qemu.bbclass2
-rw-r--r--meta/classes/recipe_sanity.bbclass5
-rw-r--r--meta/classes/sanity.bbclass7
-rw-r--r--meta/classes/tinderclient.bbclass98
-rw-r--r--meta/conf/distro/include/csl-versions.inc2
-rw-r--r--meta/conf/distro/include/tcmode-external-sourcery.inc1
-rw-r--r--meta/lib/oe/data.py1
-rw-r--r--meta/lib/oe/maketype.py1
-rw-r--r--meta/lib/oe/packagedata.py2
-rw-r--r--meta/lib/oe/patch.py2
-rw-r--r--meta/lib/oe/path.py2
-rw-r--r--meta/lib/oe/prservice.py1
-rw-r--r--meta/lib/oe/terminal.py1
-rw-r--r--meta/lib/oe/utils.py2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.15.bb2
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.16.bb2
-rw-r--r--meta/recipes-core/tasks/task-base.bb2
-rw-r--r--meta/recipes-devtools/apt/apt-package.inc1
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.5.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.12.7.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.16.6.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.8.bb2
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb2
-rw-r--r--meta/recipes-graphics/directfb/directfb.inc1
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri.inc2
-rw-r--r--meta/recipes-kernel/linux/linux-dtb.inc2
-rw-r--r--meta/recipes-qt/qt-apps/qmmp_0.5.2.bb1
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
-rw-r--r--meta/recipes-sato/puzzles/oh-puzzles_git.bb1
-rw-r--r--meta/recipes-support/boost/boost.inc2
-rw-r--r--meta/recipes-support/pth/pth_2.0.7.bb2
43 files changed, 58 insertions, 135 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 2b5404f1da..8e97e447c9 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -76,7 +76,6 @@ def tar_filter(d):
76def get_bb_inc(d): 76def get_bb_inc(d):
77 '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}''' 77 '''create a directory "script-logs" including .bb and .inc file in ${WORKDIR}'''
78 import re 78 import re
79 import os
80 import shutil 79 import shutil
81 80
82 bbinc = [] 81 bbinc = []
@@ -154,7 +153,6 @@ def get_series(d):
154 153
155def get_applying_patches(d): 154def get_applying_patches(d):
156 """only copy applying patches to a pointed directory which will be archived to tarball""" 155 """only copy applying patches to a pointed directory which will be archived to tarball"""
157 import os
158 import shutil 156 import shutil
159 157
160 158
@@ -174,7 +172,6 @@ def get_applying_patches(d):
174 172
175def not_tarball(d): 173def not_tarball(d):
176 '''packages including key words 'work-shared','native', 'task-' will be passed''' 174 '''packages including key words 'work-shared','native', 'task-' will be passed'''
177 import os
178 175
179 workdir = d.getVar('WORKDIR',True) 176 workdir = d.getVar('WORKDIR',True)
180 s = d.getVar('S',True) 177 s = d.getVar('S',True)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f3587bcbef..1f7602394e 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -14,7 +14,7 @@ OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup oe.sstatesig
14OE_IMPORTS[type] = "list" 14OE_IMPORTS[type] = "list"
15 15
16def oe_import(d): 16def oe_import(d):
17 import os, sys 17 import sys
18 18
19 bbpath = d.getVar("BBPATH", True).split(":") 19 bbpath = d.getVar("BBPATH", True).split(":")
20 sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath] 20 sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath]
@@ -117,11 +117,9 @@ GIT_CONFIG_PATH = "${STAGING_DIR_NATIVE}/etc"
117GIT_CONFIG = "${GIT_CONFIG_PATH}/gitconfig" 117GIT_CONFIG = "${GIT_CONFIG_PATH}/gitconfig"
118 118
119def generate_git_config(e): 119def generate_git_config(e):
120 from bb import data 120 if e.data.getVar('GIT_CORE_CONFIG', True):
121
122 if data.getVar('GIT_CORE_CONFIG', e.data, True):
123 gitconfig_path = e.data.getVar('GIT_CONFIG', True) 121 gitconfig_path = e.data.getVar('GIT_CONFIG', True)
124 proxy_command = " gitProxy = %s\n" % data.getVar('OE_GIT_PROXY_COMMAND', e.data, True) 122 proxy_command = " gitProxy = %s\n" % e.data.getVar('OE_GIT_PROXY_COMMAND', True)
125 123
126 bb.mkdirhier(e.data.expand("${GIT_CONFIG_PATH}")) 124 bb.mkdirhier(e.data.expand("${GIT_CONFIG_PATH}"))
127 if (os.path.exists(gitconfig_path)): 125 if (os.path.exists(gitconfig_path)):
@@ -129,7 +127,7 @@ def generate_git_config(e):
129 127
130 f = open(gitconfig_path, 'w') 128 f = open(gitconfig_path, 'w')
131 f.write("[core]\n") 129 f.write("[core]\n")
132 ignore_hosts = data.getVar('GIT_PROXY_IGNORE', e.data, True).split() 130 ignore_hosts = e.data.getVar('GIT_PROXY_IGNORE', True).split()
133 for ignore_host in ignore_hosts: 131 for ignore_host in ignore_hosts:
134 f.write(" gitProxy = none for %s\n" % ignore_host) 132 f.write(" gitProxy = none for %s\n" % ignore_host)
135 f.write(proxy_command) 133 f.write(proxy_command)
diff --git a/meta/classes/bugzilla.bbclass b/meta/classes/bugzilla.bbclass
index 4028d261c8..6806dcd682 100644
--- a/meta/classes/bugzilla.bbclass
+++ b/meta/classes/bugzilla.bbclass
@@ -72,7 +72,7 @@ def bugzilla_add_comment(debug_file, server, args, bug_number, text):
72 72
73addhandler bugzilla_eventhandler 73addhandler bugzilla_eventhandler
74python bugzilla_eventhandler() { 74python bugzilla_eventhandler() {
75 import bb, os, glob 75 import glob
76 import xmlrpclib, httplib 76 import xmlrpclib, httplib
77 77
78 class ProxiedTransport(xmlrpclib.Transport): 78 class ProxiedTransport(xmlrpclib.Transport):
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index d2d19ff9cd..916aae6bad 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -414,9 +414,6 @@ buildhistory_commit() {
414} 414}
415 415
416python buildhistory_eventhandler() { 416python buildhistory_eventhandler() {
417 import bb.build
418 import bb.event
419
420 if isinstance(e, bb.event.BuildCompleted): 417 if isinstance(e, bb.event.BuildCompleted):
421 if e.data.getVar('BUILDHISTORY_FEATURES', True).strip(): 418 if e.data.getVar('BUILDHISTORY_FEATURES', True).strip():
422 if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1": 419 if e.data.getVar("BUILDHISTORY_COMMIT", True) == "1":
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass
index 3ca7337b55..c59cb7ad91 100644
--- a/meta/classes/copyleft_compliance.bbclass
+++ b/meta/classes/copyleft_compliance.bbclass
@@ -58,7 +58,6 @@ def copyleft_should_include(d):
58 58
59python do_prepare_copyleft_sources () { 59python do_prepare_copyleft_sources () {
60 """Populate a tree of the recipe sources and emit patch series files""" 60 """Populate a tree of the recipe sources and emit patch series files"""
61 import os.path
62 import shutil 61 import shutil
63 62
64 p = d.getVar('P', True) 63 p = d.getVar('P', True)
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 7b212c9452..f196df5f56 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -654,7 +654,6 @@ do_distro_check[nostamp] = "1"
654python do_distro_check() { 654python do_distro_check() {
655 """checks if the package is present in other public Linux distros""" 655 """checks if the package is present in other public Linux distros"""
656 import oe.distro_check as dc 656 import oe.distro_check as dc
657 import bb
658 import shutil 657 import shutil
659 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk',d): 658 if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d) or bb.data.inherits_class('nativesdk',d):
660 return 659 return
@@ -704,8 +703,6 @@ python checklicense_eventhandler() {
704addtask checklicense 703addtask checklicense
705do_checklicense[nostamp] = "1" 704do_checklicense[nostamp] = "1"
706python do_checklicense() { 705python do_checklicense() {
707 import os
708 import bb
709 import shutil 706 import shutil
710 logpath = d.getVar('LOG_DIR', True) 707 logpath = d.getVar('LOG_DIR', True)
711 bb.utils.mkdirhier(logpath) 708 bb.utils.mkdirhier(logpath)
diff --git a/meta/classes/imagetest-qemu.bbclass b/meta/classes/imagetest-qemu.bbclass
index f51eeba98c..7ece8868a1 100644
--- a/meta/classes/imagetest-qemu.bbclass
+++ b/meta/classes/imagetest-qemu.bbclass
@@ -26,7 +26,6 @@ do_qemuimagetest_standalone[depends] += "qemu-native:do_populate_sysroot"
26def qemuimagetest_main(d): 26def qemuimagetest_main(d):
27 import sys 27 import sys
28 import re 28 import re
29 import os
30 import shutil 29 import shutil
31 import subprocess 30 import subprocess
32 31
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index ab59fc8f13..d914b11bef 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -188,7 +188,7 @@ do_kernel_configme() {
188} 188}
189 189
190python do_kernel_configcheck() { 190python do_kernel_configcheck() {
191 import bb, re, string, sys, commands 191 import re, string, sys, commands
192 192
193 bb.plain("NOTE: validating kernel configuration") 193 bb.plain("NOTE: validating kernel configuration")
194 194
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index e3214a68a2..70490efc77 100644
--- a/meta/classes/libc-package.bbclass
+++ b/meta/classes/libc-package.bbclass
@@ -118,7 +118,7 @@ do_collect_bins_from_locale_tree() {
118inherit qemu 118inherit qemu
119 119
120python package_do_split_gconvs () { 120python package_do_split_gconvs () {
121 import os, re 121 import re
122 if (d.getVar('PACKAGE_NO_GCONV', True) == '1'): 122 if (d.getVar('PACKAGE_NO_GCONV', True) == '1'):
123 bb.note("package requested not splitting gconvs") 123 bb.note("package requested not splitting gconvs")
124 return 124 return
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 03e413b3b8..a2721ab0af 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -143,8 +143,6 @@ python do_populate_lic() {
143 """ 143 """
144 Populate LICENSE_DIRECTORY with licenses. 144 Populate LICENSE_DIRECTORY with licenses.
145 """ 145 """
146 import os
147 import bb
148 import shutil 146 import shutil
149 import oe.license 147 import oe.license
150 148
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a51e955325..fc834242da 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -444,7 +444,7 @@ python perform_packagecopy () {
444# seeding this list with reasonable defaults, then load from 444# seeding this list with reasonable defaults, then load from
445# the fs-perms.txt files 445# the fs-perms.txt files
446python fixup_perms () { 446python fixup_perms () {
447 import os, pwd, grp 447 import pwd, grp
448 448
449 # init using a string with the same format as a line as documented in 449 # init using a string with the same format as a line as documented in
450 # the fs-perms.txt file 450 # the fs-perms.txt file
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b20df0f243..d213e40dee 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -637,7 +637,6 @@ python write_specfile () {
637 array.append("%s: %s" % (tag, dep)) 637 array.append("%s: %s" % (tag, dep))
638 638
639 def walk_files(walkpath, target, conffiles): 639 def walk_files(walkpath, target, conffiles):
640 import os
641 for rootpath, dirs, files in os.walk(walkpath): 640 for rootpath, dirs, files in os.walk(walkpath):
642 path = rootpath.replace(walkpath, "") 641 path = rootpath.replace(walkpath, "")
643 for dir in dirs: 642 for dir in dirs:
@@ -996,8 +995,6 @@ python write_specfile () {
996} 995}
997 996
998python do_package_rpm () { 997python do_package_rpm () {
999 import os
1000
1001 def creat_srpm_dir(d): 998 def creat_srpm_dir(d):
1002 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM': 999 if d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True) and d.getVar('SOURCE_ARCHIVE_PACKAGE_TYPE', True).upper() == 'SRPM':
1003 clean_licenses = get_licenses(d) 1000 clean_licenses = get_licenses(d)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 0e75ac4e38..68896ce5fb 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -4,8 +4,6 @@
4# 4#
5 5
6def qemu_target_binary(data): 6def qemu_target_binary(data):
7 import bb
8
9 target_arch = data.getVar("TARGET_ARCH", True) 7 target_arch = data.getVar("TARGET_ARCH", True)
10 if target_arch in ("i486", "i586", "i686"): 8 if target_arch in ("i486", "i586", "i686"):
11 target_arch = "i386" 9 target_arch = "i386"
diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass
index 61e07bf043..63e9e7ff23 100644
--- a/meta/classes/recipe_sanity.bbclass
+++ b/meta/classes/recipe_sanity.bbclass
@@ -55,7 +55,6 @@ def can_use_autotools_base(cfgdata, d):
55 if cfg.find(i) != -1: 55 if cfg.find(i) != -1:
56 return False 56 return False
57 57
58 import os
59 for clsfile in d.getVar("__inherit_cache", 0): 58 for clsfile in d.getVar("__inherit_cache", 0):
60 (base, _) = os.path.splitext(os.path.basename(clsfile)) 59 (base, _) = os.path.splitext(os.path.basename(clsfile))
61 if cfg.find("%s_do_configure" % base) != -1: 60 if cfg.find("%s_do_configure" % base) != -1:
@@ -146,9 +145,7 @@ do_recipe_sanity_all () {
146addtask recipe_sanity_all after do_recipe_sanity 145addtask recipe_sanity_all after do_recipe_sanity
147 146
148python recipe_sanity_eh () { 147python recipe_sanity_eh () {
149 from bb.event import getName 148 if bb.event.getName(e) != "ConfigParsed":
150
151 if getName(e) != "ConfigParsed":
152 return 149 return
153 150
154 d = e.data 151 d = e.data
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 630e0e3d6e..6ef5450ef8 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -254,8 +254,6 @@ def check_supported_distro(sanity_data):
254 254
255# Checks we should only make if MACHINE is set correctly 255# Checks we should only make if MACHINE is set correctly
256def check_sanity_validmachine(sanity_data): 256def check_sanity_validmachine(sanity_data):
257 from bb import data
258
259 messages = "" 257 messages = ""
260 258
261 # Check TUNE_ARCH is set 259 # Check TUNE_ARCH is set
@@ -291,7 +289,6 @@ def check_sanity_validmachine(sanity_data):
291 289
292 290
293def check_sanity(sanity_data): 291def check_sanity(sanity_data):
294 from bb import note, error, data, __version__
295 import subprocess 292 import subprocess
296 293
297 try: 294 try:
@@ -319,8 +316,8 @@ def check_sanity(sanity_data):
319 if sys.hexversion < 0x020600F0: 316 if sys.hexversion < 0x020600F0:
320 messages = messages + 'The system requires at least Python 2.6 to run. Please update your Python interpreter.\n' 317 messages = messages + 'The system requires at least Python 2.6 to run. Please update your Python interpreter.\n'
321 318
322 if (LooseVersion(__version__) < LooseVersion(minversion)): 319 if (LooseVersion(bb.__version__) < LooseVersion(minversion)):
323 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__) 320 messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__)
324 321
325 # Check that the MACHINE is valid, if it is set 322 # Check that the MACHINE is valid, if it is set
326 if sanity_data.getVar('MACHINE', True): 323 if sanity_data.getVar('MACHINE', True):
diff --git a/meta/classes/tinderclient.bbclass b/meta/classes/tinderclient.bbclass
index 1027c7cef4..e57bc48c3b 100644
--- a/meta/classes/tinderclient.bbclass
+++ b/meta/classes/tinderclient.bbclass
@@ -55,22 +55,22 @@ def tinder_format_http_post(d,status,log):
55 55
56 # the variables we will need to send on this form post 56 # the variables we will need to send on this form post
57 variables = { 57 variables = {
58 "tree" : data.getVar('TINDER_TREE', d, True), 58 "tree" : d.getVar('TINDER_TREE', True),
59 "machine_name" : data.getVar('TINDER_MACHINE', d, True), 59 "machine_name" : d.getVar('TINDER_MACHINE', True),
60 "os" : os.uname()[0], 60 "os" : os.uname()[0],
61 "os_version" : os.uname()[2], 61 "os_version" : os.uname()[2],
62 "compiler" : "gcc", 62 "compiler" : "gcc",
63 "clobber" : data.getVar('TINDER_CLOBBER', d, True) or "0", 63 "clobber" : d.getVar('TINDER_CLOBBER', True) or "0",
64 "srcdate" : data.getVar('SRCDATE', d, True), 64 "srcdate" : d.getVar('SRCDATE', True),
65 "PN" : data.getVar('PN', d, True), 65 "PN" : d.getVar('PN', True),
66 "PV" : data.getVar('PV', d, True), 66 "PV" : d.getVar('PV', True),
67 "PR" : data.getVar('PR', d, True), 67 "PR" : d.getVar('PR', True),
68 "FILE" : data.getVar('FILE', d, True) or "N/A", 68 "FILE" : d.getVar('FILE', True) or "N/A",
69 "TARGETARCH" : data.getVar('TARGET_ARCH', d, True), 69 "TARGETARCH" : d.getVar('TARGET_ARCH', True),
70 "TARGETFPU" : data.getVar('TARGET_FPU', d, True) or "Unknown", 70 "TARGETFPU" : d.getVar('TARGET_FPU', True) or "Unknown",
71 "TARGETOS" : data.getVar('TARGET_OS', d, True) or "Unknown", 71 "TARGETOS" : d.getVar('TARGET_OS', True) or "Unknown",
72 "MACHINE" : data.getVar('MACHINE', d, True) or "Unknown", 72 "MACHINE" : d.getVar('MACHINE', True) or "Unknown",
73 "DISTRO" : data.getVar('DISTRO', d, True) or "Unknown", 73 "DISTRO" : d.getVar('DISTRO', True) or "Unknown",
74 "zecke-rocks" : "sure", 74 "zecke-rocks" : "sure",
75 } 75 }
76 76
@@ -82,7 +82,7 @@ def tinder_format_http_post(d,status,log):
82 # we only need on build_status.pl but sending it 82 # we only need on build_status.pl but sending it
83 # always does not hurt 83 # always does not hurt
84 try: 84 try:
85 f = file(data.getVar('TMPDIR',d,True)+'/tinder-machine.id', 'r') 85 f = file(d.getVar('TMPDIR',True)+'/tinder-machine.id', 'r')
86 id = f.read() 86 id = f.read()
87 variables['machine_id'] = id 87 variables['machine_id'] = id
88 except: 88 except:
@@ -103,12 +103,11 @@ def tinder_build_start(d):
103 by posting our name and tree to the build_start.pl script 103 by posting our name and tree to the build_start.pl script
104 on the server. 104 on the server.
105 """ 105 """
106 from bb import data
107 106
108 # get the body and type 107 # get the body and type
109 content_type, body = tinder_format_http_post(d,None,None) 108 content_type, body = tinder_format_http_post(d,None,None)
110 server = data.getVar('TINDER_HOST', d, True ) 109 server = d.getVar('TINDER_HOST', True )
111 url = data.getVar('TINDER_URL', d, True ) 110 url = d.getVar('TINDER_URL', True )
112 111
113 selector = url + "/xml/build_start.pl" 112 selector = url + "/xml/build_start.pl"
114 113
@@ -128,7 +127,7 @@ def tinder_build_start(d):
128 127
129 # now we will need to save the machine number 128 # now we will need to save the machine number
130 # we will override any previous numbers 129 # we will override any previous numbers
131 f = file(data.getVar('TMPDIR', d, True)+"/tinder-machine.id", 'w') 130 f = file(d.getVar('TMPDIR', True)+"/tinder-machine.id", 'w')
132 f.write(report) 131 f.write(report)
133 132
134 133
@@ -136,12 +135,10 @@ def tinder_send_http(d, status, _log):
136 """ 135 """
137 Send this log as build status 136 Send this log as build status
138 """ 137 """
139 from bb import data
140
141 138
142 # get the body and type 139 # get the body and type
143 server = data.getVar('TINDER_HOST', d, True ) 140 server = d.getVar('TINDER_HOST', True)
144 url = data.getVar('TINDER_URL', d, True ) 141 url = d.getVar('TINDER_URL', True)
145 142
146 selector = url + "/xml/build_status.pl" 143 selector = url + "/xml/build_status.pl"
147 144
@@ -162,22 +159,20 @@ def tinder_print_info(d):
162 we use. 159 we use.
163 """ 160 """
164 161
165 from bb import data
166 # get the local vars 162 # get the local vars
167
168 time = tinder_time_string() 163 time = tinder_time_string()
169 ops = os.uname()[0] 164 ops = os.uname()[0]
170 version = os.uname()[2] 165 version = os.uname()[2]
171 url = data.getVar( 'TINDER_URL' , d, True ) 166 url = d.getVar( 'TINDER_URL' , True )
172 tree = data.getVar( 'TINDER_TREE', d, True ) 167 tree = d.getVar( 'TINDER_TREE', True )
173 branch = data.getVar( 'TINDER_BRANCH', d, True ) 168 branch = d.getVar( 'TINDER_BRANCH', True )
174 srcdate = data.getVar( 'SRCDATE', d, True ) 169 srcdate = d.getVar( 'SRCDATE', True )
175 machine = data.getVar( 'MACHINE', d, True ) 170 machine = d.getVar( 'MACHINE', True )
176 distro = data.getVar( 'DISTRO', d, True ) 171 distro = d.getVar( 'DISTRO', True )
177 bbfiles = data.getVar( 'BBFILES', d, True ) 172 bbfiles = d.getVar( 'BBFILES', True )
178 tarch = data.getVar( 'TARGET_ARCH', d, True ) 173 tarch = d.getVar( 'TARGET_ARCH', True )
179 fpu = data.getVar( 'TARGET_FPU', d, True ) 174 fpu = d.getVar( 'TARGET_FPU', True )
180 oerev = data.getVar( 'OE_REVISION', d, True ) or "unknown" 175 oerev = d.getVar( 'OE_REVISION', True ) or "unknown"
181 176
182 # there is a bug with tipple quoted strings 177 # there is a bug with tipple quoted strings
183 # i will work around but will fix the original 178 # i will work around but will fix the original
@@ -212,8 +207,6 @@ def tinder_print_env():
212 """ 207 """
213 Print the environment variables of this build 208 Print the environment variables of this build
214 """ 209 """
215 from bb import data
216
217 time_start = tinder_time_string() 210 time_start = tinder_time_string()
218 time_end = tinder_time_string() 211 time_end = tinder_time_string()
219 212
@@ -272,12 +265,10 @@ def tinder_do_tinder_report(event):
272 BuildCompleted Event. In this case we have to look up the status and 265 BuildCompleted Event. In this case we have to look up the status and
273 send it instead of 100/success. 266 send it instead of 100/success.
274 """ 267 """
275 from bb.event import getName
276 from bb import data, mkdirhier, build
277 import glob 268 import glob
278 269
279 # variables 270 # variables
280 name = getName(event) 271 name = bb.event.getName(event)
281 log = "" 272 log = ""
282 status = 1 273 status = 1
283 # Check what we need to do Build* shows we start or are done 274 # Check what we need to do Build* shows we start or are done
@@ -287,7 +278,7 @@ def tinder_do_tinder_report(event):
287 278
288 try: 279 try:
289 # truncate the tinder log file 280 # truncate the tinder log file
290 f = file(data.getVar('TINDER_LOG', event.data, True), 'w') 281 f = file(event.data.getVar('TINDER_LOG', True), 'w')
291 f.write("") 282 f.write("")
292 f.close() 283 f.close()
293 except: 284 except:
@@ -296,7 +287,7 @@ def tinder_do_tinder_report(event):
296 try: 287 try:
297 # write a status to the file. This is needed for the -k option 288 # write a status to the file. This is needed for the -k option
298 # of BitBake 289 # of BitBake
299 g = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') 290 g = file(event.data.getVar('TMPDIR', True)+"/tinder-status", 'w')
300 g.write("") 291 g.write("")
301 g.close() 292 g.close()
302 except IOError: 293 except IOError:
@@ -305,10 +296,10 @@ def tinder_do_tinder_report(event):
305 # Append the Task-Log (compile,configure...) to the log file 296 # Append the Task-Log (compile,configure...) to the log file
306 # we will send to the server 297 # we will send to the server
307 if name == "TaskSucceeded" or name == "TaskFailed": 298 if name == "TaskSucceeded" or name == "TaskFailed":
308 log_file = glob.glob("%s/log.%s.*" % (data.getVar('T', event.data, True), event.task)) 299 log_file = glob.glob("%s/log.%s.*" % (event.data.getVar('T', True), event.task))
309 300
310 if len(log_file) != 0: 301 if len(log_file) != 0:
311 to_file = data.getVar('TINDER_LOG', event.data, True) 302 to_file = event.data.getVar('TINDER_LOG', True)
312 log += "".join(open(log_file[0], 'r').readlines()) 303 log += "".join(open(log_file[0], 'r').readlines())
313 304
314 # set the right 'HEADER'/Summary for the TinderBox 305 # set the right 'HEADER'/Summary for the TinderBox
@@ -319,23 +310,23 @@ def tinder_do_tinder_report(event):
319 elif name == "TaskFailed": 310 elif name == "TaskFailed":
320 log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task 311 log += "<--- TINDERBOX Task %s failed (FAILURE)\n" % event.task
321 elif name == "PkgStarted": 312 elif name == "PkgStarted":
322 log += "---> TINDERBOX Package %s started\n" % data.getVar('PF', event.data, True) 313 log += "---> TINDERBOX Package %s started\n" % event.data.getVar('PF', True)
323 elif name == "PkgSucceeded": 314 elif name == "PkgSucceeded":
324 log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % data.getVar('PF', event.data, True) 315 log += "<--- TINDERBOX Package %s done (SUCCESS)\n" % event.data.getVar('PF', True)
325 elif name == "PkgFailed": 316 elif name == "PkgFailed":
326 if not data.getVar('TINDER_AUTOBUILD', event.data, True) == "0": 317 if not event.data.getVar('TINDER_AUTOBUILD', True) == "0":
327 build.exec_task('do_clean', event.data) 318 build.exec_task('do_clean', event.data)
328 log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % data.getVar('PF', event.data, True) 319 log += "<--- TINDERBOX Package %s failed (FAILURE)\n" % event.data.getVar('PF', True)
329 status = 200 320 status = 200
330 # remember the failure for the -k case 321 # remember the failure for the -k case
331 h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') 322 h = file(event.data.getVar('TMPDIR', True)+"/tinder-status", 'w')
332 h.write("200") 323 h.write("200")
333 elif name == "BuildCompleted": 324 elif name == "BuildCompleted":
334 log += "Build Completed\n" 325 log += "Build Completed\n"
335 status = 100 326 status = 100
336 # Check if we have a old status... 327 # Check if we have a old status...
337 try: 328 try:
338 h = file(data.getVar('TMPDIR',event.data,True)+'/tinder-status', 'r') 329 h = file(event.data.getVar('TMPDIR',True)+'/tinder-status', 'r')
339 status = int(h.read()) 330 status = int(h.read())
340 except: 331 except:
341 pass 332 pass
@@ -351,7 +342,7 @@ def tinder_do_tinder_report(event):
351 log += "Error:Was Runtime: %d\n" % event.isRuntime() 342 log += "Error:Was Runtime: %d\n" % event.isRuntime()
352 status = 200 343 status = 200
353 # remember the failure for the -k case 344 # remember the failure for the -k case
354 h = file(data.getVar('TMPDIR', event.data, True)+"/tinder-status", 'w') 345 h = file(event.data.getVar('TMPDIR', True)+"/tinder-status", 'w')
355 h.write("200") 346 h.write("200")
356 347
357 # now post the log 348 # now post the log
@@ -366,13 +357,10 @@ def tinder_do_tinder_report(event):
366# we want to be an event handler 357# we want to be an event handler
367addhandler tinderclient_eventhandler 358addhandler tinderclient_eventhandler
368python tinderclient_eventhandler() { 359python tinderclient_eventhandler() {
369 from bb import note, error, data 360 if e.data is None or bb.event.getName(e) == "MsgNote":
370 from bb.event import getName
371
372 if e.data is None or getName(e) == "MsgNote":
373 return 361 return
374 362
375 do_tinder_report = data.getVar('TINDER_REPORT', e.data, True) 363 do_tinder_report = e.data.getVar('TINDER_REPORT', True)
376 if do_tinder_report and do_tinder_report == "1": 364 if do_tinder_report and do_tinder_report == "1":
377 tinder_do_tinder_report(e) 365 tinder_do_tinder_report(e)
378 366
diff --git a/meta/conf/distro/include/csl-versions.inc b/meta/conf/distro/include/csl-versions.inc
index 0790b8ab26..e8f52d272d 100644
--- a/meta/conf/distro/include/csl-versions.inc
+++ b/meta/conf/distro/include/csl-versions.inc
@@ -38,7 +38,6 @@ def csl_get_gcc_version(d):
38 return version 38 return version
39 39
40def csl_get_libc_version(d): 40def csl_get_libc_version(d):
41 import os,bb
42 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') 41 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}')
43 if not syspath: 42 if not syspath:
44 return 'UNKNOWN' 43 return 'UNKNOWN'
@@ -54,7 +53,6 @@ def csl_get_libc_version(d):
54 return 'UNKNOWN' 53 return 'UNKNOWN'
55 54
56def csl_get_kernel_version(d): 55def csl_get_kernel_version(d):
57 import os,bb
58 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}') 56 syspath = d.expand('${EXTERNAL_TOOLCHAIN}/${CSL_TARGET_SYS}')
59 if not syspath: 57 if not syspath:
60 return 'UNKNOWN' 58 return 'UNKNOWN'
diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
index 1635eec813..098c724e02 100644
--- a/meta/conf/distro/include/tcmode-external-sourcery.inc
+++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
@@ -104,7 +104,6 @@ addhandler toolchain_setup
104 104
105def populate_toolchain_links(d): 105def populate_toolchain_links(d):
106 import errno 106 import errno
107 import os
108 from glob import glob 107 from glob import glob
109 108
110 d = d.createCopy() 109 d = d.createCopy()
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py
index e50f453de5..4cc0e02968 100644
--- a/meta/lib/oe/data.py
+++ b/meta/lib/oe/data.py
@@ -1,5 +1,4 @@
1import oe.maketype 1import oe.maketype
2import bb.msg
3 2
4def typed_value(key, d): 3def typed_value(key, d):
5 """Construct a value for the specified metadata variable, using its flags 4 """Construct a value for the specified metadata variable, using its flags
diff --git a/meta/lib/oe/maketype.py b/meta/lib/oe/maketype.py
index 0e9dbc67fb..139f333691 100644
--- a/meta/lib/oe/maketype.py
+++ b/meta/lib/oe/maketype.py
@@ -5,7 +5,6 @@ variable. Other flags may be utilized in the construction of the types. See
5the arguments of the type's factory for details. 5the arguments of the type's factory for details.
6""" 6"""
7 7
8import bb
9import inspect 8import inspect
10import types 9import types
11 10
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index 9a28e6b4de..5f897ff31f 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -1,5 +1,3 @@
1import os
2import bb.data
3import codecs 1import codecs
4 2
5def packaged(pkg, d): 3def packaged(pkg, d):
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 17b7e1f27d..bc86bb5391 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -1,6 +1,4 @@
1import oe.path 1import oe.path
2import os
3import bb.utils, bb.msg, bb.data, bb.fetch2
4 2
5class NotFoundError(bb.BBHandledException): 3class NotFoundError(bb.BBHandledException):
6 def __init__(self, path): 4 def __init__(self, path):
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 1fdfa8724f..7197b23650 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -1,7 +1,5 @@
1import bb
2import errno 1import errno
3import glob 2import glob
4import os
5import shutil 3import shutil
6import subprocess 4import subprocess
7 5
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py
index 16785ce83d..c3fb76a338 100644
--- a/meta/lib/oe/prservice.py
+++ b/meta/lib/oe/prservice.py
@@ -1,4 +1,3 @@
1import bb
2 1
3def prserv_make_conn(d, check = False): 2def prserv_make_conn(d, check = False):
4 import prserv.serv 3 import prserv.serv
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 28abf147b9..31317985f5 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -1,5 +1,4 @@
1import logging 1import logging
2import os
3import oe.classutils 2import oe.classutils
4import shlex 3import shlex
5from bb.process import Popen, ExecutionError 4from bb.process import Popen, ExecutionError
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 8912dac3bb..e14743f3f3 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -1,5 +1,3 @@
1import bb, bb.data
2
3def read_file(filename): 1def read_file(filename):
4 try: 2 try:
5 f = file( filename, "r" ) 3 f = file( filename, "r" )
diff --git a/meta/recipes-core/eglibc/eglibc_2.15.bb b/meta/recipes-core/eglibc/eglibc_2.15.bb
index 4d4d2cf2ed..d9cb048690 100644
--- a/meta/recipes-core/eglibc/eglibc_2.15.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.15.bb
@@ -58,7 +58,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR
58# 58#
59 59
60python __anonymous () { 60python __anonymous () {
61 import bb, re 61 import re
62 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) 62 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
63 if uc_os: 63 if uc_os:
64 raise bb.parse.SkipPackage("incompatible with target %s" % 64 raise bb.parse.SkipPackage("incompatible with target %s" %
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.16.bb
index 7e7d68b87d..b76d94320e 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.16.bb
@@ -54,7 +54,7 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIR
54# 54#
55 55
56python __anonymous () { 56python __anonymous () {
57 import bb, re 57 import re
58 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None) 58 uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
59 if uc_os: 59 if uc_os:
60 raise bb.parse.SkipPackage("incompatible with target %s" % 60 raise bb.parse.SkipPackage("incompatible with target %s" %
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
index b9bc3aae0f..2325dbf291 100644
--- a/meta/recipes-core/tasks/task-base.bb
+++ b/meta/recipes-core/tasks/task-base.bb
@@ -124,8 +124,6 @@ python __anonymous () {
124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) 124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
125 # then include task-base-wifi in task-base 125 # then include task-base-wifi in task-base
126 126
127 import bb
128
129 distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) 127 distro_features = set(d.getVar("DISTRO_FEATURES", True).split())
130 machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) 128 machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
131 129
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 26f3d74943..762ecf7af3 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -40,7 +40,6 @@ def get_files_apt_doc(d, bb, manpages):
40 return manpages 40 return manpages
41 41
42def get_commands_apt_doc(d, bb, manpages): 42def get_commands_apt_doc(d, bb, manpages):
43 import os
44 s = list() 43 s = list()
45 __dir_cache__ = list() 44 __dir_cache__ = list()
46 for m in manpages.split(): 45 for m in manpages.split():
diff --git a/meta/recipes-extended/pam/libpam_1.1.5.bb b/meta/recipes-extended/pam/libpam_1.1.5.bb
index 9274ed3832..dd75d427ec 100644
--- a/meta/recipes-extended/pam/libpam_1.1.5.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.5.bb
@@ -53,8 +53,6 @@ RDEPENDS_${PN}-xtests = "libpam pam-plugin-access pam-plugin-debug pam-plugin-cr
53RRECOMMENDS_${PN} = "libpam-runtime" 53RRECOMMENDS_${PN} = "libpam-runtime"
54 54
55python populate_packages_prepend () { 55python populate_packages_prepend () {
56 import os.path
57
58 def pam_plugin_append_file(pn, dir, file): 56 def pam_plugin_append_file(pn, dir, file):
59 nf = os.path.join(dir, file) 57 nf = os.path.join(dir, file)
60 of = d.getVar('FILES_' + pn, True) 58 of = d.getVar('FILES_' + pn, True)
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index f90b3fcd64..1d4121c563 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -32,8 +32,6 @@ LIBV = "2.10.0"
32PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" 32PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
33 33
34python populate_packages_prepend () { 34python populate_packages_prepend () {
35 import os.path
36
37 prologue = d.getVar("postinst_prologue", True) 35 prologue = d.getVar("postinst_prologue", True)
38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) 36 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
39 37
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index e2d6ef1edd..16aa6931c9 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -32,8 +32,6 @@ LIBV = "2.10.0"
32PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" 32PACKAGES_DYNAMIC += "gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
33 33
34python populate_packages_prepend () { 34python populate_packages_prepend () {
35 import os.path
36
37 prologue = d.getVar("postinst_prologue", True) 35 prologue = d.getVar("postinst_prologue", True)
38 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) 36 postinst_pixbufloader = d.getVar("postinst_pixbufloader", True)
39 37
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
index e49e6e7e17..3b857599b3 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.8.bb
@@ -39,8 +39,6 @@ LIBV = "2.10.0"
39PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*" 39PACKAGES_DYNAMIC += "gtk-immodule-* gtk-printbackend-*"
40 40
41python populate_packages_prepend () { 41python populate_packages_prepend () {
42 import os.path
43
44 prologue = d.getVar("postinst_prologue", True) 42 prologue = d.getVar("postinst_prologue", True)
45 43
46 gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}') 44 gtk_libdir = d.expand('${libdir}/gtk-2.0/${LIBV}')
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
index 3baa46e540..c54487027d 100644
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
@@ -29,8 +29,6 @@ CFLAGS_prepend = "-DHAVE_ANIMATION "
29inherit gnome 29inherit gnome
30 30
31python populate_packages_prepend() { 31python populate_packages_prepend() {
32 import os.path
33
34 engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines") 32 engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
35 themes_root = os.path.join(d.getVar('datadir', True), "themes") 33 themes_root = os.path.join(d.getVar('datadir', True), "themes")
36 34
diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc
index a164717427..6655217f9c 100644
--- a/meta/recipes-graphics/directfb/directfb.inc
+++ b/meta/recipes-graphics/directfb/directfb.inc
@@ -35,7 +35,6 @@ EXTRA_OECONF = "\
35#PACKAGES_DYNAMIC = "directfb-inputdrivers-*" 35#PACKAGES_DYNAMIC = "directfb-inputdrivers-*"
36# 36#
37#python populate_packages_prepend () { 37#python populate_packages_prepend () {
38# import os.path
39# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') 38# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers')
40# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') 39# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s')
41#} 40#}
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 6eb5fd8e05..6bf2503296 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -11,8 +11,6 @@ DRIDRIVERS_append_x86-64 = ",i915,i965"
11EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}" 11EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
12 12
13python populate_packages_prepend() { 13python populate_packages_prepend() {
14 import os.path
15
16 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") 14 dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
17 15
18 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='') 16 do_split_packages(d, dri_drivers_root, '^(.*)_dri\.so$', 'mesa-dri-driver-%s', 'Mesa %s DRI driver', extra_depends='')
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
index 8aa1458630..d39f49d1a3 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -3,8 +3,6 @@ FILES_kernel-devicetree = "/boot/devicetree*"
3KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000" 3KERNEL_DEVICETREE_FLAGS = "-R 8 -p 0x3000"
4 4
5python __anonymous () { 5python __anonymous () {
6 import bb
7
8 devicetree = d.getVar("KERNEL_DEVICETREE", True) or '' 6 devicetree = d.getVar("KERNEL_DEVICETREE", True) or ''
9 if devicetree: 7 if devicetree:
10 depends = d.getVar("DEPENDS", True) 8 depends = d.getVar("DEPENDS", True)
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
index ebaced4247..390a826891 100644
--- a/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
+++ b/meta/recipes-qt/qt-apps/qmmp_0.5.2.bb
@@ -30,7 +30,6 @@ PACKAGES_DYNAMIC = "qmmp-plugin-* "
30 30
31 31
32python populate_packages_prepend () { 32python populate_packages_prepend () {
33 import os
34 qmmp_libdir = d.expand('${libdir}/qmmp') 33 qmmp_libdir = d.expand('${libdir}/qmmp')
35 gd = d.expand('${D}/${libdir}/qmmp') 34 gd = d.expand('${D}/${libdir}/qmmp')
36 plug_dirs = os.listdir(gd) 35 plug_dirs = os.listdir(gd)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 3f61a20a2c..df70e09918 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -38,8 +38,6 @@ QT_LIB_NAMES = "Qt3Support QtAssistantClient QtCLucene QtCore QtDBus QtDesigner
38QT_EXTRA_LIBS = "pvrQWSWSEGL" 38QT_EXTRA_LIBS = "pvrQWSWSEGL"
39 39
40python __anonymous () { 40python __anonymous () {
41 import bb
42
43 lib_packages = [] 41 lib_packages = []
44 dev_packages = [] 42 dev_packages = []
45 dbg_packages = [] 43 dbg_packages = []
@@ -280,7 +278,7 @@ python populate_packages_prepend() {
280 278
281 phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/') 279 phrasebook_dir = d.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/')
282 phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s') 280 phrasebook_name = d.expand('${QT_BASE_NAME}-phrasebook-%s')
283 import os; 281
284 if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)): 282 if os.path.exists("%s%s" % (d.expand('${D}'), phrasebook_dir)):
285 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) 283 do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
286 else: 284 else:
diff --git a/meta/recipes-sato/puzzles/oh-puzzles_git.bb b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
index c084c40a43..98b09f8fa5 100644
--- a/meta/recipes-sato/puzzles/oh-puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/oh-puzzles_git.bb
@@ -59,7 +59,6 @@ FILES_${PN}-dbg += "/usr/games/.debug/*"
59FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas" 59FILES_${PN}-extra = "/usr/games/ /usr/share/applications /etc/gconf/schemas"
60 60
61python __anonymous () { 61python __anonymous () {
62 import bb
63 var = bb.data.expand("FILES_${PN}", d, 1) 62 var = bb.data.expand("FILES_${PN}", d, 1)
64 data = d.getVar(var, True) 63 data = d.getVar(var, True)
65 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"): 64 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 1162ccd5fb..ec602a6cf4 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -47,8 +47,6 @@ BOOST_LIBS = "\
47# Make a package for each library, plus -dev 47# Make a package for each library, plus -dev
48PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}" 48PACKAGES = "${PN}-dbg ${BOOST_PACKAGES}"
49python __anonymous () { 49python __anonymous () {
50 import bb
51
52 packages = [] 50 packages = []
53 extras = [] 51 extras = []
54 for lib in d.getVar('BOOST_LIBS', True).split( ): 52 for lib in d.getVar('BOOST_LIBS', True).split( ):
diff --git a/meta/recipes-support/pth/pth_2.0.7.bb b/meta/recipes-support/pth/pth_2.0.7.bb
index 2aeec440cc..83a03b334f 100644
--- a/meta/recipes-support/pth/pth_2.0.7.bb
+++ b/meta/recipes-support/pth/pth_2.0.7.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=12;endline=15;md5=a48af114a80c222ca
6PR = "r2" 6PR = "r2"
7 7
8python __anonymous () { 8python __anonymous () {
9 import bb, re 9 import re
10 uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None) 10 uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None)
11 if uc_os: 11 if uc_os:
12 raise bb.parse.SkipPackage("incompatible with uClibc") 12 raise bb.parse.SkipPackage("incompatible with uClibc")