diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-02-10 14:10:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-10 14:10:03 +0100 |
commit | b0c3af35eb9c2add2b7cbb02d57820b8f909cdb6 (patch) | |
tree | 932cf0ebe11893949a47d8246da0525842b34e43 | |
parent | 6eef6a93107b5d50fc2c3e227c2754db30dbb51a (diff) | |
parent | 3a2fecfc1d78e4b161f7180f35fc7d0a1a967ae6 (diff) | |
download | meta-updater-b0c3af35eb9c2add2b7cbb02d57820b8f909cdb6.tar.gz |
Merge pull request #669 from liuming50/fix-some-problems-in-image-recipes
Fix some problems in image recipes
-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 | ||||
-rw-r--r-- | recipes-core/images/initramfs-ostree-image.bb | 4 |
5 files changed, 4 insertions, 9 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..9804694 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 sha256sum" |
21 | HOSTTOOLS_NONFATAL += "java repo python" | ||
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/recipes-core/images/initramfs-ostree-image.bb index 7e03f3d..936c59a 100644 --- a/recipes-core/images/initramfs-ostree-image.bb +++ b/recipes-core/images/initramfs-ostree-image.bb | |||
@@ -13,6 +13,8 @@ IMAGE_LINGUAS = "" | |||
13 | 13 | ||
14 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |
15 | 15 | ||
16 | IMAGE_CLASSES_remove = "image_repo_manifest" | ||
17 | |||
16 | IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" | 18 | IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" |
17 | 19 | ||
18 | # Avoid circular dependencies | 20 | # Avoid circular dependencies |
@@ -28,5 +30,3 @@ IMAGE_ROOTFS_EXTRA_SPACE = "0" | |||
28 | IMAGE_OVERHEAD_FACTOR = "1.0" | 30 | IMAGE_OVERHEAD_FACTOR = "1.0" |
29 | 31 | ||
30 | BAD_RECOMMENDATIONS += "busybox-syslog" | 32 | BAD_RECOMMENDATIONS += "busybox-syslog" |
31 | |||
32 | IMAGE_PREPROCESS_COMMAND_remove = "buildinfo_manifest;" | ||