scripts/install-buildtools: Update to 3.2 M1 buildtools
PATCH 1/2 scripts/install-buildtools: Update to 3.2 M1 buildtools
From: Richard Purdie <[email protected]>
This fixes issues with openssl certs not working properly which meant error reporting to an error report server was failing.
Also, all our downloads are now standarised on "sha256sum" so adjust for that.
(From OE-Core rev: bc8b44e19a05f499f5cef049eedbed1fede2e765)
Signed-off-by Richard Purdie <[email protected]>
--- scripts/install-buildtools | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/install-buildtools +4 -4
@@ -57,9 +57,9 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') DEFAULT_BASE_URL = 'http://downloads.yoctoproject.org/releases/yocto' -DEFAULT_RELEASE = 'yocto-3.1' -DEFAULT_INSTALLER_VERSION = '3.1' -DEFAULT_BUILDDATE = '' +DEFAULT_RELEASE = 'yocto-3.2_M1' +DEFAULT_INSTALLER_VERSION = '3.1+snapshot' +DEFAULT_BUILDDATE = '20200617' # Python version sanity check if not (sys.version_info.major == 3 and sys.version_info.minor >= 4):
@@ -227,7 +227,7 @@ def main(): if args.check: logger.info("Fetching buildtools installer checksum") checksum_type = "" - for checksum_type in ["md5sum", "sha256"]: + for checksum_type in ["md5sum", "sha256sum"]: check_url = "{}.{}".format(buildtools_url, checksum_type) checksum_filename = "{}.{}".format(filename, checksum_type) tmpbuildtools_checksum = os.path.join(tmpsdk_dir, checksum_filename)
Signature · 1 line
2.24.3 (Apple Git-128)
PATCH 2/2 scripts/install-buildtools: Handle new format checksum files
From: Richard Purdie <[email protected]>
Autobuilder generated checksum files only have a single space between the sum and the filename, tweak it to account for this.
(From OE-Core rev: d1e71bf5b399372166eb40bb0d99c8fb52231600)
Signed-off-by Richard Purdie <[email protected]>
--- scripts/install-buildtools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/install-buildtools +1 -1
@@ -239,7 +239,7 @@ def main(): if ret != 0: logger.error("Could not download file from %s" % check_url) return ret - regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s\s(?P<path>.*/)?(?P<filename>.*)$") + regex = re.compile(r"^(?P<checksum>[0-9a-f]+)\s+(?P<path>.*/)?(?P<filename>.*)$") with open(tmpbuildtools_checksum, 'rb') as f: original = f.read() m = re.search(regex, original.decode("utf-8"))
Signature · 1 line
2.24.3 (Apple Git-128)