meta: move HOSTTOOLS definitions to sota.conf.inc

HOSTTOOLS and HOSTTOOLS_NONFATAL are global variables that being
handled in base_eventhandler, so they must be defined in config files
or in INHERIT classes or classes being inherited by base.bbclass, or
else we might run into the following problems:
```
$ bitbake pkgname
$ bitbake imgname
```

the HOSTTOOLS and HOSTTOOLS_NONFATAL in the above image recipe, for
instance, 'repo python' in image_repo_manifest.bbclass, they would not
be copied to HOSTTOOLS_DIR.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>

4 files changed, 2 insertions, 7 deletions

diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass
index 0b311bd..72dc28f 100644
--- a/classes/image_repo_manifest.bbclass
+++ b/classes/image_repo_manifest.bbclass
@@ -9,8 +9,6 @@
 # For more information, see:
 # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests 
 
-HOSTTOOLS_NONFATAL += "repo python"
-
 # Write build information to target filesystem
 buildinfo_manifest () {
   if [ $(which repo) ]; then
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index f6e904e..c248cfc 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -1,7 +1,5 @@
 DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
 
-HOSTTOOLS_NONFATAL += "java"
-
 SOTA_CLIENT ??= "aktualizr"
 SOTA_CLIENT_PROV ??= "aktualizr-shared-prov"
 SOTA_DEPLOY_CREDENTIALS ?= "1"
diff --git a/classes/target_version_example.bbclass b/classes/target_version_example.bbclass
index ef119fb..c0b5aec 100644
--- a/classes/target_version_example.bbclass
+++ b/classes/target_version_example.bbclass
@@ -1,7 +1,5 @@
 # Writes target version to be used by garage-sign
 
-HOSTTOOLS += " git "
-
 deploy_target_version () {
   version=$(git --git-dir=${METADIR}/.repo/manifests/.git/ rev-parse HEAD)
   echo -n ${version} > ${STAGING_DATADIR_NATIVE}/target_version
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc
index f6111bf..1d5f8df 100644
--- a/conf/distro/sota.conf.inc
+++ b/conf/distro/sota.conf.inc
@@ -16,4 +16,5 @@ INHERIT += "reproducible_build_simple"
 export SOURCE_DATE_EPOCH ?= "0"
 REPRODUCIBLE_TIMESTAMP_ROOTFS ?= "0"
 
-HOSTTOOLS_append = " sync sha256sum"
+HOSTTOOLS += "git sync sha256sum"
+HOSTTOOLS_NONFATAL += "java repo python"