diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-08-03 18:18:03 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-04 11:43:12 +0100 |
commit | 1fbcd2ca178db28747046b5bd943c81176db9f65 (patch) | |
tree | 18b476a4260e5970da74cc4d60ee51a010ee870c /meta/lib/oe/patch.py | |
parent | 7b743641209492476329b88dcb213fbbd1780a9f (diff) | |
download | poky-1fbcd2ca178db28747046b5bd943c81176db9f65.tar.gz |
lib/oe: sync with OE.dev
Most notable change is the move to creating symlinks to patches in the metadata
tree rather than copying them.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/lib/oe/patch.py')
-rw-r--r-- | meta/lib/oe/patch.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 94c56bc101..f203d683da 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -1,3 +1,5 @@ | |||
1 | import oe.path | ||
2 | |||
1 | class NotFoundError(Exception): | 3 | class NotFoundError(Exception): |
2 | def __init__(self, path): | 4 | def __init__(self, path): |
3 | self.path = path | 5 | self.path = path |
@@ -234,15 +236,10 @@ class QuiltTree(PatchSet): | |||
234 | if not self.initialized: | 236 | if not self.initialized: |
235 | self.InitFromDir() | 237 | self.InitFromDir() |
236 | PatchSet.Import(self, patch, force) | 238 | PatchSet.Import(self, patch, force) |
237 | 239 | oe.path.symlink(patch["file"], self._quiltpatchpath(patch["file"])) | |
238 | args = ["import", "-p", patch["strippath"]] | 240 | f = open(os.path.join(self.dir, "patches","series"), "a"); |
239 | if force: | 241 | f.write(os.path.basename(patch["file"]) + " -p" + patch["strippath"]+"\n") |
240 | args.append("-f") | 242 | f.close() |
241 | args.append("-dn") | ||
242 | args.append(patch["file"]) | ||
243 | |||
244 | self._runcmd(args) | ||
245 | |||
246 | patch["quiltfile"] = self._quiltpatchpath(patch["file"]) | 243 | patch["quiltfile"] = self._quiltpatchpath(patch["file"]) |
247 | patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"]) | 244 | patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"]) |
248 | 245 | ||