From: Jan Kiszka <jan.kis...@siemens.com>
Call "build-images --latest", and the kas-latest.yml will be selected.
That switches the preferred version of Jailhouse to 0.9999-next which
pulls from the next branch of Jailhouse.
As the configs directory in that version was restructured, we need to
adjust jailhouse.install to cater both setups. Also prepare it for
non-x86 demos at this chance.
This can be extended later on to also pulling the latest Jailhouse
kernel branch.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
build-images.sh | 8 +++++++-
kas-latest.yml | 19 +++++++++++++++++++
.../jailhouse/files/debian/jailhouse.install | 4 ++--
recipes-jailhouse/jailhouse/jailhouse.inc | 2 +-
recipes-jailhouse/jailhouse/jailhouse_latest.bb | 15 +++++++++++++++
5 files changed, 44 insertions(+), 4 deletions(-)
create mode 100644 kas-latest.yml
create mode 100644 recipes-jailhouse/jailhouse/jailhouse_latest.bb
diff --git a/build-images.sh b/build-images.sh
index baf3a58..63c701a 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -14,15 +14,21 @@ usage()
{
echo "Usage: $0 [OPTIONS]"
echo -e "\nOptions:"
+ echo -e "--latest\tBuild latest Jailhouse version from next branch."
echo -e "--shell\t\tDrop into a shell to issue bitbake commands" \
"manually."
exit 1
}
+LATEST=""
CMD="build"
while [ $# -gt 0 ]; do
case "$1" in
+ --latest)
+ LATEST="-latest"
+ shift 1
+ ;;
--shell)
CMD="shell"
shift 1
@@ -42,4 +48,4 @@ docker run -v $(pwd):/jailhouse-images:ro -v
$(pwd)/out:/out:rw \
-e no_proxy=$no_proxy \
kasproject/kas-isar sh -c "
cd /out;
- kas ${CMD} /jailhouse-images/kas.yml"
+ kas ${CMD} /jailhouse-images/kas${LATEST}.yml"
diff --git a/kas-latest.yml b/kas-latest.yml
new file mode 100644
index 0000000..5485348
--- /dev/null
+++ b/kas-latest.yml
@@ -0,0 +1,19 @@
+#
+# Jailhouse, a Linux-based partitioning hypervisor
+#
+# Copyright (c) Siemens AG, 2018
+#
+# Authors:
+# Jan Kiszka <jan.kis...@siemens.com>
+#
+# SPDX-License-Identifier: GPL-2.0
+#
+
+header:
+ version: 5
+ includes:
+ - kas.yml
+
+local_conf_header:
+ latest: |
+ PREFERRED_VERSION_jailhouse = "0.9999-next"
diff --git a/recipes-jailhouse/jailhouse/files/debian/jailhouse.install
b/recipes-jailhouse/jailhouse/files/debian/jailhouse.install
index 071b56c..627c65e 100644
--- a/recipes-jailhouse/jailhouse/files/debian/jailhouse.install
+++ b/recipes-jailhouse/jailhouse/files/debian/jailhouse.install
@@ -1,2 +1,2 @@
-configs/*.cell etc/jailhouse
-inmates/demos/x86/*.bin usr/libexec/jailhouse/demos
+configs{,/*}/*.cell etc/jailhouse
+inmates/demos/*/*.bin usr/libexec/jailhouse/demos
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc
b/recipes-jailhouse/jailhouse/jailhouse.inc
index 92f0614..757c298 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -14,7 +14,7 @@ DESCRIPTION = "Jailhouse partitioning hypervisor"
LICENSE = "GPL-2.0 & BSD-2-clause"
SRC_URI = " \
- git://github.com/siemens/jailhouse \
+ git://github.com/siemens/jailhouse;branch=next \
file://debian/"
S = "git"
diff --git a/recipes-jailhouse/jailhouse/jailhouse_latest.bb
b/recipes-jailhouse/jailhouse/jailhouse_latest.bb
new file mode 100644
index 0000000..9b5fa04
--- /dev/null
+++ b/recipes-jailhouse/jailhouse/jailhouse_latest.bb
@@ -0,0 +1,15 @@
+#
+# Jailhouse, a Linux-based partitioning hypervisor
+#
+# Copyright (c) Siemens AG, 2018
+#
+# Authors:
+# Jan Kiszka <jan.kis...@siemens.com>
+#
+# SPDX-License-Identifier: GPL-2.0
+#
+
+require jailhouse.inc
+
+SRCREV = "next"
+PV = "0.9999-next"
--
2.13.6
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
