]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
testsdk: Avoid PATH contamination
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 17 Feb 2024 17:07:26 +0000 (17:07 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 18 Feb 2024 07:32:47 +0000 (07:32 +0000)
The autobuilder has been seeing increasing numbers of testsdk failures
where xz was 'missing':

ERROR: core-image-sato-1.0-r0 do_testsdk: Couldn't install the SDK:
Error: xz is required for installation of this SDK, please install it first

This is probably due to xz and it's libraries not being in the sysroots
in a way which works without races.

Since the SDK should be using the host, fix this. The eSDK already does
this to solve a similar problem so copy the code from there.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/sdk/testsdk.py

index 35e40187bc428d888683057af1b76b113cc9ff4e..b4719110edbce8bd7732dbec2213dd2a8f6db3c0 100644 (file)
@@ -79,6 +79,9 @@ class TestSDK(TestSDKBase):
         # sdk use network for download projects for build
         export_proxies(d)
 
+        # We need the original PATH for testing the eSDK, not with our manipulations
+        os.environ['PATH'] = d.getVar("BB_ORIGENV", False).getVar("PATH")
+
         tcname = self.get_tcname(d)
 
         if not os.path.exists(tcname):