diff options
author | Ross Burton <ross.burton@intel.com> | 2016-06-13 20:05:54 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 18:11:10 +0100 |
commit | 792fd3888592e780b0d64524b1be5c033ba356ae (patch) | |
tree | 995823185334845abbf43c3dddb930c0a2c6919b /meta/classes | |
parent | 70d63061f38795e05a1a78d40ed56d73236d4344 (diff) | |
download | poky-792fd3888592e780b0d64524b1be5c033ba356ae.tar.gz |
package_ipk: restore cwd after packaging
opkg-build needs to be executed in the root of the package, so save and restore
the current directory so this task doesn't modify the state.
(From OE-Core rev: 43dac97f397143abf61fc1c105ea0e4f2fffb90b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 08f7020a9e..1b5f4f59e3 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -21,6 +21,8 @@ python do_package_ipk () { | |||
21 | import textwrap | 21 | import textwrap |
22 | import subprocess | 22 | import subprocess |
23 | 23 | ||
24 | oldcwd = os.getcwd() | ||
25 | |||
24 | workdir = d.getVar('WORKDIR', True) | 26 | workdir = d.getVar('WORKDIR', True) |
25 | outdir = d.getVar('PKGWRITEDIRIPK', True) | 27 | outdir = d.getVar('PKGWRITEDIRIPK', True) |
26 | tmpdir = d.getVar('TMPDIR', True) | 28 | tmpdir = d.getVar('TMPDIR', True) |
@@ -254,6 +256,7 @@ python do_package_ipk () { | |||
254 | cleanupcontrol(root) | 256 | cleanupcontrol(root) |
255 | bb.utils.unlockfile(lf) | 257 | bb.utils.unlockfile(lf) |
256 | 258 | ||
259 | os.chdir(oldcwd) | ||
257 | } | 260 | } |
258 | # Otherwise allarch packages may change depending on override configuration | 261 | # Otherwise allarch packages may change depending on override configuration |
259 | do_package_ipk[vardepsexclude] = "OVERRIDES" | 262 | do_package_ipk[vardepsexclude] = "OVERRIDES" |