From 1fbcd2ca178db28747046b5bd943c81176db9f65 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 3 Aug 2010 18:18:03 +0100 Subject: 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 --- meta/lib/oe/patch.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'meta/lib/oe/patch.py') 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 @@ +import oe.path + class NotFoundError(Exception): def __init__(self, path): self.path = path @@ -234,15 +236,10 @@ class QuiltTree(PatchSet): if not self.initialized: self.InitFromDir() PatchSet.Import(self, patch, force) - - args = ["import", "-p", patch["strippath"]] - if force: - args.append("-f") - args.append("-dn") - args.append(patch["file"]) - - self._runcmd(args) - + oe.path.symlink(patch["file"], self._quiltpatchpath(patch["file"])) + f = open(os.path.join(self.dir, "patches","series"), "a"); + f.write(os.path.basename(patch["file"]) + " -p" + patch["strippath"]+"\n") + f.close() patch["quiltfile"] = self._quiltpatchpath(patch["file"]) patch["quiltfilemd5"] = bb.utils.md5_file(patch["quiltfile"]) -- cgit 1.2.3-korg