diff options
| -rw-r--r-- | classes/base.oeclass | 14 | ||||
| -rw-r--r-- | classes/package.oeclass | 5 | ||||
| -rw-r--r-- | classes/package_ipk.oeclass | 5 | ||||
| -rw-r--r-- | classes/package_rpm.oeclass | 4 | ||||
| -rw-r--r-- | classes/package_tar.oeclass | 4 | ||||
| -rw-r--r-- | misc-binary-only/tda1004x-firmware.oe | 5 |
6 files changed, 17 insertions, 20 deletions
diff --git a/classes/base.oeclass b/classes/base.oeclass index 4e3e17137b..35c7fbecd1 100644 --- a/classes/base.oeclass +++ b/classes/base.oeclass @@ -247,7 +247,7 @@ python do_showdata() { # emit variables and shell functions oe.data.emit_env(sys.__stdout__, d, True) # emit the metadata which isnt valid shell - for e in oe.data.keys(d): + for e in d.keys(): if oe.data.getVarFlag(e, 'python', d): sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, oe.data.getVar(e, d, 1))) elif oe.data.getVarFlag(e, 'func', d): @@ -263,7 +263,7 @@ python do_listtasks() { # emit variables and shell functions #oe.data.emit_env(sys.__stdout__, d) # emit the metadata which isnt valid shell - for e in oe.data.keys(d): + for e in d.keys(): if oe.data.getVarFlag(e, 'task', d): sys.__stdout__.write("%s\n" % e) } @@ -299,10 +299,9 @@ addtask fetch do_fetch[dirs] = "${DL_DIR}" do_fetch[nostamp] = "1" python base_do_fetch() { - import sys + import sys, copy - localdata = {} - oe.data.linkDataSet(localdata,d) + localdata = copy.deepcopy(d) oe.data.update_data(localdata) src_uri = oe.data.getVar('SRC_URI', localdata, 1) @@ -374,10 +373,9 @@ def oe_unpack_file(file, data, url = None): addtask unpack after do_fetch do_unpack[dirs] = "${WORKDIR}" python base_do_unpack() { - import re, os + import re, copy, os - localdata = {} - oe.data.linkDataSet(localdata,d) + localdata = copy.deepcopy(d) oe.data.update_data(localdata) src_uri = oe.data.getVar('SRC_URI', localdata) diff --git a/classes/package.oeclass b/classes/package.oeclass index e26f5e90cc..443c057147 100644 --- a/classes/package.oeclass +++ b/classes/package.oeclass @@ -98,7 +98,7 @@ def package_frob_arch(d): return python populate_packages () { - import glob, stat, errno, re + import glob, copy, stat, errno, re workdir = oe.data.getVar('WORKDIR', d, 1) if not workdir: @@ -140,8 +140,7 @@ python populate_packages () { return (s[stat.ST_MODE] & stat.S_IEXEC) for pkg in packages.split(): - localdata = {} - oe.data.linkDataSet(localdata,d) + localdata = copy.deepcopy(d) root = os.path.join(workdir, "install", pkg) os.system('rm -rf %s' % root) diff --git a/classes/package_ipk.oeclass b/classes/package_ipk.oeclass index f680b1bca3..5ec1f82cdc 100644 --- a/classes/package_ipk.oeclass +++ b/classes/package_ipk.oeclass @@ -60,6 +60,7 @@ python package_ipk_install () { } python package_ipk_do_package_ipk () { + import copy # to back up env data import sys workdir = oe.data.getVar('WORKDIR', d, 1) @@ -95,8 +96,8 @@ python package_ipk_do_package_ipk () { return for pkg in packages.split(): - localdata = {} - oe.data.linkDataSet(localdata,d) + from copy import deepcopy + localdata = deepcopy(d) root = "%s/install/%s" % (workdir, pkg) oe.data.setVar('ROOT', '', localdata) diff --git a/classes/package_rpm.oeclass b/classes/package_rpm.oeclass index 36398f789e..60cf86acf5 100644 --- a/classes/package_rpm.oeclass +++ b/classes/package_rpm.oeclass @@ -107,8 +107,8 @@ python do_package_rpm () { packages = oe.data.expand(packages, d) for pkg in packages.split(): - localdata = {} - oe.data.linkDataSet(localdata,d) + from copy import copy, deepcopy + localdata = deepcopy(d) root = "%s/install/%s" % (workdir, pkg) oe.data.setVar('ROOT', '', localdata) diff --git a/classes/package_tar.oeclass b/classes/package_tar.oeclass index e8faedf7be..02e74bc8ad 100644 --- a/classes/package_tar.oeclass +++ b/classes/package_tar.oeclass @@ -59,8 +59,8 @@ python do_package_tar () { return for pkg in packages.split(): - localdata = {} - oe.data.linkDataSet(localdata,d) + from copy import copy, deepcopy + localdata = deepcopy(d) root = "%s/install/%s" % (workdir, pkg) oe.data.setVar('ROOT', '', localdata) diff --git a/misc-binary-only/tda1004x-firmware.oe b/misc-binary-only/tda1004x-firmware.oe index ffd72c31f0..9c494ff584 100644 --- a/misc-binary-only/tda1004x-firmware.oe +++ b/misc-binary-only/tda1004x-firmware.oe @@ -5,10 +5,9 @@ SRC_URI = "http://hauppauge.lightpath.net/de/nova-pci216.exe" FILES_${PN} = '*' python do_unpack() { - import re + import re, copy - localdata = {} - oe.data.linkDataSet(localdata,d) + localdata = copy.deepcopy(d) overrides = oe.data.getVar('OVERRIDES', localdata, 1) if not overrides: raise oe.build.FuncFailed('OVERRIDES not defined') |