* [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2
@ 2019-08-20 18:11 Jacob Stiffler
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
` (2 more replies)
0 siblings, 3 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-20 18:11 UTC (permalink / raw)
To: meta-ti; +Cc: lokeshvutla
* extend to am65xx family
* and correct am65xx cell and inmate filenames.
* remove earlycon bootargs for am65xx
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
v2 changes:
* Remove earlycon args for all k3
recipes-kernel/jailhouse/jailhouse_git.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
index 5e2c71b..d637d51 100644
--- a/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \
"
PV = "0.10+git${SRCPV}"
-SRCREV = "e71fd2dc7e8494a44cc3c762a24824532a412807"
+SRCREV = "96329f098e655cd42d7d0dbb3cd2cc7c3492d633"
BRANCH = "ti-jailhouse-0.10"
SRC_URI = " \
@@ -47,19 +47,19 @@ JH_CELL_FILES ?= "*.cell"
JH_CELL_FILES_k3 ?= "k3-*.cell"
JH_INMATE_DTB ?= ""
-JH_INMATE_DTB_am65xx-evm ?= "inmate-k3-am654.dtb"
+JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb"
JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb"
JH_LINUX_DEMO_CELL ?= ""
-JH_LINUX_DEMO_CELL_am65xx-evm ?= "k3-am654-linux-demo.cell"
+JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell"
JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell"
JH_SYSCONFIG_CELL ?= ""
-JH_SYSCONFIG_CELL_am65xx-evm ?= "k3-am654.cell"
+JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
JH_CMDLINE ?= ""
-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x2810000"
+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
do_configure() {
if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-20 18:11 [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Jacob Stiffler
@ 2019-08-20 18:11 ` Jacob Stiffler
2019-08-29 8:41 ` Nikhil Devshatwar
2019-08-30 16:03 ` Denys Dmytriyenko
2019-08-20 18:11 ` [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo Jacob Stiffler
2019-08-30 15:57 ` [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Denys Dmytriyenko
2 siblings, 2 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-20 18:11 UTC (permalink / raw)
To: meta-ti; +Cc: lokeshvutla
Create a package containing the jailhouse tools which are used to work
with the cells and inmates. This recipe provides a good example for
using the jailhouse-cell-linux tool.
The tools require the pyjailhouse python modules, so package them as
well.
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
index d637d51..5d572d0 100644
--- a/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
S = "${WORKDIR}/git"
require jailhouse-arch.inc
-inherit module pythonnative bash-completion deploy
+inherit module pythonnative bash-completion deploy setuptools
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ti-soc)"
@@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
TOOLS_SRC_DIR = "${S}/tools"
TOOLS_OBJ_DIR = "${S}/tools"
+EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
+
+
do_compile() {
- oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
+ oe_runmake V=1
}
do_install() {
- oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
+ # Install pyjailhouse python modules needed by the tools
+ distutils_do_install
+
+ # We want to install the python tools, but we do not want to use pip...
+ # At least with v0.10, we can work around this with
+ # 'PIP=":" PYTHON_PIP_USEABLE=yes'
+ oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
install -d ${D}${CELL_DIR}
install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
@@ -115,8 +124,15 @@ do_install() {
fi
}
-PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
+PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
+FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
+
+RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
+RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
+
+RRECCOMMENDS_${PN} = "${PN}-tools"
INSANE_SKIP_${PN} = "ldflags"
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-20 18:11 [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Jacob Stiffler
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
@ 2019-08-20 18:11 ` Jacob Stiffler
2019-08-29 8:51 ` Nikhil Devshatwar
2019-08-30 16:13 ` Denys Dmytriyenko
2019-08-30 15:57 ` [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Denys Dmytriyenko
2 siblings, 2 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-20 18:11 UTC (permalink / raw)
To: meta-ti; +Cc: lokeshvutla
* Configure the linux-demo to use a ramfs for the linux inmate.
* Using JH_RAMFS_IMAGE, this can be set in some global conf.
Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
index 5d572d0..ba6772f 100644
--- a/recipes-kernel/jailhouse/jailhouse_git.bb
+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
@@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
+JH_RAMFS_IMAGE ?= "core-image-minimal"
+
JH_CMDLINE ?= ""
-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
do_configure() {
if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
@@ -101,6 +103,16 @@ do_install() {
install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
install -d ${D}/boot
+ if [ -n "${JH_RAMFS_IMAGE}" ]
+ then
+ if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
+ then
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
+ else
+ bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
+ bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
+ fi
+ fi
if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
cd ${TOOLS_SRC_DIR}
@@ -110,6 +122,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 \
${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
${DEPLOY_DIR_IMAGE}/Image \
| tr -cd '\11\12\15\40-\176' \
@@ -143,9 +156,9 @@ CELLS = ""
python __anonymous () {
d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
- initrd = d.getVar('INITRAMFS_IMAGE', True)
- if initrd:
- d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
+ ramfs = d.getVar('JH_RAMFS_IMAGE', True)
+ if ramfs:
+ d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
# Setup DEPENDS and RDEPENDS to included cells
cells = d.getVar('CELLS', True) or ""
--
2.7.4
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
@ 2019-08-29 8:41 ` Nikhil Devshatwar
2019-08-30 16:05 ` Denys Dmytriyenko
2019-08-30 16:03 ` Denys Dmytriyenko
1 sibling, 1 reply; 21+ messages in thread
From: Nikhil Devshatwar @ 2019-08-29 8:41 UTC (permalink / raw)
To: Jacob Stiffler, meta-ti; +Cc: lokeshvutla
On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> Create a package containing the jailhouse tools which are used to work
> with the cells and inmates. This recipe provides a good example for
> using the jailhouse-cell-linux tool.
>
> The tools require the pyjailhouse python modules, so package them as
> well.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
I had to specifically install the pyjailhouse IPK for pyjailhouse.
You can add this in the meta-arago packagegroup recipe
Nikhil D
> ---
> recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index d637d51..5d572d0 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
> S = "${WORKDIR}/git"
>
> require jailhouse-arch.inc
> -inherit module pythonnative bash-completion deploy
> +inherit module pythonnative bash-completion deploy setuptools
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> COMPATIBLE_MACHINE = "(ti-soc)"
> @@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
> TOOLS_SRC_DIR = "${S}/tools"
> TOOLS_OBJ_DIR = "${S}/tools"
>
> +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
> +
> +
> do_compile() {
> - oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
> + oe_runmake V=1
> }
>
> do_install() {
> - oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
> + # Install pyjailhouse python modules needed by the tools
> + distutils_do_install
> +
> + # We want to install the python tools, but we do not want to use pip...
> + # At least with v0.10, we can work around this with
> + # 'PIP=":" PYTHON_PIP_USEABLE=yes'
> + oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
>
> install -d ${D}${CELL_DIR}
> install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
> @@ -115,8 +124,15 @@ do_install() {
> fi
> }
>
> -PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
> +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
> FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
> +FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
> +FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
> +
> +RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
> +RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
> +
> +RRECCOMMENDS_${PN} = "${PN}-tools"
>
> INSANE_SKIP_${PN} = "ldflags"
>
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-20 18:11 ` [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo Jacob Stiffler
@ 2019-08-29 8:51 ` Nikhil Devshatwar
2019-08-30 16:23 ` Denys Dmytriyenko
2019-08-30 16:13 ` Denys Dmytriyenko
1 sibling, 1 reply; 21+ messages in thread
From: Nikhil Devshatwar @ 2019-08-29 8:51 UTC (permalink / raw)
To: Jacob Stiffler, meta-ti; +Cc: lokeshvutla
On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> * Configure the linux-demo to use a ramfs for the linux inmate.
> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
I manually built the core-image-minimal in cpio format with a bbappend of my own.
How is this supposed to be built automatically?
Can you add a depends variable so that the build kicks automatically?
Nikhil D
> ---
> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index 5d572d0..ba6772f 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>
> +JH_RAMFS_IMAGE ?= "core-image-minimal"
> +
> JH_CMDLINE ?= ""
> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>
> do_configure() {
> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> @@ -101,6 +103,16 @@ do_install() {
> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>
> install -d ${D}/boot
> + if [ -n "${JH_RAMFS_IMAGE}" ]
> + then
> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> + then
> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> + else
> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> + fi
> + fi
>
> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> cd ${TOOLS_SRC_DIR}
> @@ -110,6 +122,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 \
> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> ${DEPLOY_DIR_IMAGE}/Image \
> | tr -cd '\11\12\15\40-\176' \
> @@ -143,9 +156,9 @@ CELLS = ""
>
> python __anonymous () {
> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> - initrd = d.getVar('INITRAMFS_IMAGE', True)
> - if initrd:
> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> + if ramfs:
> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>
> # Setup DEPENDS and RDEPENDS to included cells
> cells = d.getVar('CELLS', True) or ""
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2
2019-08-20 18:11 [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Jacob Stiffler
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
2019-08-20 18:11 ` [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo Jacob Stiffler
@ 2019-08-30 15:57 ` Denys Dmytriyenko
2 siblings, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 15:57 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla
This won't apply, as v1 was already merged prior to v2:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?h=thud&id=ee2665f793d3280b67e82bc4fba4b538a9647912
Moreover, can you update to ti2019.03-rc4 tag - there were several commits
since rc2:
http://git.ti.com/gitweb/?p=jailhouse/ti-jailhouse.git;a=shortlog;h=refs/heads/ti-jailhouse-0.10
Thanks.
Denys
On Tue, Aug 20, 2019 at 02:11:10PM -0400, Jacob Stiffler wrote:
> * extend to am65xx family
> * and correct am65xx cell and inmate filenames.
> * remove earlycon bootargs for am65xx
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> v2 changes:
> * Remove earlycon args for all k3
>
> recipes-kernel/jailhouse/jailhouse_git.bb | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index 5e2c71b..d637d51 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = " \
> "
>
> PV = "0.10+git${SRCPV}"
> -SRCREV = "e71fd2dc7e8494a44cc3c762a24824532a412807"
> +SRCREV = "96329f098e655cd42d7d0dbb3cd2cc7c3492d633"
> BRANCH = "ti-jailhouse-0.10"
>
> SRC_URI = " \
> @@ -47,19 +47,19 @@ JH_CELL_FILES ?= "*.cell"
> JH_CELL_FILES_k3 ?= "k3-*.cell"
>
> JH_INMATE_DTB ?= ""
> -JH_INMATE_DTB_am65xx-evm ?= "inmate-k3-am654.dtb"
> +JH_INMATE_DTB_am65xx ?= "inmate-k3-am654-idk.dtb"
> JH_INMATE_DTB_j7-evm ?= "inmate-k3-j721e-evm.dtb"
>
> JH_LINUX_DEMO_CELL ?= ""
> -JH_LINUX_DEMO_CELL_am65xx-evm ?= "k3-am654-linux-demo.cell"
> +JH_LINUX_DEMO_CELL_am65xx ?= "k3-am654-idk-linux-demo.cell"
> JH_LINUX_DEMO_CELL_j7-evm ?= "k3-j721e-evm-linux-demo.cell"
>
> JH_SYSCONFIG_CELL ?= ""
> -JH_SYSCONFIG_CELL_am65xx-evm ?= "k3-am654.cell"
> +JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>
> JH_CMDLINE ?= ""
> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait earlycon=ns16550a,mmio32,0x2810000"
> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>
> do_configure() {
> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
2019-08-29 8:41 ` Nikhil Devshatwar
@ 2019-08-30 16:03 ` Denys Dmytriyenko
2019-08-30 16:10 ` Jacob Stiffler
1 sibling, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:03 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla
On Tue, Aug 20, 2019 at 02:11:11PM -0400, Jacob Stiffler wrote:
> Create a package containing the jailhouse tools which are used to work
> with the cells and inmates. This recipe provides a good example for
Should it be s/recipe/package/ here ^^^?
> using the jailhouse-cell-linux tool.
>
> The tools require the pyjailhouse python modules, so package them as
> well.
Any specific reason to package into own "pyjailhouse" package instead of
bundling with ${PN}-tools, as it's the only consumer now?
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
> 1 file changed, 20 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index d637d51..5d572d0 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
> S = "${WORKDIR}/git"
>
> require jailhouse-arch.inc
> -inherit module pythonnative bash-completion deploy
> +inherit module pythonnative bash-completion deploy setuptools
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> COMPATIBLE_MACHINE = "(ti-soc)"
> @@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
> TOOLS_SRC_DIR = "${S}/tools"
> TOOLS_OBJ_DIR = "${S}/tools"
>
> +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
> +
> +
> do_compile() {
> - oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
> + oe_runmake V=1
> }
>
> do_install() {
> - oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
> + # Install pyjailhouse python modules needed by the tools
> + distutils_do_install
> +
> + # We want to install the python tools, but we do not want to use pip...
> + # At least with v0.10, we can work around this with
> + # 'PIP=":" PYTHON_PIP_USEABLE=yes'
> + oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
>
> install -d ${D}${CELL_DIR}
> install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
> @@ -115,8 +124,15 @@ do_install() {
> fi
> }
>
> -PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
> +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
> FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
> +FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
> +FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
> +
> +RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
> +RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
> +
> +RRECCOMMENDS_${PN} = "${PN}-tools"
>
> INSANE_SKIP_${PN} = "ldflags"
>
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-29 8:41 ` Nikhil Devshatwar
@ 2019-08-30 16:05 ` Denys Dmytriyenko
2019-08-30 16:08 ` Jacob Stiffler
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:05 UTC (permalink / raw)
To: Nikhil Devshatwar; +Cc: meta-ti, lokeshvutla
On Thu, Aug 29, 2019 at 02:11:30PM +0530, Nikhil Devshatwar wrote:
> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> >Create a package containing the jailhouse tools which are used to work
> >with the cells and inmates. This recipe provides a good example for
> >using the jailhouse-cell-linux tool.
> >
> >The tools require the pyjailhouse python modules, so package them as
> >well.
> >
> >Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>
>
> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>
> I had to specifically install the pyjailhouse IPK for pyjailhouse.
> You can add this in the meta-arago packagegroup recipe
Shouldn't be necessary, as jailhouse-tools RDEPENDS on pyjailhouse. So
pyjailhouse should be installed automatically when jailhouse-tools gets
installed.
Denys
> Nikhil D
>
> >---
> > recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
> > 1 file changed, 20 insertions(+), 4 deletions(-)
> >
> >diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >index d637d51..5d572d0 100644
> >--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >@@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
> > S = "${WORKDIR}/git"
> > require jailhouse-arch.inc
> >-inherit module pythonnative bash-completion deploy
> >+inherit module pythonnative bash-completion deploy setuptools
> > PACKAGE_ARCH = "${MACHINE_ARCH}"
> > COMPATIBLE_MACHINE = "(ti-soc)"
> >@@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
> > TOOLS_SRC_DIR = "${S}/tools"
> > TOOLS_OBJ_DIR = "${S}/tools"
> >+EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
> >+
> >+
> > do_compile() {
> >- oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
> >+ oe_runmake V=1
> > }
> > do_install() {
> >- oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
> >+ # Install pyjailhouse python modules needed by the tools
> >+ distutils_do_install
> >+
> >+ # We want to install the python tools, but we do not want to use pip...
> >+ # At least with v0.10, we can work around this with
> >+ # 'PIP=":" PYTHON_PIP_USEABLE=yes'
> >+ oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
> > install -d ${D}${CELL_DIR}
> > install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
> >@@ -115,8 +124,15 @@ do_install() {
> > fi
> > }
> >-PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
> >+PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
> > FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
> >+FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
> >+FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
> >+
> >+RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
> >+RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
> >+
> >+RRECCOMMENDS_${PN} = "${PN}-tools"
> > INSANE_SKIP_${PN} = "ldflags"
> >
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-30 16:05 ` Denys Dmytriyenko
@ 2019-08-30 16:08 ` Jacob Stiffler
0 siblings, 0 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:08 UTC (permalink / raw)
To: Denys Dmytriyenko, Nikhil Devshatwar; +Cc: meta-ti, lokeshvutla
On 8/30/2019 12:05 PM, Denys Dmytriyenko wrote:
> On Thu, Aug 29, 2019 at 02:11:30PM +0530, Nikhil Devshatwar wrote:
>> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
>>> Create a package containing the jailhouse tools which are used to work
>>> with the cells and inmates. This recipe provides a good example for
>>> using the jailhouse-cell-linux tool.
>>>
>>> The tools require the pyjailhouse python modules, so package them as
>>> well.
>>>
>>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>>
>> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>>
>> I had to specifically install the pyjailhouse IPK for pyjailhouse.
>> You can add this in the meta-arago packagegroup recipe
> Shouldn't be necessary, as jailhouse-tools RDEPENDS on pyjailhouse. So
> pyjailhouse should be installed automatically when jailhouse-tools gets
> installed.
Perhaps it was due the the typo below in the RRECEOMMENDS. I fixed that
in v3.
> Denys
>
>
>> Nikhil D
>>
>>> ---
>>> recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
>>> 1 file changed, 20 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>>> index d637d51..5d572d0 100644
>>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>>> @@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
>>> S = "${WORKDIR}/git"
>>> require jailhouse-arch.inc
>>> -inherit module pythonnative bash-completion deploy
>>> +inherit module pythonnative bash-completion deploy setuptools
>>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>>> COMPATIBLE_MACHINE = "(ti-soc)"
>>> @@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
>>> TOOLS_SRC_DIR = "${S}/tools"
>>> TOOLS_OBJ_DIR = "${S}/tools"
>>> +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
>>> +
>>> +
>>> do_compile() {
>>> - oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
>>> + oe_runmake V=1
>>> }
>>> do_install() {
>>> - oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
>>> + # Install pyjailhouse python modules needed by the tools
>>> + distutils_do_install
>>> +
>>> + # We want to install the python tools, but we do not want to use pip...
>>> + # At least with v0.10, we can work around this with
>>> + # 'PIP=":" PYTHON_PIP_USEABLE=yes'
>>> + oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
>>> install -d ${D}${CELL_DIR}
>>> install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
>>> @@ -115,8 +124,15 @@ do_install() {
>>> fi
>>> }
>>> -PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
>>> +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
>>> FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
>>> +FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
>>> +FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
>>> +
>>> +RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
>>> +RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
>>> +
>>> +RRECCOMMENDS_${PN} = "${PN}-tools"
HERE.
>>> INSANE_SKIP_${PN} = "ldflags"
>>>
>> --
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-30 16:03 ` Denys Dmytriyenko
@ 2019-08-30 16:10 ` Jacob Stiffler
2019-08-30 16:16 ` Denys Dmytriyenko
0 siblings, 1 reply; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:10 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, lokeshvutla
On 8/30/2019 12:03 PM, Denys Dmytriyenko wrote:
> On Tue, Aug 20, 2019 at 02:11:11PM -0400, Jacob Stiffler wrote:
>> Create a package containing the jailhouse tools which are used to work
>> with the cells and inmates. This recipe provides a good example for
> Should it be s/recipe/package/ here ^^^?
I did mean recipe as the do_install task show an usage example.
>
>> using the jailhouse-cell-linux tool.
>>
>> The tools require the pyjailhouse python modules, so package them as
>> well.
> Any specific reason to package into own "pyjailhouse" package instead of
> bundling with ${PN}-tools, as it's the only consumer now?
It just seemed logical to me. pyjailhouse appears to be a proper python
module, so I kept it separate.
>
>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>> ---
>> recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
>> 1 file changed, 20 insertions(+), 4 deletions(-)
>>
>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>> index d637d51..5d572d0 100644
>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>> @@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
>> S = "${WORKDIR}/git"
>>
>> require jailhouse-arch.inc
>> -inherit module pythonnative bash-completion deploy
>> +inherit module pythonnative bash-completion deploy setuptools
>>
>> PACKAGE_ARCH = "${MACHINE_ARCH}"
>> COMPATIBLE_MACHINE = "(ti-soc)"
>> @@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
>> TOOLS_SRC_DIR = "${S}/tools"
>> TOOLS_OBJ_DIR = "${S}/tools"
>>
>> +EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
>> +
>> +
>> do_compile() {
>> - oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
>> + oe_runmake V=1
>> }
>>
>> do_install() {
>> - oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
>> + # Install pyjailhouse python modules needed by the tools
>> + distutils_do_install
>> +
>> + # We want to install the python tools, but we do not want to use pip...
>> + # At least with v0.10, we can work around this with
>> + # 'PIP=":" PYTHON_PIP_USEABLE=yes'
>> + oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
>>
>> install -d ${D}${CELL_DIR}
>> install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
>> @@ -115,8 +124,15 @@ do_install() {
>> fi
>> }
>>
>> -PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
>> +PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
>> FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
>> +FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
>> +FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
>> +
>> +RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
>> +RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
>> +
>> +RRECCOMMENDS_${PN} = "${PN}-tools"
>>
>> INSANE_SKIP_${PN} = "ldflags"
>>
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-20 18:11 ` [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo Jacob Stiffler
2019-08-29 8:51 ` Nikhil Devshatwar
@ 2019-08-30 16:13 ` Denys Dmytriyenko
2019-08-30 16:23 ` Jacob Stiffler
1 sibling, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:13 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla
On Tue, Aug 20, 2019 at 02:11:12PM -0400, Jacob Stiffler wrote:
> * Configure the linux-demo to use a ramfs for the linux inmate.
> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> 1 file changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> index 5d572d0..ba6772f 100644
> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>
> +JH_RAMFS_IMAGE ?= "core-image-minimal"
Ok, after thinking about it a bit, I will agree to JH_RAMFS_IMAGE variable,
but I don't want to loose the default INITRAMFS_IMAGE usage. So, how about
changing the default here to something like this:
JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
That way either of the variables can be set my machine config or local.conf
and the default use is also preserved. Thoughts?
> JH_CMDLINE ?= ""
> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>
> do_configure() {
> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> @@ -101,6 +103,16 @@ do_install() {
> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>
> install -d ${D}/boot
> + if [ -n "${JH_RAMFS_IMAGE}" ]
> + then
> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> + then
> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> + else
> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
Typo in the message. Also, should it be an error instead of a warning?
> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> + fi
> + fi
>
> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> cd ${TOOLS_SRC_DIR}
> @@ -110,6 +122,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 \
> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> ${DEPLOY_DIR_IMAGE}/Image \
> | tr -cd '\11\12\15\40-\176' \
> @@ -143,9 +156,9 @@ CELLS = ""
>
> python __anonymous () {
> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> - initrd = d.getVar('INITRAMFS_IMAGE', True)
> - if initrd:
> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> + if ramfs:
> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>
> # Setup DEPENDS and RDEPENDS to included cells
> cells = d.getVar('CELLS', True) or ""
> --
> 2.7.4
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 2/3] jailhouse: provide tools package
2019-08-30 16:10 ` Jacob Stiffler
@ 2019-08-30 16:16 ` Denys Dmytriyenko
0 siblings, 0 replies; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:16 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla
On Fri, Aug 30, 2019 at 12:10:53PM -0400, Jacob Stiffler wrote:
>
> On 8/30/2019 12:03 PM, Denys Dmytriyenko wrote:
> >On Tue, Aug 20, 2019 at 02:11:11PM -0400, Jacob Stiffler wrote:
> >>Create a package containing the jailhouse tools which are used to work
> >>with the cells and inmates. This recipe provides a good example for
> >Should it be s/recipe/package/ here ^^^?
>
>
> I did mean recipe as the do_install task show an usage example.
Ah, Ok, now I see what you mean.
> >>using the jailhouse-cell-linux tool.
> >>
> >>The tools require the pyjailhouse python modules, so package them as
> >>well.
> >Any specific reason to package into own "pyjailhouse" package instead of
> >bundling with ${PN}-tools, as it's the only consumer now?
>
>
> It just seemed logical to me. pyjailhouse appears to be a proper python
> module, so I kept it separate.
Thanks.
> >>Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> >>---
> >> recipes-kernel/jailhouse/jailhouse_git.bb | 24 ++++++++++++++++++++----
> >> 1 file changed, 20 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>index d637d51..5d572d0 100644
> >>--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >>+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>@@ -29,7 +29,7 @@ RDEPENDS_${PN} += "\
> >> S = "${WORKDIR}/git"
> >> require jailhouse-arch.inc
> >>-inherit module pythonnative bash-completion deploy
> >>+inherit module pythonnative bash-completion deploy setuptools
> >> PACKAGE_ARCH = "${MACHINE_ARCH}"
> >> COMPATIBLE_MACHINE = "(ti-soc)"
> >>@@ -78,12 +78,21 @@ USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \
> >> TOOLS_SRC_DIR = "${S}/tools"
> >> TOOLS_OBJ_DIR = "${S}/tools"
> >>+EXTRA_OEMAKE = "ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}"
> >>+
> >>+
> >> do_compile() {
> >>- oe_runmake V=1 ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR}
> >>+ oe_runmake V=1
> >> }
> >> do_install() {
> >>- oe_runmake ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} KDIR=${STAGING_KERNEL_BUILDDIR} DESTDIR=${D} install
> >>+ # Install pyjailhouse python modules needed by the tools
> >>+ distutils_do_install
> >>+
> >>+ # We want to install the python tools, but we do not want to use pip...
> >>+ # At least with v0.10, we can work around this with
> >>+ # 'PIP=":" PYTHON_PIP_USEABLE=yes'
> >>+ oe_runmake PIP=: PYTHON_PIP_USEABLE=yes DESTDIR=${D} install
> >> install -d ${D}${CELL_DIR}
> >> install -m 0644 ${B}/configs/${JH_ARCH}/${JH_CELL_FILES} ${D}${CELL_DIR}/
> >>@@ -115,8 +124,15 @@ do_install() {
> >> fi
> >> }
> >>-PACKAGE_BEFORE_PN = "kernel-module-jailhouse"
> >>+PACKAGE_BEFORE_PN = "kernel-module-jailhouse pyjailhouse ${PN}-tools"
> >> FILES_${PN} = "${base_libdir}/firmware ${libexecdir} ${sbindir} ${JH_DATADIR} /boot"
> >>+FILES_pyjailhouse = "${PYTHON_SITEPACKAGES_DIR}"
> >>+FILES_${PN}-tools = "${libexecdir}/${BPN}/${BPN}-*"
> >>+
> >>+RDEPENDS_${PN}-tools = "pyjailhouse python-mmap python-math python-argparse python-datetime python-curses python-compression"
> >>+RDEPENDS_pyjailhouse = "python-core python-ctypes python-fcntl python-shell"
> >>+
> >>+RRECCOMMENDS_${PN} = "${PN}-tools"
> >> INSANE_SKIP_${PN} = "ldflags"
> >>--
> >>2.7.4
> >>
> >>--
> >>_______________________________________________
> >>meta-ti mailing list
> >>meta-ti@yoctoproject.org
> >>https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:13 ` Denys Dmytriyenko
@ 2019-08-30 16:23 ` Jacob Stiffler
2019-08-30 16:29 ` Denys Dmytriyenko
0 siblings, 1 reply; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:23 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, lokeshvutla
On 8/30/2019 12:13 PM, Denys Dmytriyenko wrote:
> On Tue, Aug 20, 2019 at 02:11:12PM -0400, Jacob Stiffler wrote:
>> * Configure the linux-demo to use a ramfs for the linux inmate.
>> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>>
>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>> ---
>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>
>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>> index 5d572d0..ba6772f 100644
>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>>
>> +JH_RAMFS_IMAGE ?= "core-image-minimal"
> Ok, after thinking about it a bit, I will agree to JH_RAMFS_IMAGE variable,
> but I don't want to loose the default INITRAMFS_IMAGE usage. So, how about
> changing the default here to something like this:
>
> JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
>
> That way either of the variables can be set my machine config or local.conf
> and the default use is also preserved. Thoughts?
I like that idea better as well.
>
>> JH_CMDLINE ?= ""
>> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>>
>> do_configure() {
>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
>> @@ -101,6 +103,16 @@ do_install() {
>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>>
>> install -d ${D}/boot
>> + if [ -n "${JH_RAMFS_IMAGE}" ]
>> + then
>> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
>> + then
>> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
>> + else
>> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> Typo in the message. Also, should it be an error instead of a warning?
I did not want this recipe to force the requirement for an ramfs. But
thinking about it now, making it an error is better in case the
linux-demo is desired. If it is not, then JH_RAMFS_IMAGE can be unset in
some conf.
>
>> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
>> + fi
>> + fi
>>
>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
>> cd ${TOOLS_SRC_DIR}
>> @@ -110,6 +122,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 \
>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
>> ${DEPLOY_DIR_IMAGE}/Image \
>> | tr -cd '\11\12\15\40-\176' \
>> @@ -143,9 +156,9 @@ CELLS = ""
>>
>> python __anonymous () {
>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
>> - initrd = d.getVar('INITRAMFS_IMAGE', True)
>> - if initrd:
>> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
>> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
>> + if ramfs:
>> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>>
>> # Setup DEPENDS and RDEPENDS to included cells
>> cells = d.getVar('CELLS', True) or ""
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-29 8:51 ` Nikhil Devshatwar
@ 2019-08-30 16:23 ` Denys Dmytriyenko
2019-08-30 16:26 ` Jacob Stiffler
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:23 UTC (permalink / raw)
To: Nikhil Devshatwar; +Cc: meta-ti, lokeshvutla
On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> >* Configure the linux-demo to use a ramfs for the linux inmate.
> >* Using JH_RAMFS_IMAGE, this can be set in some global conf.
> >
> >Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>
> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>
> I manually built the core-image-minimal in cpio format with a bbappend of my own.
> How is this supposed to be built automatically?
>
> Can you add a depends variable so that the build kicks automatically?
There's a proper DEPENDS being added in the anonymous function below, so
should work automatically.
Denys
> Nikhil D
>
> >---
> > recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> > 1 file changed, 17 insertions(+), 4 deletions(-)
> >
> >diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >index 5d572d0..ba6772f 100644
> >--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >@@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> > JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> > JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
> >+JH_RAMFS_IMAGE ?= "core-image-minimal"
> >+
> > JH_CMDLINE ?= ""
> >-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> >+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
> > do_configure() {
> > if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> >@@ -101,6 +103,16 @@ do_install() {
> > install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
> > install -d ${D}/boot
> >+ if [ -n "${JH_RAMFS_IMAGE}" ]
> >+ then
> >+ if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> >+ then
> >+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> >+ else
> >+ bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> >+ bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> >+ fi
> >+ fi
> > if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> > cd ${TOOLS_SRC_DIR}
> >@@ -110,6 +122,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 \
> > ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> > ${DEPLOY_DIR_IMAGE}/Image \
> > | tr -cd '\11\12\15\40-\176' \
> >@@ -143,9 +156,9 @@ CELLS = ""
> > python __anonymous () {
> > d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> >- initrd = d.getVar('INITRAMFS_IMAGE', True)
> >- if initrd:
> >- d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> >+ ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> >+ if ramfs:
> >+ d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
> > # Setup DEPENDS and RDEPENDS to included cells
> > cells = d.getVar('CELLS', True) or ""
> >
>
> --
> _______________________________________________
> meta-ti mailing list
> meta-ti@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:23 ` Denys Dmytriyenko
@ 2019-08-30 16:26 ` Jacob Stiffler
2019-08-30 16:31 ` Denys Dmytriyenko
0 siblings, 1 reply; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:26 UTC (permalink / raw)
To: Denys Dmytriyenko, Nikhil Devshatwar; +Cc: meta-ti, lokeshvutla
On 8/30/2019 12:23 PM, Denys Dmytriyenko wrote:
> On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
>> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
>>> * Configure the linux-demo to use a ramfs for the linux inmate.
>>> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>>>
>>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>>
>> I manually built the core-image-minimal in cpio format with a bbappend of my own.
>> How is this supposed to be built automatically?
>>
>> Can you add a depends variable so that the build kicks automatically?
> There's a proper DEPENDS being added in the anonymous function below, so
> should work automatically.
We do not have "cpio" in our IMAGE_TYPES, so it needs to be added for
JH_RAMFS_IMAGE.
I cannot think of a way to force that IMAGE_TYPE from this recipe, but
is there a way?
> Denys
>
>
>> Nikhil D
>>
>>> ---
>>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>>> index 5d572d0..ba6772f 100644
>>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>>> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
>>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
>>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>>> +JH_RAMFS_IMAGE ?= "core-image-minimal"
>>> +
>>> JH_CMDLINE ?= ""
>>> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>>> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>>> do_configure() {
>>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
>>> @@ -101,6 +103,16 @@ do_install() {
>>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>>> install -d ${D}/boot
>>> + if [ -n "${JH_RAMFS_IMAGE}" ]
>>> + then
>>> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
>>> + then
>>> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
>>> + else
>>> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
>>> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
>>> + fi
>>> + fi
>>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
>>> cd ${TOOLS_SRC_DIR}
>>> @@ -110,6 +122,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 \
>>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
>>> ${DEPLOY_DIR_IMAGE}/Image \
>>> | tr -cd '\11\12\15\40-\176' \
>>> @@ -143,9 +156,9 @@ CELLS = ""
>>> python __anonymous () {
>>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
>>> - initrd = d.getVar('INITRAMFS_IMAGE', True)
>>> - if initrd:
>>> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
>>> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
>>> + if ramfs:
>>> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>>> # Setup DEPENDS and RDEPENDS to included cells
>>> cells = d.getVar('CELLS', True) or ""
>>>
>> --
>> _______________________________________________
>> meta-ti mailing list
>> meta-ti@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:23 ` Jacob Stiffler
@ 2019-08-30 16:29 ` Denys Dmytriyenko
2019-08-30 16:30 ` Jacob Stiffler
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:29 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla
On Fri, Aug 30, 2019 at 12:23:43PM -0400, Jacob Stiffler wrote:
>
> On 8/30/2019 12:13 PM, Denys Dmytriyenko wrote:
> >On Tue, Aug 20, 2019 at 02:11:12PM -0400, Jacob Stiffler wrote:
> >>* Configure the linux-demo to use a ramfs for the linux inmate.
> >>* Using JH_RAMFS_IMAGE, this can be set in some global conf.
> >>
> >>Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> >>---
> >> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> >> 1 file changed, 17 insertions(+), 4 deletions(-)
> >>
> >>diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>index 5d572d0..ba6772f 100644
> >>--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >>+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>@@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> >> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> >> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
> >>+JH_RAMFS_IMAGE ?= "core-image-minimal"
> >Ok, after thinking about it a bit, I will agree to JH_RAMFS_IMAGE variable,
> >but I don't want to loose the default INITRAMFS_IMAGE usage. So, how about
> >changing the default here to something like this:
> >
> >JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
> >
> >That way either of the variables can be set my machine config or local.conf
> >and the default use is also preserved. Thoughts?
>
>
> I like that idea better as well.
>
>
> >
> >> JH_CMDLINE ?= ""
> >>-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> >>+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
> >> do_configure() {
> >> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> >>@@ -101,6 +103,16 @@ do_install() {
> >> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
> >> install -d ${D}/boot
> >>+ if [ -n "${JH_RAMFS_IMAGE}" ]
> >>+ then
> >>+ if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> >>+ then
> >>+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> >>+ else
> >>+ bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> >Typo in the message. Also, should it be an error instead of a warning?
>
>
> I did not want this recipe to force the requirement for an ramfs. But
> thinking about it now, making it an error is better in case the linux-demo
> is desired. If it is not, then JH_RAMFS_IMAGE can be unset in some conf.
Thanks. Can you do a v4 of all 3 patches quickly to address the comments in
1/3 and 3/3, so I can merge them in for rc4? Thanks again.
> >>+ bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> >>+ fi
> >>+ fi
> >> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> >> cd ${TOOLS_SRC_DIR}
> >>@@ -110,6 +122,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 \
> >> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> >> ${DEPLOY_DIR_IMAGE}/Image \
> >> | tr -cd '\11\12\15\40-\176' \
> >>@@ -143,9 +156,9 @@ CELLS = ""
> >> python __anonymous () {
> >> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> >>- initrd = d.getVar('INITRAMFS_IMAGE', True)
> >>- if initrd:
> >>- d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> >>+ ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> >>+ if ramfs:
> >>+ d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
> >> # Setup DEPENDS and RDEPENDS to included cells
> >> cells = d.getVar('CELLS', True) or ""
> >>--
> >>2.7.4
> >>
> >>--
> >>_______________________________________________
> >>meta-ti mailing list
> >>meta-ti@yoctoproject.org
> >>https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:29 ` Denys Dmytriyenko
@ 2019-08-30 16:30 ` Jacob Stiffler
0 siblings, 0 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:30 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, lokeshvutla
On 8/30/2019 12:29 PM, Denys Dmytriyenko wrote:
> On Fri, Aug 30, 2019 at 12:23:43PM -0400, Jacob Stiffler wrote:
>> On 8/30/2019 12:13 PM, Denys Dmytriyenko wrote:
>>> On Tue, Aug 20, 2019 at 02:11:12PM -0400, Jacob Stiffler wrote:
>>>> * Configure the linux-demo to use a ramfs for the linux inmate.
>>>> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>>>>
>>>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>>>> ---
>>>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
>>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>>
>>>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>> index 5d572d0..ba6772f 100644
>>>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>>>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
>>>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
>>>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>>>> +JH_RAMFS_IMAGE ?= "core-image-minimal"
>>> Ok, after thinking about it a bit, I will agree to JH_RAMFS_IMAGE variable,
>>> but I don't want to loose the default INITRAMFS_IMAGE usage. So, how about
>>> changing the default here to something like this:
>>>
>>> JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
>>>
>>> That way either of the variables can be set my machine config or local.conf
>>> and the default use is also preserved. Thoughts?
>>
>> I like that idea better as well.
>>
>>
>>>> JH_CMDLINE ?= ""
>>>> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>>>> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>>>> do_configure() {
>>>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
>>>> @@ -101,6 +103,16 @@ do_install() {
>>>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>>>> install -d ${D}/boot
>>>> + if [ -n "${JH_RAMFS_IMAGE}" ]
>>>> + then
>>>> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
>>>> + then
>>>> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
>>>> + else
>>>> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
>>> Typo in the message. Also, should it be an error instead of a warning?
>>
>> I did not want this recipe to force the requirement for an ramfs. But
>> thinking about it now, making it an error is better in case the linux-demo
>> is desired. If it is not, then JH_RAMFS_IMAGE can be unset in some conf.
> Thanks. Can you do a v4 of all 3 patches quickly to address the comments in
> 1/3 and 3/3, so I can merge them in for rc4? Thanks again.
Sure. Just got to make sure they still build.
>
>>>> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
>>>> + fi
>>>> + fi
>>>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
>>>> cd ${TOOLS_SRC_DIR}
>>>> @@ -110,6 +122,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 \
>>>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
>>>> ${DEPLOY_DIR_IMAGE}/Image \
>>>> | tr -cd '\11\12\15\40-\176' \
>>>> @@ -143,9 +156,9 @@ CELLS = ""
>>>> python __anonymous () {
>>>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
>>>> - initrd = d.getVar('INITRAMFS_IMAGE', True)
>>>> - if initrd:
>>>> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
>>>> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
>>>> + if ramfs:
>>>> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>>>> # Setup DEPENDS and RDEPENDS to included cells
>>>> cells = d.getVar('CELLS', True) or ""
>>>> --
>>>> 2.7.4
>>>>
>>>> --
>>>> _______________________________________________
>>>> meta-ti mailing list
>>>> meta-ti@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:26 ` Jacob Stiffler
@ 2019-08-30 16:31 ` Denys Dmytriyenko
2019-08-30 16:42 ` Jacob Stiffler
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:31 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla, Nikhil Devshatwar
On Fri, Aug 30, 2019 at 12:26:51PM -0400, Jacob Stiffler wrote:
>
> On 8/30/2019 12:23 PM, Denys Dmytriyenko wrote:
> >On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
> >>On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> >>>* Configure the linux-demo to use a ramfs for the linux inmate.
> >>>* Using JH_RAMFS_IMAGE, this can be set in some global conf.
> >>>
> >>>Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> >>Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
> >>
> >>I manually built the core-image-minimal in cpio format with a bbappend of my own.
> >>How is this supposed to be built automatically?
> >>
> >>Can you add a depends variable so that the build kicks automatically?
> >There's a proper DEPENDS being added in the anonymous function below, so
> >should work automatically.
>
>
> We do not have "cpio" in our IMAGE_TYPES, so it needs to be added for
> JH_RAMFS_IMAGE.
>
> I cannot think of a way to force that IMAGE_TYPE from this recipe, but is
> there a way?
No, the only way is to check that IMAGE_FSTYPES contains "cpio" when
JH_RAMFS_IMAGE is set and error out otherwise. Can be done in anonymous
function to bail out early and not wait until JH builds.
> >Denys
> >
> >
> >>Nikhil D
> >>
> >>>---
> >>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> >>> 1 file changed, 17 insertions(+), 4 deletions(-)
> >>>
> >>>diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>index 5d572d0..ba6772f 100644
> >>>--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>@@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> >>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> >>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
> >>>+JH_RAMFS_IMAGE ?= "core-image-minimal"
> >>>+
> >>> JH_CMDLINE ?= ""
> >>>-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> >>>+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
> >>> do_configure() {
> >>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> >>>@@ -101,6 +103,16 @@ do_install() {
> >>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
> >>> install -d ${D}/boot
> >>>+ if [ -n "${JH_RAMFS_IMAGE}" ]
> >>>+ then
> >>>+ if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> >>>+ then
> >>>+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> >>>+ else
> >>>+ bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> >>>+ bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> >>>+ fi
> >>>+ fi
> >>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> >>> cd ${TOOLS_SRC_DIR}
> >>>@@ -110,6 +122,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 \
> >>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> >>> ${DEPLOY_DIR_IMAGE}/Image \
> >>> | tr -cd '\11\12\15\40-\176' \
> >>>@@ -143,9 +156,9 @@ CELLS = ""
> >>> python __anonymous () {
> >>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> >>>- initrd = d.getVar('INITRAMFS_IMAGE', True)
> >>>- if initrd:
> >>>- d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> >>>+ ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> >>>+ if ramfs:
> >>>+ d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
> >>> # Setup DEPENDS and RDEPENDS to included cells
> >>> cells = d.getVar('CELLS', True) or ""
> >>>
> >>--
> >>_______________________________________________
> >>meta-ti mailing list
> >>meta-ti@yoctoproject.org
> >>https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:31 ` Denys Dmytriyenko
@ 2019-08-30 16:42 ` Jacob Stiffler
2019-08-30 16:50 ` Denys Dmytriyenko
0 siblings, 1 reply; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:42 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, lokeshvutla, Nikhil Devshatwar
On 8/30/2019 12:31 PM, Denys Dmytriyenko wrote:
> On Fri, Aug 30, 2019 at 12:26:51PM -0400, Jacob Stiffler wrote:
>> On 8/30/2019 12:23 PM, Denys Dmytriyenko wrote:
>>> On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
>>>> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
>>>>> * Configure the linux-demo to use a ramfs for the linux inmate.
>>>>> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>>>>>
>>>>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>>>> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>>>>
>>>> I manually built the core-image-minimal in cpio format with a bbappend of my own.
>>>> How is this supposed to be built automatically?
>>>>
>>>> Can you add a depends variable so that the build kicks automatically?
>>> There's a proper DEPENDS being added in the anonymous function below, so
>>> should work automatically.
>>
>> We do not have "cpio" in our IMAGE_TYPES, so it needs to be added for
>> JH_RAMFS_IMAGE.
>>
>> I cannot think of a way to force that IMAGE_TYPE from this recipe, but is
>> there a way?
> No, the only way is to check that IMAGE_FSTYPES contains "cpio" when
> JH_RAMFS_IMAGE is set and error out otherwise. Can be done in anonymous
> function to bail out early and not wait until JH builds.
>
But cpio can be added as a recipe override, so preemptively detecting
this could get tricky.
>>> Denys
>>>
>>>
>>>> Nikhil D
>>>>
>>>>> ---
>>>>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
>>>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>>>
>>>>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>> index 5d572d0..ba6772f 100644
>>>>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
>>>>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
>>>>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>>>>> +JH_RAMFS_IMAGE ?= "core-image-minimal"
>>>>> +
>>>>> JH_CMDLINE ?= ""
>>>>> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>>>>> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>>>>> do_configure() {
>>>>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
>>>>> @@ -101,6 +103,16 @@ do_install() {
>>>>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>>>>> install -d ${D}/boot
>>>>> + if [ -n "${JH_RAMFS_IMAGE}" ]
>>>>> + then
>>>>> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
>>>>> + then
>>>>> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
>>>>> + else
>>>>> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
>>>>> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
>>>>> + fi
>>>>> + fi
>>>>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
>>>>> cd ${TOOLS_SRC_DIR}
>>>>> @@ -110,6 +122,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 \
>>>>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
>>>>> ${DEPLOY_DIR_IMAGE}/Image \
>>>>> | tr -cd '\11\12\15\40-\176' \
>>>>> @@ -143,9 +156,9 @@ CELLS = ""
>>>>> python __anonymous () {
>>>>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
>>>>> - initrd = d.getVar('INITRAMFS_IMAGE', True)
>>>>> - if initrd:
>>>>> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
>>>>> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
>>>>> + if ramfs:
>>>>> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>>>>> # Setup DEPENDS and RDEPENDS to included cells
>>>>> cells = d.getVar('CELLS', True) or ""
>>>>>
>>>> --
>>>> _______________________________________________
>>>> meta-ti mailing list
>>>> meta-ti@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:42 ` Jacob Stiffler
@ 2019-08-30 16:50 ` Denys Dmytriyenko
2019-08-30 16:53 ` Jacob Stiffler
0 siblings, 1 reply; 21+ messages in thread
From: Denys Dmytriyenko @ 2019-08-30 16:50 UTC (permalink / raw)
To: Jacob Stiffler; +Cc: meta-ti, lokeshvutla, Nikhil Devshatwar
On Fri, Aug 30, 2019 at 12:42:32PM -0400, Jacob Stiffler wrote:
>
> On 8/30/2019 12:31 PM, Denys Dmytriyenko wrote:
> >On Fri, Aug 30, 2019 at 12:26:51PM -0400, Jacob Stiffler wrote:
> >>On 8/30/2019 12:23 PM, Denys Dmytriyenko wrote:
> >>>On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
> >>>>On 20/08/19 11:41 PM, Jacob Stiffler wrote:
> >>>>>* Configure the linux-demo to use a ramfs for the linux inmate.
> >>>>>* Using JH_RAMFS_IMAGE, this can be set in some global conf.
> >>>>>
> >>>>>Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> >>>>Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
> >>>>
> >>>>I manually built the core-image-minimal in cpio format with a bbappend of my own.
> >>>>How is this supposed to be built automatically?
> >>>>
> >>>>Can you add a depends variable so that the build kicks automatically?
> >>>There's a proper DEPENDS being added in the anonymous function below, so
> >>>should work automatically.
> >>
> >>We do not have "cpio" in our IMAGE_TYPES, so it needs to be added for
> >>JH_RAMFS_IMAGE.
> >>
> >>I cannot think of a way to force that IMAGE_TYPE from this recipe, but is
> >>there a way?
> >No, the only way is to check that IMAGE_FSTYPES contains "cpio" when
> >JH_RAMFS_IMAGE is set and error out otherwise. Can be done in anonymous
> >function to bail out early and not wait until JH builds.
> >
>
> But cpio can be added as a recipe override, so preemptively detecting this
> could get tricky.
All the overrides should be parsed and processed by the time anonymous
functions are executed... Is there a specific use-case you have that doesn't
work?
> >>>Denys
> >>>
> >>>
> >>>>Nikhil D
> >>>>
> >>>>>---
> >>>>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
> >>>>> 1 file changed, 17 insertions(+), 4 deletions(-)
> >>>>>
> >>>>>diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>>>index 5d572d0..ba6772f 100644
> >>>>>--- a/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>>>+++ b/recipes-kernel/jailhouse/jailhouse_git.bb
> >>>>>@@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
> >>>>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
> >>>>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
> >>>>>+JH_RAMFS_IMAGE ?= "core-image-minimal"
> >>>>>+
> >>>>> JH_CMDLINE ?= ""
> >>>>>-JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
> >>>>>+JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
> >>>>> do_configure() {
> >>>>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
> >>>>>@@ -101,6 +103,16 @@ do_install() {
> >>>>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
> >>>>> install -d ${D}/boot
> >>>>>+ if [ -n "${JH_RAMFS_IMAGE}" ]
> >>>>>+ then
> >>>>>+ if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
> >>>>>+ then
> >>>>>+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
> >>>>>+ else
> >>>>>+ bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
> >>>>>+ bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
> >>>>>+ fi
> >>>>>+ fi
> >>>>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
> >>>>> cd ${TOOLS_SRC_DIR}
> >>>>>@@ -110,6 +122,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 \
> >>>>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
> >>>>> ${DEPLOY_DIR_IMAGE}/Image \
> >>>>> | tr -cd '\11\12\15\40-\176' \
> >>>>>@@ -143,9 +156,9 @@ CELLS = ""
> >>>>> python __anonymous () {
> >>>>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
> >>>>>- initrd = d.getVar('INITRAMFS_IMAGE', True)
> >>>>>- if initrd:
> >>>>>- d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
> >>>>>+ ramfs = d.getVar('JH_RAMFS_IMAGE', True)
> >>>>>+ if ramfs:
> >>>>>+ d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
> >>>>> # Setup DEPENDS and RDEPENDS to included cells
> >>>>> cells = d.getVar('CELLS', True) or ""
> >>>>>
> >>>>--
> >>>>_______________________________________________
> >>>>meta-ti mailing list
> >>>>meta-ti@yoctoproject.org
> >>>>https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo
2019-08-30 16:50 ` Denys Dmytriyenko
@ 2019-08-30 16:53 ` Jacob Stiffler
0 siblings, 0 replies; 21+ messages in thread
From: Jacob Stiffler @ 2019-08-30 16:53 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: meta-ti, lokeshvutla, Nikhil Devshatwar
On 8/30/2019 12:50 PM, Denys Dmytriyenko wrote:
> On Fri, Aug 30, 2019 at 12:42:32PM -0400, Jacob Stiffler wrote:
>> On 8/30/2019 12:31 PM, Denys Dmytriyenko wrote:
>>> On Fri, Aug 30, 2019 at 12:26:51PM -0400, Jacob Stiffler wrote:
>>>> On 8/30/2019 12:23 PM, Denys Dmytriyenko wrote:
>>>>> On Thu, Aug 29, 2019 at 02:21:51PM +0530, Nikhil Devshatwar wrote:
>>>>>> On 20/08/19 11:41 PM, Jacob Stiffler wrote:
>>>>>>> * Configure the linux-demo to use a ramfs for the linux inmate.
>>>>>>> * Using JH_RAMFS_IMAGE, this can be set in some global conf.
>>>>>>>
>>>>>>> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
>>>>>> Tested-by: Nikhil Devshatwar <nikhil.nd@ti.com>
>>>>>>
>>>>>> I manually built the core-image-minimal in cpio format with a bbappend of my own.
>>>>>> How is this supposed to be built automatically?
>>>>>>
>>>>>> Can you add a depends variable so that the build kicks automatically?
>>>>> There's a proper DEPENDS being added in the anonymous function below, so
>>>>> should work automatically.
>>>> We do not have "cpio" in our IMAGE_TYPES, so it needs to be added for
>>>> JH_RAMFS_IMAGE.
>>>>
>>>> I cannot think of a way to force that IMAGE_TYPE from this recipe, but is
>>>> there a way?
>>> No, the only way is to check that IMAGE_FSTYPES contains "cpio" when
>>> JH_RAMFS_IMAGE is set and error out otherwise. Can be done in anonymous
>>> function to bail out early and not wait until JH builds.
>>>
>> But cpio can be added as a recipe override, so preemptively detecting this
>> could get tricky.
> All the overrides should be parsed and processed by the time anonymous
> functions are executed... Is there a specific use-case you have that doesn't
> work?
If you only want cpio for the JH_RAMFS_IMAGE. For example, in some conf
file:
IMAGE_FSTYPES = "tar.xz"
IMAGE_FSTYPES_append_pn-${JH_RAMFS_IMAGE} = " cpio"
The jailhouse recipe will incorrectly throw an error.
>
>>>>> Denys
>>>>>
>>>>>
>>>>>> Nikhil D
>>>>>>
>>>>>>> ---
>>>>>>> recipes-kernel/jailhouse/jailhouse_git.bb | 21 +++++++++++++++++----
>>>>>>> 1 file changed, 17 insertions(+), 4 deletions(-)
>>>>>>>
>>>>>>> diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>>>> index 5d572d0..ba6772f 100644
>>>>>>> --- a/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>>>> +++ b/recipes-kernel/jailhouse/jailhouse_git.bb
>>>>>>> @@ -58,8 +58,10 @@ JH_SYSCONFIG_CELL ?= ""
>>>>>>> JH_SYSCONFIG_CELL_am65xx ?= "k3-am654-idk.cell"
>>>>>>> JH_SYSCONFIG_CELL_j7-evm ?= "k3-j721e-evm.cell"
>>>>>>> +JH_RAMFS_IMAGE ?= "core-image-minimal"
>>>>>>> +
>>>>>>> JH_CMDLINE ?= ""
>>>>>>> -JH_CMDLINE_k3 ?= "console=ttyS1,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait"
>>>>>>> +JH_CMDLINE_k3 ?= "console=ttyS1,115200n8"
>>>>>>> do_configure() {
>>>>>>> if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
>>>>>>> @@ -101,6 +103,16 @@ do_install() {
>>>>>>> install -m 0644 ${B}/inmates/demos/${JH_ARCH}/*.bin ${D}${INMATES_DIR}
>>>>>>> install -d ${D}/boot
>>>>>>> + if [ -n "${JH_RAMFS_IMAGE}" ]
>>>>>>> + then
>>>>>>> + if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ]
>>>>>>> + then
>>>>>>> + install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot
>>>>>>> + else
>>>>>>> + bbwarn "Could find find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!"
>>>>>>> + bbwarn "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
>>>>>>> + fi
>>>>>>> + fi
>>>>>>> if [ -n "${JH_INMATE_DTB}" -a -n "${JH_LINUX_DEMO_CELL}" ]; then
>>>>>>> cd ${TOOLS_SRC_DIR}
>>>>>>> @@ -110,6 +122,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 \
>>>>>>> ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
>>>>>>> ${DEPLOY_DIR_IMAGE}/Image \
>>>>>>> | tr -cd '\11\12\15\40-\176' \
>>>>>>> @@ -143,9 +156,9 @@ CELLS = ""
>>>>>>> python __anonymous () {
>>>>>>> d.appendVarFlag('do_install', 'depends', ' virtual/kernel:do_deploy')
>>>>>>> - initrd = d.getVar('INITRAMFS_IMAGE', True)
>>>>>>> - if initrd:
>>>>>>> - d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
>>>>>>> + ramfs = d.getVar('JH_RAMFS_IMAGE', True)
>>>>>>> + if ramfs:
>>>>>>> + d.appendVarFlag('do_install', 'depends', ' ${JH_RAMFS_IMAGE}:do_image_complete')
>>>>>>> # Setup DEPENDS and RDEPENDS to included cells
>>>>>>> cells = d.getVar('CELLS', True) or ""
>>>>>>>
>>>>>> --
>>>>>> _______________________________________________
>>>>>> meta-ti mailing list
>>>>>> meta-ti@yoctoproject.org
>>>>>> https://lists.yoctoproject.org/listinfo/meta-ti
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2019-08-30 16:54 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-20 18:11 [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Jacob Stiffler
2019-08-20 18:11 ` [master/thud][PATCH v2 2/3] jailhouse: provide tools package Jacob Stiffler
2019-08-29 8:41 ` Nikhil Devshatwar
2019-08-30 16:05 ` Denys Dmytriyenko
2019-08-30 16:08 ` Jacob Stiffler
2019-08-30 16:03 ` Denys Dmytriyenko
2019-08-30 16:10 ` Jacob Stiffler
2019-08-30 16:16 ` Denys Dmytriyenko
2019-08-20 18:11 ` [master/thud][PATCH v2 3/3] jailhouse: use ramfs for linux-demo Jacob Stiffler
2019-08-29 8:51 ` Nikhil Devshatwar
2019-08-30 16:23 ` Denys Dmytriyenko
2019-08-30 16:26 ` Jacob Stiffler
2019-08-30 16:31 ` Denys Dmytriyenko
2019-08-30 16:42 ` Jacob Stiffler
2019-08-30 16:50 ` Denys Dmytriyenko
2019-08-30 16:53 ` Jacob Stiffler
2019-08-30 16:13 ` Denys Dmytriyenko
2019-08-30 16:23 ` Jacob Stiffler
2019-08-30 16:29 ` Denys Dmytriyenko
2019-08-30 16:30 ` Jacob Stiffler
2019-08-30 15:57 ` [master/thud][PATCH v2 1/3] jailhouse: update to ti2019.03-rc2 Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.