diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-09 17:11:38 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-15 09:29:55 -0800 |
| commit | bfd0a39bdf13f6953810bf868022a871d2a20b6d (patch) | |
| tree | e3c3fddc611afb3e70d6fae68e7cbdc42e1fe796 /meta/classes/distrodata.bbclass | |
| parent | e758547db9048d4aa1c1415d6af8072f519fae24 (diff) | |
| download | poky-bfd0a39bdf13f6953810bf868022a871d2a20b6d.tar.gz | |
classes: Drop now unneeded update_data calls
Now that the datastore works dynamically we don't need the update_data calls
so we can just remove them. They're not actually done anything at all for
a while.
(From OE-Core rev: 8de0c5d3bd01919e2bf0394f9c485936d6098cec)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/distrodata.bbclass')
| -rw-r--r-- | meta/classes/distrodata.bbclass | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 9587ba0daf..5e34441610 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass | |||
| @@ -38,32 +38,27 @@ python do_distrodata_np() { | |||
| 38 | pnstripped = pn.split("-native") | 38 | pnstripped = pn.split("-native") |
| 39 | bb.note("Native Split: %s" % pnstripped) | 39 | bb.note("Native Split: %s" % pnstripped) |
| 40 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 40 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 41 | bb.data.update_data(localdata) | ||
| 42 | 41 | ||
| 43 | if pn.find("-cross") != -1: | 42 | if pn.find("-cross") != -1: |
| 44 | pnstripped = pn.split("-cross") | 43 | pnstripped = pn.split("-cross") |
| 45 | bb.note("cross Split: %s" % pnstripped) | 44 | bb.note("cross Split: %s" % pnstripped) |
| 46 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 45 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 47 | bb.data.update_data(localdata) | ||
| 48 | 46 | ||
| 49 | if pn.find("-crosssdk") != -1: | 47 | if pn.find("-crosssdk") != -1: |
| 50 | pnstripped = pn.split("-crosssdk") | 48 | pnstripped = pn.split("-crosssdk") |
| 51 | bb.note("cross Split: %s" % pnstripped) | 49 | bb.note("cross Split: %s" % pnstripped) |
| 52 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 50 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 53 | bb.data.update_data(localdata) | ||
| 54 | 51 | ||
| 55 | if pn.startswith("nativesdk-"): | 52 | if pn.startswith("nativesdk-"): |
| 56 | pnstripped = pn.replace("nativesdk-", "") | 53 | pnstripped = pn.replace("nativesdk-", "") |
| 57 | bb.note("NativeSDK Split: %s" % pnstripped) | 54 | bb.note("NativeSDK Split: %s" % pnstripped) |
| 58 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 55 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
| 59 | bb.data.update_data(localdata) | ||
| 60 | 56 | ||
| 61 | 57 | ||
| 62 | if pn.find("-initial") != -1: | 58 | if pn.find("-initial") != -1: |
| 63 | pnstripped = pn.split("-initial") | 59 | pnstripped = pn.split("-initial") |
| 64 | bb.note("initial Split: %s" % pnstripped) | 60 | bb.note("initial Split: %s" % pnstripped) |
| 65 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 61 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 66 | bb.data.update_data(localdata) | ||
| 67 | 62 | ||
| 68 | """generate package information from .bb file""" | 63 | """generate package information from .bb file""" |
| 69 | pname = localdata.getVar('PN') | 64 | pname = localdata.getVar('PN') |
| @@ -127,31 +122,26 @@ python do_distrodata() { | |||
| 127 | pnstripped = pn.split("-native") | 122 | pnstripped = pn.split("-native") |
| 128 | bb.note("Native Split: %s" % pnstripped) | 123 | bb.note("Native Split: %s" % pnstripped) |
| 129 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 124 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 130 | bb.data.update_data(localdata) | ||
| 131 | 125 | ||
| 132 | if pn.startswith("nativesdk-"): | 126 | if pn.startswith("nativesdk-"): |
| 133 | pnstripped = pn.replace("nativesdk-", "") | 127 | pnstripped = pn.replace("nativesdk-", "") |
| 134 | bb.note("NativeSDK Split: %s" % pnstripped) | 128 | bb.note("NativeSDK Split: %s" % pnstripped) |
| 135 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 129 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
| 136 | bb.data.update_data(localdata) | ||
| 137 | 130 | ||
| 138 | if pn.find("-cross") != -1: | 131 | if pn.find("-cross") != -1: |
| 139 | pnstripped = pn.split("-cross") | 132 | pnstripped = pn.split("-cross") |
| 140 | bb.note("cross Split: %s" % pnstripped) | 133 | bb.note("cross Split: %s" % pnstripped) |
| 141 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 134 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 142 | bb.data.update_data(localdata) | ||
| 143 | 135 | ||
| 144 | if pn.find("-crosssdk") != -1: | 136 | if pn.find("-crosssdk") != -1: |
| 145 | pnstripped = pn.split("-crosssdk") | 137 | pnstripped = pn.split("-crosssdk") |
| 146 | bb.note("cross Split: %s" % pnstripped) | 138 | bb.note("cross Split: %s" % pnstripped) |
| 147 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 139 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 148 | bb.data.update_data(localdata) | ||
| 149 | 140 | ||
| 150 | if pn.find("-initial") != -1: | 141 | if pn.find("-initial") != -1: |
| 151 | pnstripped = pn.split("-initial") | 142 | pnstripped = pn.split("-initial") |
| 152 | bb.note("initial Split: %s" % pnstripped) | 143 | bb.note("initial Split: %s" % pnstripped) |
| 153 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 144 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 154 | bb.data.update_data(localdata) | ||
| 155 | 145 | ||
| 156 | """generate package information from .bb file""" | 146 | """generate package information from .bb file""" |
| 157 | pname = localdata.getVar('PN') | 147 | pname = localdata.getVar('PN') |
| @@ -292,7 +282,6 @@ python do_checkpkg() { | |||
| 292 | pnstripped = pname.split("-native") | 282 | pnstripped = pname.split("-native") |
| 293 | bb.note("Native Split: %s" % pnstripped) | 283 | bb.note("Native Split: %s" % pnstripped) |
| 294 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 284 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 295 | bb.data.update_data(localdata) | ||
| 296 | 285 | ||
| 297 | if pname.startswith("nativesdk-"): | 286 | if pname.startswith("nativesdk-"): |
| 298 | if d.getVar('BBCLASSEXTEND'): | 287 | if d.getVar('BBCLASSEXTEND'): |
| @@ -300,19 +289,16 @@ python do_checkpkg() { | |||
| 300 | pnstripped = pname.replace("nativesdk-", "") | 289 | pnstripped = pname.replace("nativesdk-", "") |
| 301 | bb.note("NativeSDK Split: %s" % pnstripped) | 290 | bb.note("NativeSDK Split: %s" % pnstripped) |
| 302 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) | 291 | localdata.setVar('OVERRIDES', "pn-" + pnstripped + ":" + d.getVar('OVERRIDES')) |
| 303 | bb.data.update_data(localdata) | ||
| 304 | 292 | ||
| 305 | if pname.find("-cross") != -1: | 293 | if pname.find("-cross") != -1: |
| 306 | pnstripped = pname.split("-cross") | 294 | pnstripped = pname.split("-cross") |
| 307 | bb.note("cross Split: %s" % pnstripped) | 295 | bb.note("cross Split: %s" % pnstripped) |
| 308 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 296 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 309 | bb.data.update_data(localdata) | ||
| 310 | 297 | ||
| 311 | if pname.find("-initial") != -1: | 298 | if pname.find("-initial") != -1: |
| 312 | pnstripped = pname.split("-initial") | 299 | pnstripped = pname.split("-initial") |
| 313 | bb.note("initial Split: %s" % pnstripped) | 300 | bb.note("initial Split: %s" % pnstripped) |
| 314 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) | 301 | localdata.setVar('OVERRIDES', "pn-" + pnstripped[0] + ":" + d.getVar('OVERRIDES')) |
| 315 | bb.data.update_data(localdata) | ||
| 316 | 302 | ||
| 317 | pdesc = localdata.getVar('DESCRIPTION') | 303 | pdesc = localdata.getVar('DESCRIPTION') |
| 318 | pgrp = localdata.getVar('SECTION') | 304 | pgrp = localdata.getVar('SECTION') |
| @@ -401,7 +387,6 @@ python do_distro_check() { | |||
| 401 | return | 387 | return |
| 402 | 388 | ||
| 403 | localdata = bb.data.createCopy(d) | 389 | localdata = bb.data.createCopy(d) |
| 404 | bb.data.update_data(localdata) | ||
| 405 | tmpdir = d.getVar('TMPDIR') | 390 | tmpdir = d.getVar('TMPDIR') |
| 406 | distro_check_dir = os.path.join(tmpdir, "distro_check") | 391 | distro_check_dir = os.path.join(tmpdir, "distro_check") |
| 407 | logpath = d.getVar('LOG_DIR') | 392 | logpath = d.getVar('LOG_DIR') |
