1
0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-06-08 03:40:52 +00:00

recipes-ti: jailhouse: Update jailhouse for scarthgap

- Update SRCREV for jailhouse which incorporates makefile changes for
scarthgap.
- To handle ${ARAGO_IMAGE_SUFFIX}, add * wherever JH_RAMFS_IMAGE is used in
do_install (install or copy) so to pick correct inmate image for RT build.
- Skip QA checks for usrmerge and buildpath. This is required to package
jailhouse in image.
- Update FILES:${PN}.

Signed-off-by: Paresh Bhagat <p-bhagat@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Paresh Bhagat
2024-07-11 15:31:14 +05:30
committed by Ryan Eatmon
parent 5d4466fdfc
commit 334bce475f
2 changed files with 10 additions and 12 deletions
@@ -51,11 +51,11 @@ do_install() {
install -d ${D}/boot
if [ -n "${JH_RAMFS_IMAGE}" ]
then
if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ]
then
install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ${D}/boot
else
bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio)!"
bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
fi
fi
@@ -68,7 +68,7 @@ do_install() {
./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \
-a ${JH_ARCH} -c "${JH_CMDLINE}" \
-d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \
-i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \
-i ${D}/boot/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio \
${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
${DEPLOY_DIR_IMAGE}/Image \
| tr -cd '\11\12\15\40-\176' \
@@ -96,7 +96,8 @@ RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell"
RRECOMMENDS:${PN} = "${PN}-tools"
INSANE_SKIP:${PN} = "ldflags"
INSANE_SKIP:${PN} = "ldflags usrmerge"
INSANE_SKIP:${PN}-dbg = "usrmerge buildpaths"
KERNEL_MODULE_AUTOLOAD += "jailhouse"
@@ -117,10 +118,7 @@ python __anonymous () {
}
FILES:${PN} = " \
/boot/* \
/usr/libexec \
/usr/sbin/* \
/usr/libexec/* \
/usr/share/* \
/lib/firmware/* \
/boot \
/usr \
/lib \
"
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \
COMPATIBLE_MACHINE = "am62xx|am62pxx"
TARGET_CC_ARCH += "${LDFLAGS}"
PV = "0.12+git"
SRCREV = "603819ef9a771a3c253a141220daab8e61751a43"
SRCREV = "9b494ddf4bd8845a2c1063352d08a274ef61777b"
BRANCH = "master"
SRC_URI = " \
git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \