summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <p@beta16.co.uk>2017-04-24 09:39:01 +0200
committerGitHub <noreply@github.com>2017-04-24 09:39:01 +0200
commit4f1a20b93657c68ed60b181369a421f27289714d (patch)
treeb918d83a006c03b46a4f536ccf7f10d8a8ca51b8
parent39049ace3ce0636174f606626aa5e366c7033b35 (diff)
parentfe58cc2394283801d7fecc329a8d6e278373938a (diff)
downloadmeta-updater-4f1a20b93657c68ed60b181369a421f27289714d.tar.gz
Merge pull request #55 from advancedtelematic/switchupdater
Merge changes required by AGL
-rw-r--r--classes/image_types_ota.bbclass2
-rw-r--r--conf/distro/sota.conf.inc13
-rw-r--r--recipes-core/images/initramfs-ostree-image.bb1
3 files changed, 8 insertions, 8 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 819a83c..cb71899 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -9,6 +9,8 @@
9 9
10inherit image 10inherit image
11 11
12OSTREE_BOOTLOADER ??= 'u-boot'
13
12IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \ 14IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
13 ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \ 15 ${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \
14 ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}" 16 ${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}"
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index a7d3aae..e334df0 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -5,19 +5,16 @@ IMAGE_INSTALL_append = " ostree os-release rvi-sota-client"
5 5
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"
9
10# if don't build wic image unless IMAGE_BOOT_FILES is set. Prevents build from failing
11# on machines that don't support updater yet
12IMAGE_FSTYPES += "${@' wic' if (d.getVar("IMAGE_BOOT_FILES", True)) else ''}"
9WKS_FILE ?= "sdimage-sota.wks" 13WKS_FILE ?= "sdimage-sota.wks"
10do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg" 14do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
11 15
12EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native" 16EXTRA_IMAGEDEPENDS += " parted-native mtools-native dosfstools-native"
13 17
14# No working WKS for Raspberry Pi yet
15IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
16IMAGE_FSTYPES_remove_raspberrypi2 = "wic"
17
18# QEMU emulation uses plain otaimg, no wic needed
19IMAGE_FSTYPES_remove_qemux86-64 = "wic"
20
21# Please redefine OSTREE_REPO in order to have a persistent OSTree repo 18# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
22OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" 19OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
23OSTREE_BRANCHNAME ?= "ota-${MACHINE}" 20OSTREE_BRANCHNAME ?= "ota-${MACHINE}"
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb
index 8eea07c..509b74d 100644
--- a/recipes-core/images/initramfs-ostree-image.bb
+++ b/recipes-core/images/initramfs-ostree-image.bb
@@ -15,6 +15,7 @@ LICENSE = "MIT"
15 15
16IMAGE_FSTYPES = "ext4.gz" 16IMAGE_FSTYPES = "ext4.gz"
17IMAGE_FSTYPES_append_arm = " ext4.gz.u-boot" 17IMAGE_FSTYPES_append_arm = " ext4.gz.u-boot"
18IMAGE_CLASSES_append_arm = " image_types_uboot"
18 19
19inherit core-image 20inherit core-image
20 21