diff options
author | lbonn <lbonn@users.noreply.github.com> | 2019-07-19 17:30:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-19 17:30:09 +0200 |
commit | cf23d8f94bd5ef4b728588d0e070a3929b811261 (patch) | |
tree | 9721d6a7b06670f9d7c381e3f036c55f0c204e9d /classes/sota.bbclass | |
parent | d965046f12f9a29b166949b8c27bdf96fba6d3b7 (diff) | |
parent | 8e7a0aeb3682386ed674ed0f682634d6a50983b7 (diff) | |
download | meta-updater-cf23d8f94bd5ef4b728588d0e070a3929b811261.tar.gz |
Merge pull request #550 from advancedtelematic/fix/branch-rebuild
Move OSTREE_BRANCHNAME to image_types_ostree.bbclass.
Diffstat (limited to 'classes/sota.bbclass')
-rw-r--r-- | classes/sota.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 94c3043..1a9d68b 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -39,7 +39,6 @@ INITRAMFS_FSTYPES ?= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER') == 'u-boo | |||
39 | 39 | ||
40 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 40 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
41 | export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 41 | export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |
42 | export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" | ||
43 | export OSTREE_OSNAME ?= "poky" | 42 | export OSTREE_OSNAME ?= "poky" |
44 | export OSTREE_BOOTLOADER ??= 'u-boot' | 43 | export OSTREE_BOOTLOADER ??= 'u-boot' |
45 | export OSTREE_BOOT_PARTITION ??= "/boot" | 44 | export OSTREE_BOOT_PARTITION ??= "/boot" |
@@ -48,7 +47,6 @@ INITRAMFS_IMAGE ?= "initramfs-ostree-image" | |||
48 | 47 | ||
49 | GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" | 48 | GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" |
50 | GARAGE_SIGN_KEYNAME ?= "garage-key" | 49 | GARAGE_SIGN_KEYNAME ?= "garage-key" |
51 | GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}" | ||
52 | GARAGE_TARGET_VERSION ?= "" | 50 | GARAGE_TARGET_VERSION ?= "" |
53 | GARAGE_TARGET_URL ?= "" | 51 | GARAGE_TARGET_URL ?= "" |
54 | GARAGE_CUSTOMIZE_TARGET ?= "" | 52 | GARAGE_CUSTOMIZE_TARGET ?= "" |
@@ -62,6 +60,6 @@ SOTA_MACHINE_qemux86-64 ?= "qemux86-64" | |||
62 | SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" | 60 | SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" |
63 | 61 | ||
64 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" | 62 | SOTA_OVERRIDES_BLACKLIST = "ostree ota" |
65 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" | 63 | SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO" |
66 | 64 | ||
67 | inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest | 65 | inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest |