]> code.ossystems Code Review - openembedded-core.git/commit
archiver.bbclass: adapt do_unpack_and_patch to RSS
authorMikko Ylinen <mikko.ylinen@linux.intel.com>
Mon, 5 Jun 2017 14:42:51 +0000 (17:42 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 6 Jun 2017 18:49:55 +0000 (19:49 +0100)
commitdb7d2cc5a4df3c2077ba874c7ae395c73fd9ed13
tree9e2044c2737d8362b274222764fdcd720ae91050
parentb561292c4e7b5578172066f82b6518b5bda53f42
archiver.bbclass: adapt do_unpack_and_patch to RSS

do_unpack_and_patch was not correctly run until recently
("archiver.bbclass: various fixes for original+diff mode") but
with the fix applied, the errors we get indicate the function
is not adapted to work with recipe specific sysroots.

do_unpack_and_patch sets WORKDIR to ARCHIVER_WORKDIR which
affects all path settings relative to WORKDIR, inluding the paths
to recipes' sysroots. IOW, when do_unpack and do_patch are run, they
cannot find the necessary native tools and files located in the
sysroot (e.g., quiltrc) because the paths point to ARCHIVER_WORKDIR.

Adapt do_unpack_and_patch to RSS by restoring the original
STAGING_DIR_NATIVE after WORKDIR is changed to ARCHIVER_WORKDIR.

Signed-off-by: Mikko Ylinen <mikko.ylinen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/archiver.bbclass