From: Jan Kiszka <[email protected]> We have a regular schema here, so pull that into the distro conf.
Signed-off-by: Jan Kiszka <[email protected]> --- conf/distro/jailhouse-demo.conf | 2 ++ conf/machine/macchiatobin.conf | 2 -- conf/machine/pine64-plus.conf | 1 - conf/machine/ultra96.inc | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/conf/distro/jailhouse-demo.conf b/conf/distro/jailhouse-demo.conf index 116b253..eeb5ea3 100644 --- a/conf/distro/jailhouse-demo.conf +++ b/conf/distro/jailhouse-demo.conf @@ -17,6 +17,8 @@ WKS_FILE ?= "${MACHINE}.wks" PREFERRED_VERSION_jailhouse-${KERNEL_NAME} ?= "0.12" +PREFERRED_PROVIDER_u-boot-${MACHINE} ?= "u-boot-${MACHINE}" + USERS += "root" # 'root' USER_root[password] = "oC3wEGl799tZU" diff --git a/conf/machine/macchiatobin.conf b/conf/machine/macchiatobin.conf index 733960c..4829500 100644 --- a/conf/machine/macchiatobin.conf +++ b/conf/machine/macchiatobin.conf @@ -16,5 +16,3 @@ IMAGER_INSTALL += "u-boot-macchiatobin" IMAGER_BUILD_DEPS += "u-boot-macchiatobin" IMAGE_INSTALL += "u-boot-script" - -PREFERRED_PROVIDER_u-boot-macchiatobin = "u-boot-macchiatobin" diff --git a/conf/machine/pine64-plus.conf b/conf/machine/pine64-plus.conf index 0949ab4..8070b8e 100644 --- a/conf/machine/pine64-plus.conf +++ b/conf/machine/pine64-plus.conf @@ -14,6 +14,5 @@ DISTRO_ARCH = "arm64" IMAGE_TYPE = "wic-img" IMAGER_INSTALL += "u-boot-pine64-plus" IMAGER_BUILD_DEPS += "u-boot-pine64-plus" -PREFERRED_PROVIDER_u-boot-pine64-plus = "u-boot-pine64-plus" IMAGE_INSTALL += "u-boot-script" diff --git a/conf/machine/ultra96.inc b/conf/machine/ultra96.inc index 37637ad..d91ca48 100644 --- a/conf/machine/ultra96.inc +++ b/conf/machine/ultra96.inc @@ -19,6 +19,4 @@ IMAGE_INSTALL_append = " u-boot-script" IMAGE_BOOT_FILES = "/usr/lib/u-boot/ultra96-v${ULTRA96_VERSION}/boot.bin;boot.bin" -PREFERRED_PROVIDER_u-boot-ultra96-v${ULTRA96_VERSION} = "u-boot-ultra96-v${ULTRA96_VERSION}" - IMAGE_PREINSTALL_append = " firmware-ti-connectivity" -- 2.26.2 -- 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]. To view this discussion on the web visit https://groups.google.com/d/msgid/jailhouse-dev/aecf76e9307f0d3b2e8a5990e36fff70afa520f1.1601876389.git.jan.kiszka%40siemens.com.
