From f4cf0698a88631af150782dce9b3dafcb0dbc5d5 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Mon, 19 Nov 2018 10:48:58 +0100 Subject: 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 --- classes/image_types_ostree.bbclass | 13 ++++--------- classes/image_types_ota.bbclass | 10 +--------- classes/sota.bbclass | 11 ++++++----- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 71cacc6..44a3aa4 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass @@ -7,17 +7,12 @@ do_image_ostree[depends] += "ostree-native:do_populate_sysroot \ " do_image_ostree[lockfiles] += "${OSTREE_REPO}/ostree.lock" -export OSTREE_REPO -export OSTREE_BRANCHNAME -export GARAGE_TARGET_NAME - OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}" - OSTREE_COMMIT_SUBJECT ??= "Commit-id: ${IMAGE_NAME}" OSTREE_COMMIT_BODY ??= "" OSTREE_UPDATE_SUMMARY ??= "0" -export SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" +SYSTEMD_USED = "${@oe.utils.ifelse(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'systemd', 'true', '')}" IMAGE_CMD_ostree () { if [ -z "$OSTREE_REPO" ]; then @@ -62,7 +57,7 @@ IMAGE_CMD_ostree () { fi done - if [ -n "$SYSTEMD_USED" ]; then + if [ -n "${SYSTEMD_USED}" ]; then mkdir -p usr/etc/tmpfiles.d tmpfiles_conf=usr/etc/tmpfiles.d/00ostree-tmpfiles.conf echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf} @@ -98,7 +93,7 @@ IMAGE_CMD_ostree () { bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr" fi - if [ -n "$SYSTEMD_USED" ]; then + if [ -n "${SYSTEMD_USED}" ]; then echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf} else echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf} @@ -113,7 +108,7 @@ IMAGE_CMD_ostree () { bbfatal "Data in /root directory is not preserved by OSTree." fi - if [ -n "$SYSTEMD_USED" ]; then + if [ -n "${SYSTEMD_USED}" ]; then echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf} else echo "mkdir -p /var/roothome; chown 755 /var/roothome" >>${tmpfiles_conf} 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 () { echo "${SIZE}" } -export OSTREE_OSNAME -export OSTREE_BRANCHNAME -export OSTREE_REPO -export OSTREE_BOOTLOADER - -export GARAGE_TARGET_NAME - -export OTA_SYSROOT="${WORKDIR}/ota-sysroot" +OTA_SYSROOT = "${WORKDIR}/ota-sysroot" ## Common OTA image setup fakeroot do_otasetup () { @@ -88,7 +81,6 @@ fakeroot do_otasetup () { ostree_target_hash=$(cat ${OSTREE_REPO}/refs/heads/${OSTREE_BRANCHNAME}) ostree --repo=${OTA_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${ostree_target_hash} - export OSTREE_BOOT_PARTITION="/boot" kargs_list="" for arg in ${OSTREE_KERNEL_ARGS}; do kargs_list="${kargs_list} --karg-append=$arg" diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 7fb54dc..e654071 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass @@ -1,4 +1,3 @@ -export BUILD_OTA_TARBALL python __anonymous() { if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): d.appendVarFlag("do_image_wic", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) @@ -29,11 +28,13 @@ EXTRA_IMAGEDEPENDS_append_sota = " parted-native mtools-native dosfstools-native INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'cpio.gz.u-boot', 'cpio.gz')}" # Please redefine OSTREE_REPO in order to have a persistent OSTree repo -OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" -OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" -OSTREE_OSNAME ?= "poky" +export OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" +export OSTREE_BRANCHNAME ?= "${SOTA_HARDWARE_ID}" +export OSTREE_OSNAME ?= "poky" +export OSTREE_BOOTLOADER ??= 'u-boot' +export OSTREE_BOOT_PARTITION ??= "/boot" + INITRAMFS_IMAGE ?= "initramfs-ostree-image" -OSTREE_BOOTLOADER ??= 'u-boot' GARAGE_SIGN_REPO ?= "${DEPLOY_DIR_IMAGE}/garage_sign_repo" GARAGE_SIGN_KEYNAME ?= "garage-key" -- cgit v1.2.3-54-g00ecf