summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2019-08-15 12:23:33 +0200
committerLaurent Bonnans <laurent.bonnans@here.com>2019-08-15 15:34:23 +0200
commit4f902846227f6b3039a6d88d35ffed3921289a9b (patch)
treeda65477add397cee29661de7f79898532f9e1bfd /classes
parent057fdb0ea0eeef1a944c4b6f74e16ee40c445a78 (diff)
downloadmeta-updater-4f902846227f6b3039a6d88d35ffed3921289a9b.tar.gz
Revert "Move OSTREE_BRANCHNAME to image_types_ostree.bbclass."
This reverts commit 8e7a0aeb3682386ed674ed0f682634d6a50983b7. Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
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 a9a8174..2e8e8f5 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -7,8 +7,6 @@ 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}"
12 10
13BUILD_OSTREE_TARBALL ??= "1" 11BUILD_OSTREE_TARBALL ??= "1"
14 12
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index d2a065c..51b0053 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -39,6 +39,7 @@ 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}"
42export OSTREE_OSNAME ?= "poky" 43export OSTREE_OSNAME ?= "poky"
43export OSTREE_BOOTLOADER ??= 'u-boot' 44export OSTREE_BOOTLOADER ??= 'u-boot'
44export OSTREE_BOOT_PARTITION ??= "/boot" 45export OSTREE_BOOT_PARTITION ??= "/boot"
@@ -47,6 +48,7 @@ INITRAMFS_IMAGE ?= "initramfs-ostree-image"
47 48
48GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" 49GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo"
49GARAGE_SIGN_KEYNAME ?= "garage-key" 50GARAGE_SIGN_KEYNAME ?= "garage-key"
51GARAGE_TARGET_NAME ?= "${OSTREE_BRANCHNAME}"
50GARAGE_TARGET_VERSION ?= "" 52GARAGE_TARGET_VERSION ?= ""
51GARAGE_TARGET_URL ?= "" 53GARAGE_TARGET_URL ?= ""
52GARAGE_CUSTOMIZE_TARGET ?= "" 54GARAGE_CUSTOMIZE_TARGET ?= ""
@@ -61,6 +63,6 @@ SOTA_MACHINE_am335x-evm ?= "am335x-evm-wifi"
61SOTA_MACHINE_freedom-u540 ?= "freedom-u540" 63SOTA_MACHINE_freedom-u540 ?= "freedom-u540"
62 64
63SOTA_OVERRIDES_BLACKLIST = "ostree ota" 65SOTA_OVERRIDES_BLACKLIST = "ostree ota"
64SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO" 66SOTA_REQUIRED_VARIABLES = "OSTREE_REPO OSTREE_BRANCHNAME OSTREE_OSNAME OSTREE_BOOTLOADER OSTREE_BOOT_PARTITION GARAGE_SIGN_REPO GARAGE_TARGET_NAME"
65 67
66inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest 68inherit sota_sanity sota_${SOTA_MACHINE} image_repo_manifest