diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-08-15 12:23:57 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-08-16 11:56:28 +0200 |
commit | d2a57a9bfc8b3939addf92d14d9178f6f9ebb434 (patch) | |
tree | b14a7d973bf9603358cb3280b99348e0617e1f1b /classes | |
parent | edff609356bee7fd8e03764e00da9e58c60c5ba9 (diff) | |
download | meta-updater-d2a57a9bfc8b3939addf92d14d9178f6f9ebb434.tar.gz |
Do not export anything in sota.bbclass
A simple variable definition will be enough and doing an export there
completely kills caching.
Cherry-picked from master with additional fix to use yocto variables
instead of bash ones (not present anymore).
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_ostree.bbclass | 4 | ||||
-rw-r--r-- | classes/image_types_ota.bbclass | 6 | ||||
-rw-r--r-- | classes/sota.bbclass | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 3300a3d..edddf37 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -16,11 +16,11 @@ OSTREE_UPDATE_SUMMARY ??= "0" | |||
16 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" | 16 | SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" |
17 | 17 | ||
18 | IMAGE_CMD_ostree () { | 18 | IMAGE_CMD_ostree () { |
19 | if [ -z "$OSTREE_REPO" ]; then | 19 | if [ -z "${OSTREE_REPO}" ]; then |
20 | bbfatal "OSTREE_REPO should be set in your local.conf" | 20 | bbfatal "OSTREE_REPO should be set in your local.conf" |
21 | fi | 21 | fi |
22 | 22 | ||
23 | if [ -z "$OSTREE_BRANCHNAME" ]; then | 23 | if [ -z "${OSTREE_BRANCHNAME}" ]; then |
24 | bbfatal "OSTREE_BRANCHNAME should be set in your local.conf" | 24 | bbfatal "OSTREE_BRANCHNAME should be set in your local.conf" |
25 | fi | 25 | fi |
26 | 26 | ||
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass index b14d2bb..6d0676b 100644 --- a/classes/image_types_ota.bbclass +++ b/classes/image_types_ota.bbclass | |||
@@ -48,15 +48,15 @@ IMAGE_CMD_otaimg () { | |||
48 | if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'false', 'true', d)}; then | 48 | if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'false', 'true', d)}; then |
49 | return | 49 | return |
50 | fi | 50 | fi |
51 | if [ -z "$OSTREE_REPO" ]; then | 51 | if [ -z "${OSTREE_REPO}" ]; then |
52 | bbfatal "OSTREE_REPO should be set in your local.conf" | 52 | bbfatal "OSTREE_REPO should be set in your local.conf" |
53 | fi | 53 | fi |
54 | 54 | ||
55 | if [ -z "$OSTREE_OSNAME" ]; then | 55 | if [ -z "${OSTREE_OSNAME}" ]; then |
56 | bbfatal "OSTREE_OSNAME should be set in your local.conf" | 56 | bbfatal "OSTREE_OSNAME should be set in your local.conf" |
57 | fi | 57 | fi |
58 | 58 | ||
59 | if [ -z "$OSTREE_BRANCHNAME" ]; then | 59 | if [ -z "${OSTREE_BRANCHNAME}" ]; then |
60 | bbfatal "OSTREE_BRANCHNAME should be set in your local.conf" | 60 | bbfatal "OSTREE_BRANCHNAME should be set in your local.conf" |
61 | fi | 61 | fi |
62 | 62 | ||
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 61d27ad..85401d5 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -40,11 +40,11 @@ EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native | |||
40 | OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" | 40 | OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'ext4.gz.u-boot', 'ext4.gz')}" |
41 | 41 | ||
42 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 42 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
43 | export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 43 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |
44 | export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" | 44 | OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" |
45 | export OSTREE_OSNAME ?= "poky" | 45 | OSTREE_OSNAME ?= "poky" |
46 | export OSTREE_BOOTLOADER ??= 'u-boot' | 46 | OSTREE_BOOTLOADER ??= 'u-boot' |
47 | export OSTREE_BOOT_PARTITION ??= "/boot" | 47 | OSTREE_BOOT_PARTITION ??= "/boot" |
48 | 48 | ||
49 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 49 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
50 | 50 | ||