diff options
| author | Alexandre Bard <alexandre.bard@netmodule.com> | 2018-11-13 12:04:45 +0100 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-11-29 11:12:15 +0100 |
| commit | 7511a219525ff195c4412db77b9638cff41c3264 (patch) | |
| tree | 59d230968990e9ba974ba61f90bd022133b04f8a | |
| parent | dc878039e6059ac5835c4d11c1c561603c62e810 (diff) | |
| download | meta-updater-7511a219525ff195c4412db77b9638cff41c3264.tar.gz | |
Fix function name conflict
buildinfo function name is used in poky:
meta/classes/image-buildinfo.bbclass
Both classes could not be used together
Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com>
| -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;" |