diff options
author | Anatoliy Odukha <aodukha@gmail.com> | 2021-08-05 14:22:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-05 14:22:58 +0300 |
commit | f29bd466855c3b57a264c34764504c0837ab0eb2 (patch) | |
tree | 9acfde74b457f8f555277179f0d8fa8ca44d1944 /classes/sota.bbclass | |
parent | a0d9835bad4c86416323b1055315fc1fb09bcde5 (diff) | |
parent | f46d8ef7e0eaa3c3df743fff3821115697093d7b (diff) | |
download | meta-updater-f29bd466855c3b57a264c34764504c0837ab0eb2.tar.gz |
Merge pull request #816 from shr-project/jansa/master
Convert to new override syntax
Diffstat (limited to 'classes/sota.bbclass')
-rw-r--r-- | classes/sota.bbclass | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index a331fa4..9eccdcd 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -5,7 +5,7 @@ SOTA_DEPLOY_CREDENTIALS ?= "1" | |||
5 | SOTA_HARDWARE_ID ??= "${MACHINE}" | 5 | SOTA_HARDWARE_ID ??= "${MACHINE}" |
6 | 6 | ||
7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" | 7 | IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest" |
8 | IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ | 8 | IMAGE_INSTALL:append:sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \ |
9 | ostree os-release ostree-kernel ostree-initramfs \ | 9 | ostree os-release ostree-kernel ostree-initramfs \ |
10 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" | 10 | ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}" |
11 | 11 | ||
@@ -13,12 +13,12 @@ IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush ga | |||
13 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" | 13 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OSTREE_TARBALL', '1', 'ostree.tar.bz2', ' ', d)}" |
14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota.tar.xz', ' ', d)}" | 14 | IMAGE_FSTYPES += "${@bb.utils.contains('BUILD_OTA_TARBALL', '1', 'ota.tar.xz', ' ', d)}" |
15 | 15 | ||
16 | PACKAGECONFIG_append_pn-curl = " ssl" | 16 | PACKAGECONFIG:append:pn-curl = " ssl" |
17 | PACKAGECONFIG_remove_pn-curl = "gnutls" | 17 | PACKAGECONFIG:remove:pn-curl = "gnutls" |
18 | 18 | ||
19 | WKS_FILE_sota ?= "sdimage-sota.wks" | 19 | WKS_FILE:sota ?= "sdimage-sota.wks" |
20 | 20 | ||
21 | EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native" | 21 | EXTRA_IMAGEDEPENDS:append:sota = " parted-native mtools-native dosfstools-native" |
22 | 22 | ||
23 | INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" | 23 | INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" |
24 | 24 | ||
@@ -46,13 +46,13 @@ GARAGE_TARGET_EXPIRE_AFTER ?= "" | |||
46 | GARAGE_CUSTOMIZE_TARGET ?= "" | 46 | GARAGE_CUSTOMIZE_TARGET ?= "" |
47 | 47 | ||
48 | SOTA_MACHINE ??="none" | 48 | SOTA_MACHINE ??="none" |
49 | SOTA_MACHINE_rpi ?= "raspberrypi" | 49 | SOTA_MACHINE:rpi ?= "raspberrypi" |
50 | SOTA_MACHINE_porter ?= "porter" | 50 | SOTA_MACHINE:porter ?= "porter" |
51 | SOTA_MACHINE_m3ulcb = "m3ulcb" | 51 | SOTA_MACHINE:m3ulcb = "m3ulcb" |
52 | SOTA_MACHINE_intel-corei7-64 ?= "minnowboard" | 52 | SOTA_MACHINE:intel-corei7-64 ?= "minnowboard" |
53 | SOTA_MACHINE_qemux86-64 ?= "qemux86-64" | 53 | SOTA_MACHINE:qemux86-64 ?= "qemux86-64" |
54 | SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" | 54 | SOTA_MACHINE:am335x-evm ?= "am335x-evm-wifi" |
55 | SOTA_MACHINE_freedom-u540 ?= "freedom-u540" | 55 | SOTA_MACHINE:freedom-u540 ?= "freedom-u540" |
56 | 56 | ||
57 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" | 57 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" |
58 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" | 58 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" |