diff options
author | Nikhil Devshatwar <nikhil.nd@ti.com> | 2020-02-24 16:54:37 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2020-02-25 04:38:39 +0000 |
commit | 55fcbdfb9622d5c18ade0da21213785848c87523 (patch) | |
tree | 5caf3ce9a45e387eedc759527e54b4fee6e286de | |
parent | d35867f72ecca04698bdfb7b2dd6abd00a6f0e84 (diff) | |
download | meta-ti-55fcbdfb9622d5c18ade0da21213785848c87523.tar.gz |
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 <nikhil.nd@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r-- | recipes-kernel/jailhouse/jailhouse_git.bb | 11 |
1 files 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 = " \ | |||
10 | file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ | 10 | file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ |
11 | " | 11 | " |
12 | 12 | ||
13 | PV = "0.10+git${SRCPV}" | 13 | PV = "0.12+git${SRCPV}" |
14 | SRCREV = "b3a68ac89d7ed955546eae91954b184ec1583ce3" | 14 | SRCREV = "92db71f257fabd3c08fa4b99498fa61a41ea831d" |
15 | BRANCH = "ti-jailhouse-0.10" | 15 | BRANCH = "ti-jailhouse-0.12" |
16 | 16 | ||
17 | SRC_URI = " \ | 17 | SRC_URI = " \ |
18 | git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ | 18 | git://git.ti.com/jailhouse/ti-jailhouse.git;protocol=git;branch=${BRANCH} \ |
@@ -40,9 +40,6 @@ CELL_DIR ?= "${JH_DATADIR}/cells" | |||
40 | CELLCONF_DIR ?= "${JH_DATADIR}/configs" | 40 | CELLCONF_DIR ?= "${JH_DATADIR}/configs" |
41 | INMATES_DIR ?= "${JH_DATADIR}/inmates" | 41 | INMATES_DIR ?= "${JH_DATADIR}/inmates" |
42 | 42 | ||
43 | JH_CONFIG ?= "${S}/ci/jailhouse-config-x86.h" | ||
44 | JH_CONFIG_k3 ?= "${S}/ci/jailhouse-config-k3.h" | ||
45 | |||
46 | JH_CELL_FILES ?= "*.cell" | 43 | JH_CELL_FILES ?= "*.cell" |
47 | JH_CELL_FILES_k3 ?= "k3-*.cell" | 44 | JH_CELL_FILES_k3 ?= "k3-*.cell" |
48 | 45 | ||
@@ -69,8 +66,6 @@ do_configure() { | |||
69 | then | 66 | then |
70 | cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ | 67 | cp ${STAGING_DIR_HOST}/${CELLCONF_DIR}/*.c ${S}/configs/ |
71 | fi | 68 | fi |
72 | |||
73 | cp -av ${JH_CONFIG} ${S}/include/jailhouse/config.h | ||
74 | } | 69 | } |
75 | 70 | ||
76 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ | 71 | USER_SPACE_CFLAGS = '${CFLAGS} -DLIBEXECDIR=\\\"${libexecdir}\\\" \ |