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.

Sign up for GitHub

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
Closed

jailhouse-imx: upgrade to 6.1.36-2.1.0 #1709

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93210f1
jailhouse-imx: Add pyjailhouse to RDEPENDS
MrCry0 Dec 15, 2023
0ff4e82
jailhouse-imx: make repo URL configurable
MrCry0 Dec 17, 2023
1073142
jailhouse-imx: Upgrade to 6.1.36-2.1.0
MrCry0 Dec 17, 2023
04590d6
[hack] jailhouse-imx: utilize installed to native sysroot orphan file…
MrCry0 Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions recipes-extended/jailhouse/jailhouse-imx_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
PROVIDES = "jailhouse"
RPROVIDES:${PN} += "jailhouse"

SRCBRANCH = "lf-6.1.22_2.0.0"
SRCREV = "e090abc70bb395f705f85659ad92bdafbe407628"
SRCBRANCH = "lf-6.1.36_2.1.0"
SRCREV = "d3484c68313c2c837eb213ca1aa373e491fbc55f"

SRC_URI = "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https;branch=${SRCBRANCH}"
IMX_JAILHOUSE_SRC ?= "git://github.com/nxp-imx/imx-jailhouse.git;protocol=https"
SRC_URI = "${IMX_JAILHOUSE_SRC};branch=${SRCBRANCH}"

DEPENDS = " \
make-native \
Expand Down Expand Up @@ -90,9 +91,11 @@ 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 •
edited
Loading

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}/*"

FILES:pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"

RDEPENDS:${PN} += " \
pyjailhouse \
python3-curses \
python3-datetime \
python3-mmap \
Expand Down