From 55fcbdfb9622d5c18ade0da21213785848c87523 Mon Sep 17 00:00:00 2001 From: Nikhil Devshatwar Date: Mon, 24 Feb 2020 16:54:37 +0000 Subject: recipes-kernel: jailhose: Update to 0.12 version Jailhouse 0.12 does not need to define custom config flags. Remove the steps to copy the config from do_configure task Signed-off-by: Nikhil Devshatwar Signed-off-by: Denys Dmytriyenko --- recipes-kernel/jailhouse/jailhouse_git.bb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/recipes-kernel/jailhouse/jailhouse_git.bb b/recipes-kernel/jailhouse/jailhouse_git.bb index 4186dc3a..a4ee2fc7 100644 --- a/recipes-kernel/jailhouse/jailhouse_git.bb +++ b/recipes-kernel/jailhouse/jailhouse_git.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ " -PV = "0.10+git${SRCPV}" -SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3" -BRANCH = "ti-jailhouse-0.10" +PV = "0.12+git${SRCPV}" +SRCREV = "92db71f257fabd3c08fa4b99498fa61a41ea831d" +BRANCH = "ti-jailhouse-0.12" SRC_URI = " \ git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ @@ -40,9 +40,6 @@ CELL_DIR ?= "${JH_DATADIR}/cells" CELLCONF_DIR ?= "${JH_DATADIR}/configs" INMATES_DIR ?= "${JH_DATADIR}/inmates" -JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" -JH_CONFIG_k3 ?= "${S}/ci/jailhouse-config-k3.h" - JH_CELL_FILES ?= "*.cell" JH_CELL_FILES_k3 ?= "k3-*.cell" @@ -69,8 +66,6 @@ do_configure() { then cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ fi - - cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h } USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ -- cgit v1.2.3-54-g00ecf