diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-06 23:06:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-07 11:35:42 +0100 |
commit | ac8e55935f417c4e2dd43ba8e66f6c96be01ec3f (patch) | |
tree | 4150d06a854230007f9f968af15c81aa0e7011d1 /meta/classes | |
parent | d918698d60a3f08e2b83f9af157cdd7237cfa81c (diff) | |
download | poky-ac8e55935f417c4e2dd43ba8e66f6c96be01ec3f.tar.gz |
base.bbclass: Minor cleanup
(From OE-Core rev: 373db49de0e30239fc8c7c3ce74d635fd7d6cd70)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/base.bbclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 57f1c3f4fe..7cd6efad1d 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -202,7 +202,6 @@ def preferred_ml_updates(d): | |||
202 | 202 | ||
203 | addhandler base_eventhandler | 203 | addhandler base_eventhandler |
204 | python base_eventhandler() { | 204 | python base_eventhandler() { |
205 | from bb import note, error, data | ||
206 | from bb.event import getName | 205 | from bb.event import getName |
207 | 206 | ||
208 | name = getName(e) | 207 | name = getName(e) |
@@ -212,7 +211,7 @@ python base_eventhandler() { | |||
212 | statusvars = ['BB_VERSION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TUNE_FEATURES', 'TARGET_FPU'] | 211 | statusvars = ['BB_VERSION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'DISTRO_VERSION','TUNE_FEATURES', 'TARGET_FPU'] |
213 | statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] | 212 | statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] |
214 | 213 | ||
215 | layers = (data.getVar("BBLAYERS", e.data, 1) or "").split() | 214 | layers = (bb.data.getVar("BBLAYERS", e.data, 1) or "").split() |
216 | layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \ | 215 | layers_branch_rev = ["%-17s = \"%s:%s\"" % (os.path.basename(i), \ |
217 | base_get_metadata_git_branch(i, None).strip(), \ | 216 | base_get_metadata_git_branch(i, None).strip(), \ |
218 | base_get_metadata_git_revision(i, None)) \ | 217 | base_get_metadata_git_revision(i, None)) \ |
@@ -248,9 +247,6 @@ python base_eventhandler() { | |||
248 | generate_git_config(e) | 247 | generate_git_config(e) |
249 | pkgarch_mapping(e.data) | 248 | pkgarch_mapping(e.data) |
250 | preferred_ml_updates(e.data) | 249 | preferred_ml_updates(e.data) |
251 | |||
252 | if not data in e.__dict__: | ||
253 | return | ||
254 | } | 250 | } |
255 | 251 | ||
256 | addtask configure after do_patch | 252 | addtask configure after do_patch |