summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Gerasimov <anton@advancedtelematic.com>2017-04-06 12:44:43 +0200
committerAnton Gerasimov <anton@advancedtelematic.com>2017-04-07 16:59:28 +0200
commit64ceafc0b46facd4a9a1eada9debe3b01cb5815c (patch)
treed2def2ce8abe3d3d1e9ff96d36ace59e8a835ae7
parent610469510ec9dbac95fc415f71abdcb55e0fc18b (diff)
downloadmeta-updater-64ceafc0b46facd4a9a1eada9debe3b01cb5815c.tar.gz
Fix small bugs, fix WIC for minnowboard
-rw-r--r--conf/distro/sota.conf.inc4
-rw-r--r--conf/include/local/sota_minnowboard.inc6
-rw-r--r--conf/include/local/sota_porter.inc1
-rw-r--r--scripts/lib/wic/plugins/source/otaimage.py (renamed from scripts/lib/wic/plugins/otaimage.py)0
4 files changed, 8 insertions, 3 deletions
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"
6# live image for OSTree-enabled systems 6# live image for OSTree-enabled systems
7IMAGE_CLASSES += "image_types_ostree image_types_ota" 7IMAGE_CLASSES += "image_types_ostree image_types_ota"
8IMAGE_FSTYPES += "ostreepush otaimg wic" 8IMAGE_FSTYPES += "ostreepush otaimg wic"
9WKS_FILE = "sdimage-sota.wks" 9WKS_FILE ?= "sdimage-sota.wks"
10do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" 10do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
11 11
12EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
13
12# No working WKS for Raspberry Pi yet 14# No working WKS for Raspberry Pi yet
13IMAGE_FSTYPES_remove_raspberrypi3 = "wic" 15IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
14IMAGE_FSTYPES_remove_raspberrypi2 = "wic" 16IMAGE_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"
2 2
3PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota" 3PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
4UBOOT_MACHINE = "minnowmax_defconfig" 4UBOOT_MACHINE = "minnowmax_defconfig"
5IMAGE_CLASSES_append = " sdcard_image-minnowboard-ota" 5
6IMAGE_FSTYPES += "minnowboard-sdimg-ota" 6EXTRA_IMAGEDEPENDS_append = " minnowboard-bootfiles"
7IMAGE_BOOT_FILES = "minnowboard-bootfiles/*"
8
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"
3# Commit united image to OSTree, not just uImage 3# Commit united image to OSTree, not just uImage
4OSTREE_KERNEL = "uImage+dtb" 4OSTREE_KERNEL = "uImage+dtb"
5 5
6EXTRA_IMAGEDEPENDS_append = " porter-bootfiles"
6IMAGE_CLASSES_append = " image_types_uboot " 7IMAGE_CLASSES_append = " image_types_uboot "
7IMAGE_BOOT_FILES = "porter-bootfiles/*" 8IMAGE_BOOT_FILES = "porter-bootfiles/*"
8 9
diff --git a/scripts/lib/wic/plugins/otaimage.py b/scripts/lib/wic/plugins/source/otaimage.py
index 016c996..016c996 100644
--- a/scripts/lib/wic/plugins/otaimage.py
+++ b/scripts/lib/wic/plugins/source/otaimage.py