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-26 22:27:42 +0100 |
commit | 5a1aeb33bebdd73387e649122fa1f33dbe965243 (patch) | |
tree | e6d03b8a83f8da92b31afa08dcd118c5e78058ac | |
parent | 2b64ba13985bd016d919fac794b4ba00d2495ecf (diff) | |
download | meta-updater-pr/669.tar.gz |
meta: move HOSTTOOLS definitions to sota.conf.incpr/669
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>
-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 | ||||
-rw-r--r-- | conf/distro/sota.conf.inc | 3 |
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 @@ | |||
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 |
diff --git a/conf/distro/sota.conf.inc b/conf/distro/sota.conf.inc index 69d729c..53192e5 100644 --- a/conf/distro/sota.conf.inc +++ b/conf/distro/sota.conf.inc | |||
@@ -17,4 +17,5 @@ INHERIT += "reproducible_build_simple" | |||
17 | export SOURCE_DATE_EPOCH = "0" | 17 | export SOURCE_DATE_EPOCH = "0" |
18 | REPRODUCIBLE_TIMESTAMP_ROOTFS = "0" | 18 | REPRODUCIBLE_TIMESTAMP_ROOTFS = "0" |
19 | 19 | ||
20 | HOSTTOOLS_append = " sync sha256sum" | 20 | HOSTTOOLS += "git sync repo python sha256sum" |
21 | HOSTTOOLS_NONFATAL += "java" | ||