diff options
author | Ming Liu <liu.ming50@gmail.com> | 2020-01-26 22:14:20 +0100 |
---|---|---|
committer | Ming Liu <liu.ming50@gmail.com> | 2020-01-30 16:07:07 +0100 |
commit | 3a2fecfc1d78e4b161f7180f35fc7d0a1a967ae6 (patch) | |
tree | d94f63aac2737a32ce47147b24e3732c76982df4 /classes | |
parent | 01282c3e9ecb1aff1afd58d53f83f4a98ea934a6 (diff) | |
download | meta-updater-3a2fecfc1d78e4b161f7180f35fc7d0a1a967ae6.tar.gz |
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>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_repo_manifest.bbclass | 2 | ||||
-rw-r--r-- | classes/sota.bbclass | 2 | ||||
-rw-r--r-- | classes/target_version_example.bbclass | 2 |
3 files changed, 0 insertions, 6 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 @@ | |||
9 | # For more information, see: | 9 | # For more information, see: |
10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests | 10 | # https://web.archive.org/web/20161224194009/https://wiki.cyanogenmod.org/w/Doc:_Using_manifests |
11 | 11 | ||
12 | HOSTTOOLS_NONFATAL += "repo python" | ||
13 | |||
14 | # Write build information to target filesystem | 12 | # Write build information to target filesystem |
15 | buildinfo_manifest () { | 13 | buildinfo_manifest () { |
16 | if [ $(which repo) ]; then | 14 | if [ $(which repo) ]; then |
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 7bf17a4..71bd303 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -1,7 +1,5 @@ | |||
1 | DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" | 1 | DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" |
2 | 2 | ||
3 | HOSTTOOLS_NONFATAL += "java" | ||
4 | |||
5 | SOTA_CLIENT ??= "aktualizr" | 3 | SOTA_CLIENT ??= "aktualizr" |
6 | SOTA_CLIENT_PROV ??= "aktualizr-shared-prov" | 4 | SOTA_CLIENT_PROV ??= "aktualizr-shared-prov" |
7 | SOTA_DEPLOY_CREDENTIALS ?= "1" | 5 | 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 @@ | |||
1 | # Writes target version to be used by garage-sign | 1 | # Writes target version to be used by garage-sign |
2 | 2 | ||
3 | HOSTTOOLS += " git " | ||
4 | |||
5 | deploy_target_version () { | 3 | deploy_target_version () { |
6 | version=$(git --git-dir=${METADIR}/.repo/manifests/.git/ rev-parse HEAD) | 4 | version=$(git --git-dir=${METADIR}/.repo/manifests/.git/ rev-parse HEAD) |
7 | echo -n ${version} > ${STAGING_DATADIR_NATIVE}/target_version | 5 | echo -n ${version} > ${STAGING_DATADIR_NATIVE}/target_version |