| Message ID | 20240718134152.38721-1-mikko.rapeli@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4] optee-os: asm debug prefix fixes | expand |
Hi, Is there something in these patches that is not ok for merging? I'm following up the build paths patch with upstream. Cheers, -Mikko
On Tue, Jul 30, 2024 at 12:31:59PM +0300, Mikko Rapeli wrote: > Hi, > > Is there something in these patches that is not ok for merging? Sorry for the delay. Something in CI was breaking and I was trying to isolate it to the individual patches, but the CI I'm running that is publicly available has been having issues (which I think are now resolved) and the internal one has been bogged down with a large number of reviews. v2 that you just sent is now in master-next and hopefully will be happy when I get up tomorrow morning. Thanks, Jon > > I'm following up the build paths patch with upstream. > > Cheers, > > -Mikko >
Hi, On Tue, Jul 30, 2024 at 11:12:12PM -0400, Jon Mason wrote: > On Tue, Jul 30, 2024 at 12:31:59PM +0300, Mikko Rapeli wrote: > > Hi, > > > > Is there something in these patches that is not ok for merging? > > Sorry for the delay. > > Something in CI was breaking and I was trying to isolate it to the > individual patches, but the CI I'm running that is publicly available > has been having issues (which I think are now resolved) and the > internal one has been bogged down with a large number of reviews. > > v2 that you just sent is now in master-next and hopefully will be > happy when I get up tomorrow morning. Ok then these optee changes are likely not causing issues, good to know. I'll wait for the master branch update, can't see master-next changes. Cheers, -Mikko
On Wed, Jul 31, 2024 at 09:35:57AM +0300, Mikko Rapeli wrote: > Hi, > > On Tue, Jul 30, 2024 at 11:12:12PM -0400, Jon Mason wrote: > > On Tue, Jul 30, 2024 at 12:31:59PM +0300, Mikko Rapeli wrote: > > > Hi, > > > > > > Is there something in these patches that is not ok for merging? > > > > Sorry for the delay. > > > > Something in CI was breaking and I was trying to isolate it to the > > individual patches, but the CI I'm running that is publicly available > > has been having issues (which I think are now resolved) and the > > internal one has been bogged down with a large number of reviews. > > > > v2 that you just sent is now in master-next and hopefully will be > > happy when I get up tomorrow morning. > > Ok then these optee changes are likely not causing issues, good to know. > > I'll wait for the master branch update, can't see master-next changes. I only do master-next (and actually all of the '-next' branches) on my personal gitlab. I do this because I'm constantly applying and removing patches from it. You can see it at https://gitlab.com/jonmason00/meta-arm/-/pipelines I do this in an attempt to have our CI being public and to make it easier for people to see when there are issues. Thanks, Jon > > Cheers, > > -Mikko >
Hi, On Wed, Jul 31, 2024 at 08:57:19AM -0400, Jon Mason wrote: > On Wed, Jul 31, 2024 at 09:35:57AM +0300, Mikko Rapeli wrote: > > Hi, > > > > On Tue, Jul 30, 2024 at 11:12:12PM -0400, Jon Mason wrote: > > > On Tue, Jul 30, 2024 at 12:31:59PM +0300, Mikko Rapeli wrote: > > > > Hi, > > > > > > > > Is there something in these patches that is not ok for merging? > > > > > > Sorry for the delay. > > > > > > Something in CI was breaking and I was trying to isolate it to the > > > individual patches, but the CI I'm running that is publicly available > > > has been having issues (which I think are now resolved) and the > > > internal one has been bogged down with a large number of reviews. > > > > > > v2 that you just sent is now in master-next and hopefully will be > > > happy when I get up tomorrow morning. > > > > Ok then these optee changes are likely not causing issues, good to know. > > > > I'll wait for the master branch update, can't see master-next changes. > > I only do master-next (and actually all of the '-next' branches) on my > personal gitlab. I do this because I'm constantly applying and > removing patches from it. You can see it at > https://gitlab.com/jonmason00/meta-arm/-/pipelines > > I do this in an attempt to have our CI being public and to make it > easier for people to see when there are issues. Sadly I see that optee-test/xtest timed out on qemuarm-secureboot https://gitlab.com/jonmason00/meta-arm/-/jobs/7472950337 and buildpaths QA test failing on corstone1000 with musl https://gitlab.com/jonmason00/meta-arm/-/jobs/7472950196 2024-08-01 02:23:30 - ERROR - Command "/builds/jonmason00/meta-arm/work/build$ /builds/jonmason00/meta-arm/work/poky/bitbake/bin/bitbake -c build arm-systemready-firmware" failed --- Error summary --- ERROR: mc:firmware:optee-os-4.2.0-r0 do_package_qa: QA Issue: File /lib/firmware/tee.elf in package optee-os contains reference to TMPDIR [buildpaths] ERROR: mc:firmware:optee-os-4.2.0-r0 do_package_qa: Fatal QA errors were found, failing task. ERROR: Logfile of failure stored in: /builds/jonmason00/meta-arm/work/build/tmp-musl_corstone1000-fvp/work/corstone1000_fvp-oe-linux-musl/optee-os/4.2.0/temp/log.do_package_qa.65026 ERROR: Task (mc:firmware:/builds/jonmason00/meta-arm/work/build/../../meta-arm/recipes-security/optee/optee-os_4.2.0.bb:do_package_qa) failed with exit code '1' 2024-08-01 02:23:30 - ERROR - Command "/builds/jonmason00/meta-arm/work/poky/bitbake/bin/bitbake -c build arm-systemready-firmware" failed with error 1 https://gitlab.com/jonmason00/meta-arm/-/jobs/7472950159 2024-08-01 02:04:59 - ERROR - ERROR: mc:firmware:optee-os-4.2.0-r0 do_package_qa: QA Issue: File /lib/firmware/tee.elf in package optee-os contains reference to TMPDIR [buildpaths] 2024-08-01 02:04:59 - ERROR - ERROR: mc:firmware:optee-os-4.2.0-r0 do_package_qa: Fatal QA errors were found, failing task. 2024-08-01 02:04:59 - ERROR - ERROR: Logfile of failure stored in: /builds/jonmason00/meta-arm/work/build/tmp-musl_corstone1000-fvp/work/corstone1000_fvp-oe-linux-musl/optee-os/4.2.0/temp/log.do_package_qa.111505 I'll try to reproduce these and fix them. Sorry for not testing these beforehand. I was only testing with: $ kas build ci/qemuarm64-secureboot.yml:ci/testimage.yml and that clearly is not enough for all variants. Cheers, -Mikko
diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index e9f252e3..d5a12642 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -24,6 +24,7 @@ EXTRA_OEMAKE += " \ CFG_${OPTEE_CORE}_core=y \ CROSS_COMPILE_core=${HOST_PREFIX} \ CROSS_COMPILE_ta_${OPTEE_ARCH}=${HOST_PREFIX} \ + AFLAGS="${CFLAGS}" \ ta-targets=ta_${OPTEE_ARCH} \ O=${B} \ "
The .S files compiled by optee-os were including absolute path of the recipe git tree. Fix this by applying CFLAGS with correct debug prefix maps to AFLAGS used by optee makefiles. Fixes optee-os and optee-os-tadevkit buildpaths QA errors. Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> --- meta-arm/recipes-security/optee/optee-os.inc | 1 + 1 file changed, 1 insertion(+)