summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2020-02-10 14:10:03 +0100
committerGitHub <noreply@github.com>2020-02-10 14:10:03 +0100
commitb0c3af35eb9c2add2b7cbb02d57820b8f909cdb6 (patch)
tree932cf0ebe11893949a47d8246da0525842b34e43 /classes
parent6eef6a93107b5d50fc2c3e227c2754db30dbb51a (diff)
parent3a2fecfc1d78e4b161f7180f35fc7d0a1a967ae6 (diff)
downloadmeta-updater-b0c3af35eb9c2add2b7cbb02d57820b8f909cdb6.tar.gz
Merge pull request #669 from liuming50/fix-some-problems-in-image-recipes
Fix some problems in image recipes
Diffstat (limited to 'classes')
-rw-r--r--classes/image_repo_manifest.bbclass2
-rw-r--r--classes/sota.bbclass2
-rw-r--r--classes/target_version_example.bbclass2
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
12HOSTTOOLS_NONFATAL += "repo python"
13
14# Write build information to target filesystem 12# Write build information to target filesystem
15buildinfo_manifest () { 13buildinfo_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 @@
1DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}" 1DISTROOVERRIDES .= "${@bb.utils.contains('DISTRO_FEATURES', 'sota', ':sota', '', d)}"
2 2
3HOSTTOOLS_NONFATAL += "java"
4
5SOTA_CLIENT ??= "aktualizr" 3SOTA_CLIENT ??= "aktualizr"
6SOTA_CLIENT_PROV ??= "aktualizr-shared-prov" 4SOTA_CLIENT_PROV ??= "aktualizr-shared-prov"
7SOTA_DEPLOY_CREDENTIALS ?= "1" 5SOTA_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
3HOSTTOOLS += " git "
4
5deploy_target_version () { 3deploy_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