Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jailhouse-imx: upgrade to 6.1.36-2.1.0 #1709

Closed
wants to merge 4 commits into from

Conversation

MrCry0
Copy link
Contributor

@MrCry0 MrCry0 commented Dec 18, 2023

This closes the task in #1655

Tested building for imx8mm-lpddr4-evk, imx8mq-lpddr4-wevk, imx8ulp-lpddr4-evk.

@MrCry0 MrCry0 requested review from otavio and a team December 18, 2023 14:34
Copy link
Member

@angolini angolini left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for me it's LGTM, there is only one thing that I personally don't understand. It's "jailhouse-imx: utilise installed to native sysroot files by -dev" commit log. Maybe some rewording.

Copy link
Contributor

@kraj kraj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if you add

inherit python3targetconfig

to this recipe ?

@@ -91,6 +91,7 @@ PACKAGE_BEFORE_PN = "pyjailhouse"
FILES:${PN} += "${nonarch_base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR}"
# Remove libdir/* appended by setuptools3-base.bbclass for module split to work correctly
FILES:${PN}:remove = "${libdir}/*"
FILES:${PN}-dev += "${RECIPE_SYSROOT_NATIVE}${PYTHON_SITEPACKAGES_DIR}/*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inherit python3targetconfig might help

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

inherit python3targetconfig might help

@kraj Thanks a lot, I'll try it tomorrow morning :)

Copy link
Contributor Author

@MrCry0 MrCry0 Dec 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kraj Unfortunately, it doesn't help. I'm getting the same error as without this inheritance.

ERROR: jailhouse-imx-git-r0 do_package: QA Issue: jailhouse-imx: Files/directories were installed but not shipped in any package:
  /home
  /home/cryo
  /home/cryo/work
  /home/cryo/work/freescale
  /home/cryo/work/freescale/build-fslc-framebuffer
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/direct_url.json
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/COPYING
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/WHEEL
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/top_level.txt
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/RECORD
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/METADATA
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/INSTALLER
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse-0.12.dist-info/REQUESTED
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/extendedenum.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/config_parser.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/pci_defs.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/cell.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__init__.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/sysfs_parser.py
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/sysfs_parser.cpython-311.pyc
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/cell.cpython-311.pyc
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/config_parser.cpython-311.pyc
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/__init__.cpython-311.pyc
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/extendedenum.cpython-311.pyc
  /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__pycache__/pci_defs.cpython-311.pyc
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
jailhouse-imx: 38 installed and not shipped files. [installed-vs-shipped]
ERROR: jailhouse-imx-git-r0 do_package: Fatal QA errors were found, failing task.
ERROR: Logfile of failure stored in: /home/cryo/work/freescale/build-fslc-framebuffer/tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/temp/log.do_package.9768
ERROR: Task (/home/cryo/work/freescale/sources/meta-freescale/recipes-extended/jailhouse/jailhouse-imx_git.bb:do_package) failed with exit code '1'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kraj @otavio We see a similar issue in our project LmP with the latest oe.
Trying to find out the root cause may take a lot of time, so I'd suggest using the hack for now and scheduling an investigation after NY.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

packaging native sysroot elements seems quite wrong to me. What happens if you do not package them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MrCry0, have you made any progress on this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@otavio I haven't found another solution and will be unavailable for 5-6 weeks.
@quaresmajose said he may have time to find a more generic solution or fix it on the OE level.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1738 should fix this issue so the line below can be removed

FILES:${PN}-dev += "${RECIPE_SYSROOT_NATIVE}${PYTHON_SITEPACKAGES_DIR}/*"

@otavio otavio mentioned this pull request Dec 18, 2023
11 tasks
@MrCry0 MrCry0 marked this pull request as draft December 18, 2023 21:48
@MrCry0 MrCry0 force-pushed the master-6.1.36.-jail branch from 434f7d1 to 8b04b2a Compare December 19, 2023 10:26
@MrCry0
Copy link
Contributor Author

MrCry0 commented Dec 19, 2023

for me it's LGTM, there is only one thing that I personally don't understand. It's "jailhouse-imx: utilise installed to native sysroot files by -dev" commit log. Maybe some rewording.

@angolini I've rewritten the commit message. Is it better now?

Maybe something shorter? I don't know if I understand properly to give a good suggestion:

jailhouse-imx: Use native-sysroot files instead by to fix -dev

@MrCry0 MrCry0 marked this pull request as ready for review December 19, 2023 10:30
@MrCry0
Copy link
Contributor Author

MrCry0 commented Dec 19, 2023

@angolini Maybe something shorter? I don't know if I understand properly to give a good suggestion:

jailhouse-imx: Use native-sysroot files instead by to fix -dev

We don't need the -dev package for this recipe et al. But there are files installed in native sysroot which is used after the install stage, so we cannot just remove them in do_install. So I added -dev package and packed there these files to avoid yocto building errors.

@otavio
Copy link
Member

otavio commented Dec 19, 2023

The install stage couldn't be fixed? Is there a pointer for it?

@MrCry0
Copy link
Contributor Author

MrCry0 commented Dec 19, 2023

The install stage couldn't be fixed? Is there a pointer for it?

I tried that way and removed these files in the install stage, but there are scripts used later so we've got another error.

If the proposed workaround is unacceptable, I could try to dedicate more time to finding another solution.

@quaresmajose
Copy link
Member

I believe this was some side effect from oe-core because I can reproduce the issue or another one very similar without this PR using oe-core master.
I will take another look tomorrow to try to understand what's going on.

MrCry0 added 4 commits January 2, 2024 18:08
Install the python jailhouse lib for testing purpose.

Signed-off-by: Oleksandr Suvorov <[email protected]>
Make recipe aligned with NXP way and use a configurable variable
for a project repo.

Signed-off-by: Oleksandr Suvorov <[email protected]>
Upgrade the jailhouse to the version used in NXP BSP LF6.1.36-2.1.0.

Relevant changes:
- d3484c68 MLK-26114 solve the problem that .NOTINTERMEDIATE and .SECONDARY are mutually exclusive
- bcce5bc4 LF-9101 solve the problem that Jailhouse cannot be compiled

Signed-off-by: Oleksandr Suvorov <[email protected]>
…s with -dev package

Due to an uninvestigated bug in OE, there are some files installed to
recipe's native sysroot during the regular installation process.
Utilize them with a development package as a workaround to fix the
build error [1].

TODO: The root cause of the issue should be investigated and fixed.

[1]
ERROR: jailhouse-imx-git-r0 do_package: QA Issue: jailhouse-imx: Files/directories were installed but not shipped in any package:
...
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/extendedenum.py
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/config_parser.py
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/pci_defs.py
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/cell.py
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/__init__.py
  .../jailhouse-imx/git/recipe-sysroot-native/usr/lib/python3.11/site-packages/pyjailhouse/sysfs_parser.py
...
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.
jailhouse-imx: 38 installed and not shipped files. [installed-vs-shipped]
ERROR: jailhouse-imx-git-r0 do_package: Fatal QA errors were found, failing task.
ERROR: Logfile of failure stored in: tmp/work/imx8mq_lpddr4_wevk-fslc-linux/jailhouse-imx/git/temp/log.do_package.9768
ERROR: Task (recipes-extended/jailhouse/jailhouse-imx_git.bb:do_package) failed with exit code '1'

Signed-off-by: Oleksandr Suvorov <[email protected]>
@otavio
Copy link
Member

otavio commented Jan 25, 2024

A rebase is needed, right?

@quaresmajose
Copy link
Member

A rebase is needed, right?

yup, I can take this PR and create another one

@quaresmajose
Copy link
Member

Done #1739

@angolini angolini closed this Jan 25, 2024
@MrCry0 MrCry0 deleted the master-6.1.36.-jail branch February 17, 2024 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants