From patchwork Tue Sep 24 23:05:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49523 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 198CBCF9C69 for ; Tue, 24 Sep 2024 23:05:41 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.2729.1727219131570737075 for ; Tue, 24 Sep 2024 16:05:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=PDrt2PXh; spf=pass (domain: gmail.com, ip: 209.85.128.52, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4280ca0791bso59752905e9.1 for ; Tue, 24 Sep 2024 16:05:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727219130; x=1727823930; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RAtJxVNnF0JHhJ4/bWNhcOiQvUaL2H4cowYQ/PFivl4=; b=PDrt2PXhj+Swhy8x+szIy9RWBDnBvyn/1caJLqEUnX7uE4ORngy0VIXgmnNrIScOPK teh4D10imq7R5E/n8XBoLjoedZKYY8Yek6Bk4HRuX4y7IG5s30h0DsyBlaWBox02xRbo qQqUJy6qSO3bqe+VOk8ptVe4FkziuUWc+xZswKt+0NIF3mYbMDW8I4V+fNreDO6SqChU DDeeqr+uDL3/+jRx7cEOALsKHAx7A2VdwVAeOtgbmy9eBJ3G4WdQsv9WMWr7TqSchriO RdoKUMtQP7EMQN0qPv9Bn5BH74ghlpcbEwod4SoedB/LpeDffAW7n4iocdr6zHC3ECu3 cwFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727219130; x=1727823930; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RAtJxVNnF0JHhJ4/bWNhcOiQvUaL2H4cowYQ/PFivl4=; b=PcCoGpWv4VMgPY8fdzzsm9vFs8SRdMv1iLWLvHrpttPQ2lPuua2JaLBRWnH4ALRoE1 az07q1h2CqOGqk/7Fy1RPefAZ3Mi8G1ZbKnuRDDDSFdYb6kT3QXGcOQvd4PuKUO4pKIw /da11ndPehi1IRtjUNfKqBDsAftQjSFm7QxTQ569BQCwu3qxoZenAc1elet7mdR2EAqQ 2TxnE5iAtkWebbNuHnl+mi3XvDAPP7Rol8tyXJ9g2dicgdeEXssqEnv0Qr7EvEzxdaDH z5zcHhwbjmNUAQ0604zeUKcMJBVEMI7K0tRLyvQ5KYAh3MD9ngkGqoBUXMXtUpfH0Spg 1DKQ== X-Gm-Message-State: AOJu0YyLTIzIy8bsDpiy29KhKr5Y8Gl/pfJBKtOtfcBQEXcd+Bg/J7+9 K52A+Mi3+I+uybVxY6QLMpiAB0FfwlSX6JBGp40q3g8ejjw69cjoXWLAeG5/v2E= X-Google-Smtp-Source: AGHT+IG0N1MjfYTfumJ8w4UzN8rOyJcnej6k/j9N2+kH9UAiI/g3ADWHL0SJEGD6hsY7LHId6Hr/sQ== X-Received: by 2002:adf:e450:0:b0:378:c305:8f43 with SMTP id ffacd0b85a97d-37cc2468e17mr477790f8f.18.1727219129546; Tue, 24 Sep 2024 16:05:29 -0700 (PDT) Received: from acert-swift3.. ([2a02:810d:600:2744:7bc8:c715:17d:4d03]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c5cf4d75cdsm1291721a12.81.2024.09.24.16.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 16:05:29 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Paul Eggleton , Ross Burton , Richard Purdie , Aleksandar Nikolic Subject: [kirkstone][PATCH 1/4] install-buildtools: support buildtools-make-tarball and update to 4.1 Date: Wed, 25 Sep 2024 01:05:14 +0200 Message-ID: <20240924230517.19994-1-an010@live.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Sep 2024 23:05:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204884 From: Paul Eggleton Support installing buildtools-make-tarball that is built in version 4.1 and later for build hosts with a broken make version. Also update the default version values to 4.1. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 5d539268d0c7b8fad1ba9352c7f2d4b81e78b75c) Signed-off-by: Aleksandar Nikolic --- scripts/install-buildtools | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 10c3d043de..2218f3ffac 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -57,8 +57,8 @@ 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.4' -DEFAULT_INSTALLER_VERSION = '3.4' +DEFAULT_RELEASE = 'yocto-4.1' +DEFAULT_INSTALLER_VERSION = '4.1' DEFAULT_BUILDDATE = '202110XX' # Python version sanity check @@ -154,6 +154,8 @@ def main(): group.add_argument('--without-extended-buildtools', action='store_false', dest='with_extended_buildtools', help='disable extended buildtools (traditional buildtools tarball)') + group.add_argument('--make-only', action='store_true', + help='only install make tarball') group = parser.add_mutually_exclusive_group() group.add_argument('-c', '--check', help='enable checksum validation', default=True, action='store_true') @@ -170,6 +172,9 @@ def main(): args = parser.parse_args() + if args.make_only: + args.with_extended_buildtools = False + if args.debug: logger.setLevel(logging.DEBUG) elif args.quiet: @@ -197,7 +202,10 @@ def main(): if not args.build_date: logger.error("Milestone installers require --build-date") else: - if args.with_extended_buildtools: + if args.make_only: + filename = "%s-buildtools-make-nativesdk-standalone-%s-%s.sh" % ( + arch, args.installer_version, args.build_date) + elif args.with_extended_buildtools: filename = "%s-buildtools-extended-nativesdk-standalone-%s-%s.sh" % ( arch, args.installer_version, args.build_date) else: @@ -207,6 +215,8 @@ def main(): buildtools_url = "%s/milestones/%s/buildtools/%s" % (base_url, args.release, safe_filename) # regular release SDK else: + if args.make_only: + filename = "%s-buildtools-make-nativesdk-standalone-%s.sh" % (arch, args.installer_version) if args.with_extended_buildtools: filename = "%s-buildtools-extended-nativesdk-standalone-%s.sh" % (arch, args.installer_version) else: @@ -303,7 +313,9 @@ def main(): if args.with_extended_buildtools and not m: logger.info("Ignoring --with-extended-buildtools as filename " "does not contain 'extended'") - if args.with_extended_buildtools and m: + if args.make_only: + tool = 'make' + elif args.with_extended_buildtools and m: tool = 'gcc' else: tool = 'tar' From patchwork Tue Sep 24 23:05:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49522 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A6FCCF9C71 for ; Tue, 24 Sep 2024 23:05:41 +0000 (UTC) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by mx.groups.io with SMTP id smtpd.web10.2800.1727219133318278600 for ; Tue, 24 Sep 2024 16:05:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OgTLBP8u; spf=pass (domain: gmail.com, ip: 209.85.208.52, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5c275491c61so8016826a12.0 for ; Tue, 24 Sep 2024 16:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727219132; x=1727823932; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=j0HvZYjSU43OO9xyBp7+51L6f+4pKjvda4RrKq/6aiA=; b=OgTLBP8uqMTQZMSHiju9G7RgrAw3YGzVRTQ42piOQ4t/eADbG1SHoEV2tOO4gyi4vP kRKAnBLVlsEUhM9WyuAzdsoS+e6LJ2KZiHhfv+W6zfQxibLoxZY7FJKrmCrhhQZ/BhwW LR47QGqpyE4fNUYXa0+unroE0uxKzFE9C6rFf5ipPDFkQgigbbDQHhIRQ8gGF/KB7Kfn JyJZmczsrOm9ICo/y3abxKMPy5PHCWyY1RerSc7ML1ZjT986xb7EMruI3F0IbkI4yclx 4ExQ7cICpzRyYTbDxZR949acVpN09BJUx9lTQvVOSpsLqd9MjA46EBwGJBOe9ZPm6uAJ wV0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727219132; x=1727823932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j0HvZYjSU43OO9xyBp7+51L6f+4pKjvda4RrKq/6aiA=; b=kN25rbMT/j/dxp00RCj1+vGFxPCMn0i4YNWrTRq8crmMvpH/nKdM0O4u3WZLs9L9xH 1/bMGtwKD+VotYkyU1rZbGhH+uz03c53Ap51oBXdvuOYnYDXRNiFSz9wt+TfYEsxK5dW TL/3vBKEBCqfH6VjuMFTBU84G+UUmOHCnyTjUjLvFqyMtXDUf1G5ywitJ+JHTdkkb9nR IrER4peXFcrsECJoFT48nb59sefqonVa0HKcp5yjm3BLKxbIRjiMnUPs7H1mm6p9yS40 mGs5TuHSQk0+2EWqQgxhONHg2RIMzVaMuJ8psehww6Y2ybtvdBmW4wOKT5t4F0IpK3sg vW0w== X-Gm-Message-State: AOJu0Ywg52QWwOQA21CpvJ3fucRQFx5mXwlly5mF0QiAPoMLrhVyepCm qTeWFJiP43xghFeke/+JihgWzv7NK50UG9gKuX3tIK9sjazmdEs0K3ia70rA X-Google-Smtp-Source: AGHT+IE/kpClCuDZmoopD0VQQtvOTz5R6LleXkWCisL37hDzkI4EPNuLnbm/Xm6LA0M+NTfIt439FQ== X-Received: by 2002:a05:6402:1ecf:b0:5c4:2ca6:5499 with SMTP id 4fb4d7f45d1cf-5c720629c5emr568549a12.20.1727219131517; Tue, 24 Sep 2024 16:05:31 -0700 (PDT) Received: from acert-swift3.. ([2a02:810d:600:2744:7bc8:c715:17d:4d03]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c5cf4d75cdsm1291721a12.81.2024.09.24.16.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 16:05:31 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic , Richard Purdie Subject: [kirkstone][PATCH 2/4] install-buildtools: remove md5 checksum validation Date: Wed, 25 Sep 2024 01:05:15 +0200 Message-ID: <20240924230517.19994-2-an010@live.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240924230517.19994-1-an010@live.com> References: <20240924230517.19994-1-an010@live.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Sep 2024 23:05:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204885 From: Aleksandar Nikolic No need to validate with the md5 checksum, as the file is not even uploaded to the Yocto release webpage (the download never failed due to a wrong indentation of an else statement). For validation purposes, use the sha256 checksum only. Signed-off-by: Aleksandar Nikolic Signed-off-by: Richard Purdie (cherry picked from commit b740d2f9d40aef1e18c022d1e82b4fb2c5c1fc22) Signed-off-by: Aleksandar Nikolic --- scripts/install-buildtools | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 2218f3ffac..a34474ea84 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -238,19 +238,15 @@ def main(): # Verify checksum if args.check: logger.info("Fetching buildtools installer checksum") - checksum_type = "" - 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) - ret = subprocess.call("wget -q -O %s %s" % - (tmpbuildtools_checksum, check_url), shell=True) - if ret == 0: - break - else: - if ret != 0: - logger.error("Could not download file from %s" % check_url) - return ret + checksum_type = "sha256sum" + check_url = "{}.{}".format(buildtools_url, checksum_type) + checksum_filename = "{}.{}".format(filename, checksum_type) + tmpbuildtools_checksum = os.path.join(tmpsdk_dir, checksum_filename) + ret = subprocess.call("wget -q -O %s %s" % + (tmpbuildtools_checksum, check_url), shell=True) + if ret != 0: + logger.error("Could not download file from %s" % check_url) + return ret regex = re.compile(r"^(?P[0-9a-f]+)\s+(?P.*/)?(?P.*)$") with open(tmpbuildtools_checksum, 'rb') as f: original = f.read() @@ -263,10 +259,7 @@ def main(): logger.error("Filename does not match name in checksum") return 1 checksum = m.group('checksum') - if checksum_type == "md5sum": - checksum_value = md5_file(tmpbuildtools) - else: - checksum_value = sha256_file(tmpbuildtools) + checksum_value = sha256_file(tmpbuildtools) if checksum == checksum_value: logger.info("Checksum success") else: From patchwork Tue Sep 24 23:05:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49525 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B2F3CF9C74 for ; Tue, 24 Sep 2024 23:05:41 +0000 (UTC) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by mx.groups.io with SMTP id smtpd.web10.2801.1727219135765887958 for ; Tue, 24 Sep 2024 16:05:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=OvzoGipi; spf=pass (domain: gmail.com, ip: 209.85.208.50, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-5c40942358eso615270a12.1 for ; Tue, 24 Sep 2024 16:05:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727219134; x=1727823934; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F+EVVUyriSRISktFcL3urEYG8k1ilHplCPD4Q014u3o=; b=OvzoGipiJeVtm6+0L+QggqpDuPWbKP1LaFw6fxnkoyAaIFIczaTlOy/BCX8EQcrC+t cDW7MkBh0GDrJUsswHwjrMPtlo/juW235puJxCRTalDAfN0XHnCqkwRLaC54ilFfjzM4 S8vWmgPBZgZIxaxB9oz4lRnOcbHfGJMJKegXDu1PhVnFC9JBpwOCP746YWL2h1tKJlPt jq922x/x5mioD/KofLUGkdQsABMZSLTdIU2TaEOVGBA638z2kFrZCZ4l4GzKuqE89tVw 0thWDJ8vPKSxXOUbH6/JLJqIh0SRyUXh/qwhfpM/4ttHe6xJIHMGCbbaapdhLBWDDCMv vEtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727219134; x=1727823934; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F+EVVUyriSRISktFcL3urEYG8k1ilHplCPD4Q014u3o=; b=NBi8hKO+npUe+wXa9/o4Xat9bD0Z4K3LebwDvtjejp0tRHql7uvDGA+xHIzs+sKiF0 z8ZDHhIIoe+IiAG+m9mOiTcJpObyB3PDR/vJ8vDgL8sCOkx/UOSogf99ccDipgX+iyiL g2m6C/J+wgRaCEJugsrRaP9dxZoeQeLfECUnb/XJW8bjQTfxJJ+CJFzD/3Eb5UuEdcuv pXsz3nY1UW80zIk5JFIgaAF9uVp9xCdjz0IF/aNDr2B4F27bm04Iq4gKdtoDEd+YzEo2 /mE5ANkftEbYSbreQw2buS5dUDVV7HQRDSkFFd2qDv+wd4Vwf/BWRmlgJc/FMQgtRtjA iV8A== X-Gm-Message-State: AOJu0Yz6ZYtNSfiyQaIzigeVHrG5jruONYGT92Z3snGR/293oV/mq2O4 RnA3eKbQio45BhN1vmOPuEH3eE5dC8Y8+6u/WzQy8UspN8OE6vXU7ywqPOsF X-Google-Smtp-Source: AGHT+IFPu+z4xrULA1ScUtuGgGibgopE081stulUMZGvIcTblthYMggBhzzw5bdG7IjWCbCrOVqKGw== X-Received: by 2002:a05:6402:2688:b0:5c2:5f31:8888 with SMTP id 4fb4d7f45d1cf-5c5cdfea23dmr5695903a12.15.1727219133896; Tue, 24 Sep 2024 16:05:33 -0700 (PDT) Received: from acert-swift3.. ([2a02:810d:600:2744:7bc8:c715:17d:4d03]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c5cf4d75cdsm1291721a12.81.2024.09.24.16.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 16:05:33 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic , Richard Purdie Subject: [kirkstone][PATCH 3/4] install-buildtools: fix "test installation" step Date: Wed, 25 Sep 2024 01:05:16 +0200 Message-ID: <20240924230517.19994-3-an010@live.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240924230517.19994-1-an010@live.com> References: <20240924230517.19994-1-an010@live.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Sep 2024 23:05:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204886 From: Aleksandar Nikolic The "Test installation" step fails with some harmless error messages (see [1]). This can however make a user think that the buildtools have not been installed correctly. Two reasons for the error messages: - some envvars in the environment-setup--pokysdk-linux file start and end with double quotes (e.g., PATH) and are as such written into python os.environ. This leads that their usage is not valid later when testing the installation. This patch removes the double quotes before writing, if they are present. - if installation directory (install_dir), given through the option --directory, is given as a relative path, checking if the path to a tool (e.g., gcc) in buildtools starts it will always fail. This patch converts the install_dir variable to an absolute path. [1] ERROR: Something went wrong: tar not found in ./build-tools ERROR: Something went wrong: installation failed Signed-off-by: Aleksandar Nikolic Signed-off-by: Richard Purdie (cherry picked from commit e4eb0b14ecf9bd2fba13260441c9d86eb348f41e) Signed-off-by: Aleksandar Nikolic --- scripts/install-buildtools | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/install-buildtools b/scripts/install-buildtools index a34474ea84..4f85fe87d4 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -102,6 +102,16 @@ def sha256_file(filename): import hashlib return _hasher(hashlib.sha256(), filename) +def remove_quotes(var): + """ + If a variable starts and ends with double quotes, remove them. + Assumption: if a variable starts with double quotes, it must also + end with them. + """ + if var[0] == '"': + var = var[1:-1] + return var + def main(): global DEFAULT_INSTALL_DIR @@ -273,7 +283,7 @@ def main(): os.chmod(tmpbuildtools, st.st_mode | stat.S_IEXEC) logger.debug(os.stat(tmpbuildtools)) if args.directory: - install_dir = args.directory + install_dir = os.path.abspath(args.directory) ret = subprocess.call("%s -d %s -y" % (tmpbuildtools, install_dir), shell=True) else: @@ -294,7 +304,7 @@ def main(): if match: env_var = match.group('env_var') logger.debug("env_var: %s" % env_var) - env_val = match.group('env_val') + env_val = remove_quotes(match.group('env_val')) logger.debug("env_val: %s" % env_val) os.environ[env_var] = env_val From patchwork Tue Sep 24 23:05:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49524 X-Patchwork-Delegate: steve@sakoman.com Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28A48CF9C73 for ; Tue, 24 Sep 2024 23:05:41 +0000 (UTC) Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by mx.groups.io with SMTP id smtpd.web10.2803.1727219138998791461 for ; Tue, 24 Sep 2024 16:05:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=aoCIqVqw; spf=pass (domain: gmail.com, ip: 209.85.167.46, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-53653ff0251so6915029e87.0 for ; Tue, 24 Sep 2024 16:05:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727219137; x=1727823937; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=utcCPzgnfEOmm11tyFQqj41Us0cZSnC+Tcrl5jAnsRo=; b=aoCIqVqw909MDoqqVBl2hWGwHapQcIjhu0PVVK0MDWjdzR6iHD8lwwVSPDXwhNHM1y /6p9umJ63V2lY/gQEFhYKjT6rcStMVJxi8pVk1snaBp3w72ZEzWYH1Fzj1NLZaxn/s+3 QlKaMV7HAEaGMYgodSyn1joxghMkF3eg/RQtcprL/zqoiXiG3vM/rMsB/dlLpa7y8zp2 2rffzHu0LAW/4Ir2l7rLtIj7MbxC9OuBTiyjnSCDYXZ2VW+m5b5Q/eXsRVUL+A0TsAP0 WHIwGGQCDcIOSdyt7rYfDlTHvD967AWGXz/MZP5Rbw41BEylxnjZAMLIpFp08y/lSWpn kBNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727219137; x=1727823937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=utcCPzgnfEOmm11tyFQqj41Us0cZSnC+Tcrl5jAnsRo=; b=Afod2lTJ+Ntb1VA1ZNTnLH7heCwKD+LUBprdeVUOAMxfj169r/1bnVaUCfSmrf3xps hD62vaqMMqTHftZKtUiLrQAqPJZ1Ja422RBiTxYUr+I2htWtHmG2fPFFCeZrU9yDCTb7 BRcuqpqLDSciUiuxzw9GQr7tCf+MXy2yEmVykffVpmX0DZ1U+K26x80v+u20zNgZR8zC vffem0CbjVZIZMrAtsDTsB8/rGbz5pnic0kax0K611yAb0Nyq5X7wP86/XaVz/xjPfjT VeF4owPVOeO4eMBLNhea3Z9XH/4XfQGU9YKkMM69GYNuGtgJ8fb2LSdx+faBk+OnWopy KPNA== X-Gm-Message-State: AOJu0YzB1bNm5MbyFed65JBzMR0twSUhkh+2x7UA22oZMRWl6P7B5af5 XltJQrL4csO19lePm47GrKHPyi5fycjSebs0SGa83M9+mr2bQcNK6fKLvu9+ X-Google-Smtp-Source: AGHT+IE/qMivjxpqskF9J3PczWcyKar5CplPAmPM6w1lSyHq6kH2IRkBgiMrzvp/9AOiMQSzUEj6xw== X-Received: by 2002:a05:6512:3996:b0:535:6cde:5c4d with SMTP id 2adb3069b0e04-5387048d11cmr414428e87.3.1727219136809; Tue, 24 Sep 2024 16:05:36 -0700 (PDT) Received: from acert-swift3.. ([2a02:810d:600:2744:7bc8:c715:17d:4d03]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c5cf4d75cdsm1291721a12.81.2024.09.24.16.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2024 16:05:35 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic Subject: [kirkstone][PATCH 4/4] scripts/install-buildtools: Update to 4.0.21 Date: Wed, 25 Sep 2024 01:05:17 +0200 Message-ID: <20240924230517.19994-4-an010@live.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240924230517.19994-1-an010@live.com> References: <20240924230517.19994-1-an010@live.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 24 Sep 2024 23:05:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204887 From: Aleksandar Nikolic Update to the 4.0.21 release of the 4.0 series for buildtools. Signed-off-by: Aleksandar Nikolic --- scripts/install-buildtools | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install-buildtools b/scripts/install-buildtools index 4f85fe87d4..9054eb5f36 100755 --- a/scripts/install-buildtools +++ b/scripts/install-buildtools @@ -56,9 +56,9 @@ PROGNAME = 'install-buildtools' 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-4.1' -DEFAULT_INSTALLER_VERSION = '4.1' +DEFAULT_BASE_URL = 'https://downloads.yoctoproject.org/releases/yocto' +DEFAULT_RELEASE = 'yocto-4.0.21' +DEFAULT_INSTALLER_VERSION = '4.0.21' DEFAULT_BUILDDATE = '202110XX' # Python version sanity check