summaryrefslogtreecommitdiffstats
path: root/classes/image_types_ota.bbclass
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-11-19 10:48:58 +0100
committerMing Liu <liu.ming50@gmail.com>2018-11-24 12:12:25 +0100
commitf4cf0698a88631af150782dce9b3dafcb0dbc5d5 (patch)
treebb5fded9e29d420c46759b626ecbc34dcb32f65b /classes/image_types_ota.bbclass
parent4eaec14b8204ab5cb2e4a3fa2f19c39326909101 (diff)
downloadmeta-updater-f4cf0698a88631af150782dce9b3dafcb0dbc5d5.tar.gz
meta: drop redundant export syntax
There are quite a few 'export' syntax, they are either not necessary or being redundant. Actually only the variables being referred in ostree or aktualizr need to be exported, we can move them into sota.bbclass so they can be exported once only for all other classes referring to them. And drop all other unnecessary exports. Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Diffstat (limited to 'classes/image_types_ota.bbclass')
-rw-r--r--classes/image_types_ota.bbclass10
1 files changed, 1 insertions, 9 deletions
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 790ac31..79de909 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -43,14 +43,7 @@ calculate_size () {
43 echo "${SIZE}" 43 echo "${SIZE}"
44} 44}
45 45
46export OSTREE_OSNAME 46OTA_SYSROOT = "${WORKDIR}/ota-sysroot"
47export OSTREE_BRANCHNAME
48export OSTREE_REPO
49export OSTREE_BOOTLOADER
50
51export GARAGE_TARGET_NAME
52
53export OTA_SYSROOT="${WORKDIR}/ota-sysroot"
54 47
55## Common OTA image setup 48## Common OTA image setup
56fakeroot do_otasetup () { 49fakeroot do_otasetup () {
@@ -88,7 +81,6 @@ fakeroot do_otasetup () {
88 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) 81 ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME})
89 82
90 ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash} 83 ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash}
91 export OSTREE_BOOT_PARTITION="/boot"
92 kargs_list="" 84 kargs_list=""
93 for arg in ${OSTREE_KERNEL_ARGS}; do 85 for arg in ${OSTREE_KERNEL_ARGS}; do
94 kargs_list="${kargs_list} --karg-append=$arg" 86 kargs_list="${kargs_list} --karg-append=$arg"