diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-13 17:18:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 17:18:35 +0100 |
| commit | 8c72fd4555dc5637316564895ec3271b40389497 (patch) | |
| tree | 086a72b53c12da03aad93466eaa378301a30438a /classes | |
| parent | 1ea28491acef1c272d1614da1ea4dab3e3e5e43a (diff) | |
| parent | e15634426839166fe829ed9605c69bf8d2d8e091 (diff) | |
| download | meta-updater-8c72fd4555dc5637316564895ec3271b40389497.tar.gz | |
Merge pull request #431 from albard00/master
Fix function name conflict
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/image_repo_manifest.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass index 467fd9a..c2e7056 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | HOSTTOOLS_NONFATAL += " repo " | 12 | HOSTTOOLS_NONFATAL += " repo " |
| 13 | 13 | ||
| 14 | # Write build information to target filesystem | 14 | # Write build information to target filesystem |
| 15 | buildinfo () { | 15 | buildinfo_manifest () { |
| 16 | if [ $(which repo) ]; then | 16 | if [ $(which repo) ]; then |
| 17 | repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" | 17 | repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" |
| 18 | else | 18 | else |
| @@ -20,4 +20,4 @@ buildinfo () { | |||
| 20 | fi | 20 | fi |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | IMAGE_PREPROCESS_COMMAND += "buildinfo;" | 23 | IMAGE_PREPROCESS_COMMAND += "buildinfo_manifest;" |