]> 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>
Sun, 7 Jan 2018 17:06:35 +0000 (17:06 +0000)
commitadb5234ac9c96f29336397552176ab5086772069
tree5bf6b1ad1739b734dec62082802770eb6ef3eefc
parent113de7ab1e61997147b4b292b7de162d44296d59
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.

(From OE-Core rev: db7d2cc5a4df3c2077ba874c7ae395c73fd9ed13)

(From OE-Core rev: 7c0e3c5fa39e7ed3eedee8bac206476f70d1f422)

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