summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-07-10 16:15:23 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2019-07-18 15:58:38 +0200
commit8e7a0aeb3682386ed674ed0f682634d6a50983b7 (patch)
tree9f57e8eb3e8ab96b87f4223056ff5a945a59ce2c
parentb11e4ab227bed2e368646cb348e41a4603ed55e0 (diff)
downloadmeta-updater-8e7a0aeb3682386ed674ed0f682634d6a50983b7.tar.gz
Move OSTREE_BRANCHNAME to image_types_ostree.bbclass.fix/branch-rebuild
If it is set in sota.bbclass and overwritten in local.conf, bitbake will rebuild everything. Now bitbake should only rerun the commands in image_types_ostree (and image_types_ota) as expected. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
-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 56d4d76..c9173d4 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 bf27b6d..743bd3b 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 ?= ""
54 52
@@ -61,6 +59,6 @@ SOTA_MACHINE_qemux86-64 ?= "qemux86-64"
61SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi" 59SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
62 60
63SOTA_OVERRIDES_BLACKLIST = "ostree ota" 61SOTA_OVERRIDES_BLACKLIST = "ostree ota"
64SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME" 62SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO"
65 63
66inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest 64inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest