diff options
author | Yoann Congal <yoann.congal@smile.fr> | 2025-10-03 23:12:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-10-06 17:01:10 +0100 |
commit | 085f68bfe918900c6f1c3cd8330941274e7c8142 (patch) | |
tree | 4b2150229059c84049b83f4e01ecf2678b3a4f06 /meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch | |
parent | 0a7f3adf590bd8b1699d6d7529722f2e18918a6c (diff) | |
download | poky-085f68bfe918900c6f1c3cd8330941274e7c8142.tar.gz |
oeqa/selftest/wic: fix PATH for wic.Wic2.test_extra_partition_plugin
Without importing PATH from the wic-tools recipes, the build host PATH
is used and this test may fail depending on tools (parted, dumpe2fs,
...) availability. This triggers build faillure on AB (e.g. [0])
To fix this, import PATH from wic-tools and ensure the original
environment is restored after.
Since this indent a block of code into a try/finally block, here is the
diff ignoring white spaces change:
diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py
index bff3842305..bc99673d0d 100644
--- a/meta/lib/oeqa/selftest/cases/wic.py
+++ b/meta/lib/oeqa/selftest/cases/wic.py
@@ -1680,0 +1681,4 @@ INITRAMFS_IMAGE = "core-image-initramfs-boot"
+ oldpath = os.environ['PATH']
+ os.environ['PATH'] = get_bb_var("PATH", "wic-tools")
+
+ try:
@@ -1696,0 +1701,3 @@ INITRAMFS_IMAGE = "core-image-initramfs-boot"
+ finally:
+ os.environ['PATH'] = oldpath
+
[0]: https://autobuilder.yoctoproject.org/valkyrie/#/builders/35/builds/2456
(From OE-Core rev: a649cab39cce7a0d1db1bf3d14c59b61da5c9a10)
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python-numpy/files/0001-convert-shebang-from-python-to-python3.patch')
0 files changed, 0 insertions, 0 deletions