diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-10-09 14:58:12 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-10 13:37:56 +0100 |
commit | a5ab8d428f4f7500ce00ce68f042d366da25a92b (patch) | |
tree | 41aabc80cfa7429289ec3e468f5e3fbd24a610c2 | |
parent | ebaa3e3f5140d99ae1d42a69021edda0b6f379e1 (diff) | |
download | poky-a5ab8d428f4f7500ce00ce68f042d366da25a92b.tar.gz |
base.bbclass: use os.path.normpath instead of just comparing WORKDIR and S as strings
* cannot use os.path.samefile, because S/B might not exist at this time yet
* there is issue with PSEUDO_IGNORE_PATHS when some recipe sets e.g.
S = "${WORKDIR}/"
whole WORKDIR gets added to PSEUDO_IGNORE_PATHS and then the build
can fail with various strange errors, in my case do_package was
failing when do_package calls:
fix_perms(.../1.0-r0/package/etc, 755, 0, 0, /etc)
and fails with "[Errno 1] Operation not permitted:"
(From OE-Core rev: 50b11a61ab29acb8ec990668353e0b7305114628)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 6309d709b8..62e34d0079 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -388,9 +388,9 @@ python () { | |||
388 | oe.utils.features_backfill("DISTRO_FEATURES", d) | 388 | oe.utils.features_backfill("DISTRO_FEATURES", d) |
389 | oe.utils.features_backfill("MACHINE_FEATURES", d) | 389 | oe.utils.features_backfill("MACHINE_FEATURES", d) |
390 | 390 | ||
391 | if d.getVar("WORKDIR") != d.getVar("S"): | 391 | if os.path.normpath(d.getVar("WORKDIR")) != os.path.normpath(d.getVar("S")): |
392 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${S}") | 392 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${S}") |
393 | if d.getVar("WORKDIR") != d.getVar("B"): | 393 | if os.path.normpath(d.getVar("WORKDIR")) != os.path.normpath(d.getVar("B")): |
394 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${B}") | 394 | d.appendVar("PSEUDO_IGNORE_PATHS", ",${B}") |
395 | 395 | ||
396 | # Handle PACKAGECONFIG | 396 | # Handle PACKAGECONFIG |