summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2020-08-09 12:28:01 +0200
committerPatrick Vacek <patrickvacek@gmail.com>2020-08-26 09:49:28 +0200
commit918dab09aa0aa3dc225cc19b9c946794daac7d81 (patch)
tree39cb96bd59b7ed73b53aec8019dbd8812b480d8a
parent2d882d62feef02a7a4d28738ce595181f301dcd7 (diff)
downloadmeta-updater-918dab09aa0aa3dc225cc19b9c946794daac7d81.tar.gz
image_repo_manifest.bbclass: explicitly call python3
Now we have changed to inherit python3native to provide python3 binary for repo, then we need explicitly call python3 to execute repo, or else it will firstly try to locate python which will fail if python is not in HOSTTOOLS. This fixes a following warning: | Android repo tool failed to run; manifest not copied Signed-off-by: Ming Liu <ming.liu@toradex.com>
-rw-r--r--classes/image_repo_manifest.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/image_repo_manifest.bbclass b/classes/image_repo_manifest.bbclass
index 47692df..795f41f 100644
--- a/classes/image_repo_manifest.bbclass
+++ b/classes/image_repo_manifest.bbclass
@@ -13,8 +13,9 @@ inherit python3native
13 13
14# Write build information to target filesystem 14# Write build information to target filesystem
15buildinfo_manifest () { 15buildinfo_manifest () {
16 if [ $(which repo) ]; then 16 repotool=$(which repo)
17 repo manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied" 17 if [ -n "$repotool" ]; then
18 python3 $repotool manifest --revision-as-HEAD -o ${IMAGE_ROOTFS}${sysconfdir}/manifest.xml || bbwarn "Android repo tool failed to run; manifest not copied"
18 else 19 else
19 bbwarn "Android repo tool not found; manifest not copied." 20 bbwarn "Android repo tool not found; manifest not copied."
20 fi 21 fi