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:35 +0200
commit702bd61fb66c6ad95e0ee733e74ca41d8890845b (patch)
treeccf02a82d036fded6c63d11a4bedad26d5ee0e5d
parent6c4b177218a4eac5a058a84f0d3627c8dd13e0c7 (diff)
downloadmeta-updater-702bd61fb66c6ad95e0ee733e74ca41d8890845b.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