summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorlbonn <lbonn@users.noreply.github.com>2019-07-19 17:30:09 +0200
committerGitHub <noreply@github.com>2019-07-19 17:30:09 +0200
commitcf23d8f94bd5ef4b728588d0e070a3929b811261 (patch)
tree9721d6a7b06670f9d7c381e3f036c55f0c204e9d /classes
parentd965046f12f9a29b166949b8c27bdf96fba6d3b7 (diff)
parent8e7a0aeb3682386ed674ed0f682634d6a50983b7 (diff)
downloadmeta-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')
-rw-r--r--classes/image_types_ostree.bbclass2
-rw-r--r--classes/sota.bbclass4
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 5301c18..5b975f0 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -7,6 +7,8 @@ OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}"
7OSTREE_COMMIT_BODY ??= "" 7OSTREE_COMMIT_BODY ??= ""
8OSTREE_UPDATE_SUMMARY ??= "0" 8OSTREE_UPDATE_SUMMARY ??= "0"
9OSTREE_DEPLOY_DEVICETREE ??= "0" 9OSTREE_DEPLOY_DEVICETREE ??= "0"
10OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}"
11GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
10 12
11BUILD_OSTREE_TARBALL ??= "1" 13BUILD_OSTREE_TARBALL ??= "1"
12 14
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
41export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" 41export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
42export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}"
43export OSTREE_OSNAME ?= "poky" 42export OSTREE_OSNAME ?= "poky"
44export OSTREE_BOOTLOADER ??= 'u-boot' 43export OSTREE_BOOTLOADER ??= 'u-boot'
45export OSTREE_BOOT_PARTITION ??= "/boot" 44export OSTREE_BOOT_PARTITION ??= "/boot"
@@ -48,7 +47,6 @@ INITRAMFS_IMAGE ?= "initramfs-ostree-image"
48 47
49GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" 48GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
50GARAGE_SIGN_KEYNAME ?= "garage-key" 49GARAGE_SIGN_KEYNAME ?= "garage-key"
51GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
52GARAGE_TARGET_VERSION ?= "" 50GARAGE_TARGET_VERSION ?= ""
53GARAGE_TARGET_URL ?= "" 51GARAGE_TARGET_URL ?= ""
54GARAGE_CUSTOMIZE_TARGET ?= "" 52GARAGE_CUSTOMIZE_TARGET ?= ""
@@ -62,6 +60,6 @@ SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
62SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" 60SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
63 61
64SOTA_OVERRIDES_BLACKLIST = "ostree ota" 62SOTA_OVERRIDES_BLACKLIST = "ostree ota"
65SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" 63SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO"
66 64
67inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest 65inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest