diff options
| author | Phil Wise <phil@advancedtelematic.com> | 2017-11-28 08:22:26 +0100 |
|---|---|---|
| committer | Phil Wise <phil@advancedtelematic.com> | 2017-11-28 08:22:26 +0100 |
| commit | 6f13bd2461f88f9658a3d94bffe9550d05fa5da4 (patch) | |
| tree | d23f2d7c92816abf820f28b714b47ceb87a751a9 | |
| parent | 7f7861a4531b3bb554f4bc3eeec3e58c721f9126 (diff) | |
| download | meta-updater-6f13bd2461f88f9658a3d94bffe9550d05fa5da4.tar.gz | |
Fix builds outside the .repo directory
The repo tool searches up the directory tree to find the .repo directory.
Cleanly handle the case where it can't find anything.
| -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 d508574..2012363 100644 --- a/classes/image_repo_manifest.bbclass +++ b/classes/image_repo_manifest.bbclass | |||
| @@ -14,9 +14,9 @@ HOSTTOOLS_NONFATAL += " repo " | |||
| 14 | # Write build information to target filesystem | 14 | # Write build information to target filesystem |
| 15 | buildinfo () { | 15 | buildinfo () { |
| 16 | if [ $(which repo) ]; then | 16 | if [ $(which repo) ]; then |
| 17 | repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml | 17 | repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || echo "Android repo tool failed to run; manifest not copied" |
| 18 | else | 18 | else |
| 19 | echo "Android repo tool not food; manifest not copied." | 19 | echo "Android repo tool not found; manifest not copied." |
| 20 | fi | 20 | fi |
| 21 | } | 21 | } |
| 22 | 22 | ||