From: Jan Kiszka <jan.kis...@siemens.com>
We will add another x86 target that will share the kernel with the
qemuamd64 machine. Prepare for this by renaming the defconfig and
constructing its name during the build in python snippet so that we can
easily add another machine later on.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
.../linux/files/{qemuamd64_defconfig => x86-64_defconfig} | 0
recipes-kernel/linux/linux-jailhouse.bb | 11 ++++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
rename recipes-kernel/linux/files/{qemuamd64_defconfig => x86-64_defconfig}
(100%)
diff --git a/recipes-kernel/linux/files/qemuamd64_defconfig
b/recipes-kernel/linux/files/x86-64_defconfig
similarity index 100%
rename from recipes-kernel/linux/files/qemuamd64_defconfig
rename to recipes-kernel/linux/files/x86-64_defconfig
diff --git a/recipes-kernel/linux/linux-jailhouse.bb
b/recipes-kernel/linux/linux-jailhouse.bb
index 3cfdc4f..95e6caa 100644
--- a/recipes-kernel/linux/linux-jailhouse.bb
+++ b/recipes-kernel/linux/linux-jailhouse.bb
@@ -11,6 +11,13 @@
require recipes-kernel/linux/linux-custom.inc
+python() {
+ machine = d.getVar('MACHINE', True)
+ if machine in ['qemuamd64']:
+ machine = 'x86-64'
+ d.setVar('KERNEL_DEFCONFIG', machine + '_defconfig')
+}
+
SRC_URI += " \
https://github.com/siemens/linux/archive/${SRCREV}.tar.gz \
file://0001-net-stmmac-snps-dwmac-mdio-MDIOs-are-automatically-r.patch \
@@ -20,13 +27,11 @@ SRC_URI += " \
file://0005-ARM-dts-sunxi-h3-h5-represent-the-mdio-switch-used-b.patch \
file://0006-ARM-dts-sunxi-Restore-EMAC-changes-boards.patch \
file://0007-ARM-dts-orange-pi-zero-Adjust-wifi-settings.patch \
- file://${MACHINE}_defconfig"
+ file://${KERNEL_DEFCONFIG}"
SRC_URI[sha256sum] =
"2cf3accdbf9396141169f5906c77069f61554bc6a2f88c6c1c1983030e4e3ed1"
SRCREV = "c4dc6dcc96ee8cda3311988ab9339a1201d50280"
PV = "4.14.62"
S = "${WORKDIR}/linux-${SRCREV}"
-KERNEL_DEFCONFIG = "${MACHINE}_defconfig"
-
KBUILD_DEPENDS += "liblz4-tool"
--
2.16.4
--
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.
