MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

install-buildtools: remove hardcoded x86-64 architecture

Browse Source 
Remove all instances of the hardcoded 'x86_64' and replace with the current
host platform.

(From OE-Core rev: 52dc6f671ff67a1149be7ef4c65126ea3c907a3d)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2020-06-15 14:44:13 +01:00 committed by Richard Purdie
parent 7bf4949eaa
commit 2ea4530918
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/install-buildtools
View File

@ -35,6 +35,7 @@
import argparse
import logging
import os
import platform
import re
import shutil
import shlex
@ -112,6 +113,7 @@ def main():
release = ""
buildtools_url = ""
install_dir = ""
arch = platform.machine()
parser = argparse.ArgumentParser(
description="Buildtools installation helper",
@ -194,19 +196,19 @@ def main():
logger.error("Milestone installers require --build-date")
else:
if args.with_extended_buildtools:
filename = "x86_64-buildtools-extended-nativesdk-standalone-%s-%s.sh" % (
args.installer_version, args.build_date)
filename = "%s-buildtools-extended-nativesdk-standalone-%s-%s.sh" % (
arch, args.installer_version, args.build_date)
else:
filename = "x86_64-buildtools-nativesdk-standalone-%s-%s.sh" % (
args.installer_version, args.build_date)
filename = "%s-buildtools-nativesdk-standalone-%s-%s.sh" % (
arch, args.installer_version, args.build_date)
safe_filename = quote(filename)
buildtools_url = "%s/milestones/%s/buildtools/%s" % (base_url, args.release, safe_filename)
# regular release SDK
else:
if args.with_extended_buildtools:
filename = "x86_64-buildtools-extended-nativesdk-standalone-%s.sh" % args.installer_version
filename = "%s-buildtools-extended-nativesdk-standalone-%s.sh" % (arch, args.installer_version)
else:
filename = "x86_64-buildtools-nativesdk-standalone-%s.sh" % args.installer_version
filename = "%s-buildtools-nativesdk-standalone-%s.sh" % (arch, args.installer_version)
safe_filename = quote(filename)
buildtools_url = "%s/%s/buildtools/%s" % (base_url, args.release, safe_filename)
@ -279,8 +281,8 @@ def main():
# Setup the environment
logger.info("Setting up the environment")
regex = re.compile(r'^(?P<export>export )?(?P<env_var>[A-Z_]+)=(?P<env_val>.+)$')
with open("%s/environment-setup-x86_64-pokysdk-linux" %
install_dir, 'rb') as f:
with open("%s/environment-setup-%s-pokysdk-linux" %
(install_dir, arch), 'rb') as f:
for line in f:
match = regex.search(line.decode('utf-8'))
logger.debug("export regex: %s" % match)