From: Jan Kiszka <[email protected]> This makes the multiconfig files independent of meta-isar config files and consolidates commodities further. The outcome are targeted config files that provide no use case for weak assignments anymore, thus they are converted to regular ones.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 4 ++++ conf/multiconfig/nuc6cay-jailhouse.conf | 7 +++++-- conf/multiconfig/orangepi-zero-jailhouse.conf | 17 +++++++---------- .../{qemuamd64-jailhouse.conf => qemu-target.inc} | 4 ---- conf/multiconfig/qemuamd64-jailhouse.conf | 8 +++----- conf/multiconfig/qemuarm64-jailhouse.conf | 6 +++--- 6 files changed, 22 insertions(+), 24 deletions(-) copy conf/multiconfig/{qemuamd64-jailhouse.conf => qemu-target.inc} (73%) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index dc5148e..489f629 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -11,4 +11,8 @@ require conf/distro/debian-stretch.conf +IMAGE_PREINSTALL += "init" + +KERNEL_NAME = "jailhouse-${DISTRO_ARCH}" + PREFERRED_VERSION_jailhouse ?= "0.9.1" diff --git a/conf/multiconfig/nuc6cay-jailhouse.conf b/conf/multiconfig/nuc6cay-jailhouse.conf index ea70573..02ac36c 100644 --- a/conf/multiconfig/nuc6cay-jailhouse.conf +++ b/conf/multiconfig/nuc6cay-jailhouse.conf @@ -9,10 +9,13 @@ # SPDX-License-Identifier: GPL-2.0 # -require conf/multiconfig/qemuamd64-jailhouse.conf - MACHINE = "nuc6cay" +DISTRO = "jailhouse-demo" +DISTRO_ARCH = "amd64" + +IMAGE_TYPE = "wic-img" WKS_FILE = "nuc6cay" +IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" IMAGE_PREINSTALL_append = " firmware-iwlwifi" diff --git a/conf/multiconfig/orangepi-zero-jailhouse.conf b/conf/multiconfig/orangepi-zero-jailhouse.conf index 231cc2c..a63f607 100644 --- a/conf/multiconfig/orangepi-zero-jailhouse.conf +++ b/conf/multiconfig/orangepi-zero-jailhouse.conf @@ -9,24 +9,21 @@ # SPDX-License-Identifier: GPL-2.0 # -MACHINE ?= "orangepi-zero" - -ROOTFS_DEV ?= "mmcblk0p1" - -require conf/multiconfig/qemuarm-stretch.conf +MACHINE = "orangepi-zero" DISTRO = "jailhouse-demo" - -KERNEL_NAME = "jailhouse-armhf" - -IMAGE_INSTALL_append = " xradio" +DISTRO_ARCH = "armhf" IMAGE_TYPE = "wic-img" -WKS_FILE ?= "orangepi-zero" +WKS_FILE = "orangepi-zero" IMAGER_INSTALL += "u-boot-sunxi" +ROOTFS_DEV = "mmcblk0p1" + DISTRO_APT_SOURCES_append = " conf/distro/debian-buster.list" DISTRO_APT_PREFERENCES += "conf/multiconfig/preferences.orangepi-zero.conf" +IMAGE_INSTALL_append = " xradio" + MACHINE_SERIAL = "ttyS0" BAUDRATE_TTY = "115200" diff --git a/conf/multiconfig/qemuamd64-jailhouse.conf b/conf/multiconfig/qemu-target.inc similarity index 73% copy from conf/multiconfig/qemuamd64-jailhouse.conf copy to conf/multiconfig/qemu-target.inc index 90ce8a9..1495c30 100644 --- a/conf/multiconfig/qemuamd64-jailhouse.conf +++ b/conf/multiconfig/qemu-target.inc @@ -9,10 +9,6 @@ # SPDX-License-Identifier: GPL-2.0 # -require conf/multiconfig/qemuamd64-stretch.conf - DISTRO = "jailhouse-demo" -KERNEL_NAME = "jailhouse-amd64" - IMAGE_TYPE = "ext4-img" diff --git a/conf/multiconfig/qemuamd64-jailhouse.conf b/conf/multiconfig/qemuamd64-jailhouse.conf index 90ce8a9..53d3731 100644 --- a/conf/multiconfig/qemuamd64-jailhouse.conf +++ b/conf/multiconfig/qemuamd64-jailhouse.conf @@ -9,10 +9,8 @@ # SPDX-License-Identifier: GPL-2.0 # -require conf/multiconfig/qemuamd64-stretch.conf +require qemu-target.inc -DISTRO = "jailhouse-demo" +MACHINE = "qemuamd64" -KERNEL_NAME = "jailhouse-amd64" - -IMAGE_TYPE = "ext4-img" +DISTRO_ARCH = "amd64" diff --git a/conf/multiconfig/qemuarm64-jailhouse.conf b/conf/multiconfig/qemuarm64-jailhouse.conf index 2c841fb..4fee06b 100644 --- a/conf/multiconfig/qemuarm64-jailhouse.conf +++ b/conf/multiconfig/qemuarm64-jailhouse.conf @@ -9,8 +9,8 @@ # SPDX-License-Identifier: GPL-2.0 # -require conf/multiconfig/qemuarm64-stretch.conf +require qemu-target.inc -DISTRO = "jailhouse-demo" +MACHINE = "qemuarm64" -KERNEL_NAME = "jailhouse-arm64" +DISTRO_ARCH = "arm64" -- 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 [email protected]. For more options, visit https://groups.google.com/d/optout.
