summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/patch.py
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-09 15:00:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-10 11:51:19 +0000
commitc8dee9b92dfd545852ecac8dc2adfc95ac02e957 (patch)
tree5f1b86954646a0f3bb914407994388a6a4346769 /meta/lib/oe/patch.py
parent5d3860f4a8abb8e95442b04f8b84a333af362fcd (diff)
downloadpoky-c8dee9b92dfd545852ecac8dc2adfc95ac02e957.tar.gz
Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r--meta/lib/oe/patch.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 75fb91e0fb..f4ccb3e183 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -179,7 +179,7 @@ class GitApplyTree(PatchTree):
179 179
180class QuiltTree(PatchSet): 180class QuiltTree(PatchSet):
181 def _runcmd(self, args, run = True): 181 def _runcmd(self, args, run = True):
182 quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) 182 quiltrc = self.d.getVar('QUILTRCFILE', 1)
183 if not run: 183 if not run:
184 return ["quilt"] + ["--quiltrc"] + [quiltrc] + args 184 return ["quilt"] + ["--quiltrc"] + [quiltrc] + args
185 runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) 185 runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir)
@@ -357,7 +357,7 @@ class UserResolver(Resolver):
357 # Patch application failed 357 # Patch application failed
358 patchcmd = self.patchset.Push(True, False, False) 358 patchcmd = self.patchset.Push(True, False, False)
359 359
360 t = bb.data.getVar('T', self.patchset.d, 1) 360 t = self.patchset.d.getVar('T', 1)
361 if not t: 361 if not t:
362 bb.msg.fatal("Build", "T not set") 362 bb.msg.fatal("Build", "T not set")
363 bb.utils.mkdirhier(t) 363 bb.utils.mkdirhier(t)