summaryrefslogtreecommitdiffstats
path: root/classes/sota.bbclass
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-11-19 10:48:58 +0100
committerMing Liu <liu.ming50@gmail.com>2018-11-24 12:12:25 +0100
commitf4cf0698a88631af150782dce9b3dafcb0dbc5d5 (patch)
treebb5fded9e29d420c46759b626ecbc34dcb32f65b /classes/sota.bbclass
parent4eaec14b8204ab5cb2e4a3fa2f19c39326909101 (diff)
downloadmeta-updater-f4cf0698a88631af150782dce9b3dafcb0dbc5d5.tar.gz
meta: drop redundant export syntax
There are quite a few 'export' syntax, they are either not necessary or being redundant. Actually only the variables being referred in ostree or aktualizr need to be exported, we can move them into sota.bbclass so they can be exported once only for all other classes referring to them. And drop all other unnecessary exports. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Diffstat (limited to 'classes/sota.bbclass')
-rw-r--r--classes/sota.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index 7fb54dc..e654071 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -1,4 +1,3 @@
1export BUILD_OTA_TARBALL
2python __anonymous() { 1python __anonymous() {
3 if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): 2 if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
4 d.appendVarFlag("do_image_wic", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) 3 d.appendVarFlag("do_image_wic", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True))
@@ -29,11 +28,13 @@ EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native
29INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" 28INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}"
30 29
31# Please redefine OSTREE_REPO in order to have a persistent OSTree repo 30# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
32OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" 31export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
33OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" 32export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}"
34OSTREE_OSNAME ?= "poky" 33export OSTREE_OSNAME ?= "poky"
34export OSTREE_BOOTLOADER ??= 'u-boot'
35export OSTREE_BOOT_PARTITION ??= "/boot"
36
35INITRAMFS_IMAGE ?= "initramfs-ostree-image" 37INITRAMFS_IMAGE ?= "initramfs-ostree-image"
36OSTREE_BOOTLOADER ??= 'u-boot'
37 38
38GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" 39GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
39GARAGE_SIGN_KEYNAME ?= "garage-key" 40GARAGE_SIGN_KEYNAME ?= "garage-key"