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: cleanup and fix bitbake tasks overrides #1738

Merged
merged 3 commits into from
Jan 25, 2024
Merged

Jailhouse-imx: cleanup and fix bitbake tasks overrides #1738

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c71414
jailhouse-imx: fix bitbake tasks overrides
quaresmajose Jan 25, 2024
2276e67
jailhouse-imx: use EXTRA_OEMAKE to pass the args
quaresmajose Jan 25, 2024
edd0fc9
jailhouse-imx: drop python3native inherit
quaresmajose Jan 25, 2024
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
36 changes: 17 additions & 19 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 @@ -28,7 +28,7 @@ DEPENDS = " \
dtc-native \
"

inherit module python3native bash-completion deploy setuptools3
inherit module bash-completion deploy setuptools3

S = "${WORKDIR}/git"
B = "${S}"
Expand All @@ -41,33 +41,31 @@ INMATES_DIR ?= "${JH_DATADIR}/inmates"

TUNE_CCARGS:remove:mx93-nxp-bsp = "-mcpu=cortex-a55"

do_configure() {
EXTRA_OEMAKE += 'V=1'
EXTRA_OEMAKE += 'PYTHON=python3'
EXTRA_OEMAKE += 'LDFLAGS=""'
EXTRA_OEMAKE += 'CC="${CC}"'
EXTRA_OEMAKE += 'ARCH=${JH_ARCH}'
EXTRA_OEMAKE += 'CROSS_COMPILE=${TARGET_PREFIX}'
EXTRA_OEMAKE += 'KDIR=${STAGING_KERNEL_BUILDDIR}'
EXTRA_OEMAKE += 'MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}"'
EXTRA_OEMAKE += 'INSTALL_MOD_PATH=${D}${root_prefix}'
EXTRA_OEMAKE += 'firmwaredir=${nonarch_base_libdir}/firmware'

do_configure:prepend() {
if [ -d ${STAGING_DIR_HOST}/${CELLCONF_DIR} ];
then
cp "${STAGING_DIR_HOST}/${CELLCONF_DIR}/"*.c ${S}/configs/${ARCH}/
fi
}

do_compile:prepend() {
unset LDFLAGS
oe_runmake V=1 CC="${CC}" \
ARCH=${JH_ARCH} CROSS_COMPILE=${TARGET_PREFIX} \
KDIR=${STAGING_KERNEL_BUILDDIR}
# explicity call make to build the kernel module and tools
oe_runmake
}

do_install:prepend() {
oe_runmake \
PYTHON=python3 \
V=1 \
LDFLAGS="" \
CC="${CC}" \
ARCH=${JH_ARCH} \
CROSS_COMPILE=${TARGET_PREFIX} \
KDIR=${STAGING_KERNEL_BUILDDIR} \
MODLIB="${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}" \
INSTALL_MOD_PATH=${D}${root_prefix} \
firmwaredir=${nonarch_base_libdir}/firmware \
DESTDIR=${D} install
do_install:append() {
oe_runmake DESTDIR=${D} install

install -d ${D}${CELL_DIR}
install ${B}/configs/${JH_ARCH}/*.cell ${D}${CELL_DIR}/
Expand Down
Loading