diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-03 22:00:55 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-04 17:05:32 +0000 |
commit | 9d1f10ed012de6976141a29ba483e0b96781fe28 (patch) | |
tree | 9f49f1c01bb2d97aa000aaa50019ad471207450d /meta/classes | |
parent | 3b856e1cdf38705f1ae79df09e7e6f388673a683 (diff) | |
download | poky-9d1f10ed012de6976141a29ba483e0b96781fe28.tar.gz |
patch: Convert to use oe_terminal
Unfortunately we can't access oe_terminal directly from patch.py
so we have to pass in the correct terminal function pointer.
[YOCTO #1587]
(From OE-Core rev: 9e0a21dda24f285a1c4878488e887485a749f3f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/patch.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 762216345a..86046e1ff8 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass | |||
@@ -5,6 +5,8 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" | |||
5 | 5 | ||
6 | PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" | 6 | PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" |
7 | 7 | ||
8 | inherit terminal | ||
9 | |||
8 | python patch_do_patch() { | 10 | python patch_do_patch() { |
9 | import oe.patch | 11 | import oe.patch |
10 | 12 | ||
@@ -124,7 +126,7 @@ python patch_do_patch() { | |||
124 | 126 | ||
125 | if not patchdir in classes: | 127 | if not patchdir in classes: |
126 | patchset = cls(patchdir, d) | 128 | patchset = cls(patchdir, d) |
127 | resolver = rcls(patchset) | 129 | resolver = rcls(patchset, oe_terminal) |
128 | classes[patchdir] = (patchset, resolver) | 130 | classes[patchdir] = (patchset, resolver) |
129 | patchset.Clean() | 131 | patchset.Clean() |
130 | else: | 132 | else: |