From: Jan Kiszka <jan.kis...@siemens.com>
All dependencies have been merged into upstream Isar now. Switch to
Isar's next branch, adjusting kernel and module build recipes to the
latest changes.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
conf/multiconfig/qemuamd64-jailhouse.conf | 4 +++-
kas.yml | 4 ++--
recipes-jailhouse/jailhouse/files/debian/control | 4 ++--
recipes-jailhouse/jailhouse/jailhouse.inc | 3 ++-
recipes-kernel/linux/files/{defconfig => x86_64_defconfig} | 0
5 files changed, 9 insertions(+), 6 deletions(-)
rename recipes-kernel/linux/files/{defconfig => x86_64_defconfig} (100%)
diff --git a/conf/multiconfig/qemuamd64-jailhouse.conf
b/conf/multiconfig/qemuamd64-jailhouse.conf
index efbc01b..d89d851 100644
--- a/conf/multiconfig/qemuamd64-jailhouse.conf
+++ b/conf/multiconfig/qemuamd64-jailhouse.conf
@@ -11,4 +11,6 @@
require conf/multiconfig/qemuamd64-stretch.conf
-PREFERRED_PROVIDER_virtual/kernel = "linux-jailhouse"
+KERNEL_NAME = "jailhouse-amd64"
+
+PREFERRED_VERSION_jailhouse ?= "0.8"
diff --git a/kas.yml b/kas.yml
index 998b2bb..09087cd 100644
--- a/kas.yml
+++ b/kas.yml
@@ -18,8 +18,8 @@ repos:
jailhouse:
isar:
- url: https://github.com/siemens/isar
- refspec: 0245f4d754efa92be4a9671074e7cd79e3e39452
+ url: https://github.com/ilbers/isar
+ refspec: 17399a2dc0dd1cdde716ce2ec75338346cb20fa4
layers:
meta:
meta-isar:
diff --git a/recipes-jailhouse/jailhouse/files/debian/control
b/recipes-jailhouse/jailhouse/files/debian/control
index 9f6afbd..479ce1d 100644
--- a/recipes-jailhouse/jailhouse/files/debian/control
+++ b/recipes-jailhouse/jailhouse/files/debian/control
@@ -2,10 +2,10 @@ Source: jailhouse
Section: misc
Priority: optional
Standards-Version: 3.9.6
-Build-Depends: linux-headers-amd64 [amd64], python-mako
+Build-Depends: linux-headers-@KERNEL_NAME@, python-mako
Maintainer: Jan Kiszka <jan.kis...@siemens.com>
Package: jailhouse
Architecture: any
-Depends: ${shlibs:Depends}, linux-image-amd64 [amd64], python-mako
+Depends: ${shlibs:Depends}, linux-image-@KERNEL_NAME@, python-mako
Description: Jailhouse partitioning hypervisor
diff --git a/recipes-jailhouse/jailhouse/jailhouse.inc
b/recipes-jailhouse/jailhouse/jailhouse.inc
index e4658a8..92f0614 100644
--- a/recipes-jailhouse/jailhouse/jailhouse.inc
+++ b/recipes-jailhouse/jailhouse/jailhouse.inc
@@ -21,9 +21,10 @@ S = "git"
inherit dpkg
-DEPENDS = "virtual/kernel"
+DEPENDS = "linux-image-${KERNEL_NAME}"
dpkg_runbuild_prepend() {
cp -r ${WORKDIR}/debian ${WORKDIR}/${S}/
sed -i 's/@PV@/${PV}/' ${WORKDIR}/${S}/debian/changelog
+ sed -i 's/@KERNEL_NAME@/${KERNEL_NAME}/' ${WORKDIR}/${S}/debian/control
}
diff --git a/recipes-kernel/linux/files/defconfig
b/recipes-kernel/linux/files/x86_64_defconfig
similarity index 100%
rename from recipes-kernel/linux/files/defconfig
rename to recipes-kernel/linux/files/x86_64_defconfig
--
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.
