From 64ceafc0b46facd4a9a1eada9debe3b01cb5815c Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 6 Apr 2017 12:44:43 +0200 Subject: Fix small bugs, fix WIC for minnowboard --- conf/distro/sota.conf.inc | 4 +++- conf/include/local/sota_minnowboard.inc | 6 ++++-- conf/include/local/sota_porter.inc | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'conf') diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 55e9cac..a2d8184 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc @@ -6,9 +6,11 @@ IMAGE_INSTALL_append = " ostree os-release" # live image for OSTree-enabled systems IMAGE_CLASSES += "image_types_ostree image_types_ota" IMAGE_FSTYPES += "ostreepush otaimg wic" -WKS_FILE = "sdimage-sota.wks" +WKS_FILE ?= "sdimage-sota.wks" do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" +EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native" + # No working WKS for Raspberry Pi yet IMAGE_FSTYPES_remove_raspberrypi3 = "wic" IMAGE_FSTYPES_remove_raspberrypi2 = "wic" diff --git a/conf/include/local/sota_minnowboard.inc b/conf/include/local/sota_minnowboard.inc index b3702a2..0bd4210 100644 --- a/conf/include/local/sota_minnowboard.inc +++ b/conf/include/local/sota_minnowboard.inc @@ -2,5 +2,7 @@ MACHINE = "intel-corei7-64" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota" UBOOT_MACHINE = "minnowmax_defconfig" -IMAGE_CLASSES_append = " sdcard_image-minnowboard-ota" -IMAGE_FSTYPES += "minnowboard-sdimg-ota" + +EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles" +IMAGE_BOOT_FILES = "minnowboard-bootfiles/*" + diff --git a/conf/include/local/sota_porter.inc b/conf/include/local/sota_porter.inc index e079e4d..fcda041 100644 --- a/conf/include/local/sota_porter.inc +++ b/conf/include/local/sota_porter.inc @@ -3,6 +3,7 @@ MACHINE = "porter" # Commit united image to OSTree, not just uImage OSTREE_KERNEL = "uImage+dtb" +EXTRA_IMAGEDEPENDS_append = " porter-bootfiles" IMAGE_CLASSES_append = " image_types_uboot " IMAGE_BOOT_FILES = "porter-bootfiles/*" -- cgit v1.2.3-54-g00ecf