From patchwork Mon Sep 23 08:59:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49451 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 3E4ECCF9C6F for ; Mon, 23 Sep 2024 09:00:22 +0000 (UTC) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by mx.groups.io with SMTP id smtpd.web11.32266.1727082013166047721 for ; Mon, 23 Sep 2024 02:00:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Vo+7XKPY; spf=pass (domain: gmail.com, ip: 209.85.167.53, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-53655b9bbcdso4598012e87.2 for ; Mon, 23 Sep 2024 02:00:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727082011; x=1727686811; 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=Vo+7XKPY7Ys9OTqD9m8H63Z76joDm8u0x23pYCGdqW8MtQZxFwQu2ziowtUXAzPJKy v4Awf9ChJVuZKIKsvqhMlLK7PAyNa0bFhMvpyDGSE+sQugQB5iGhka5oBMdaDrerJkNN oPFx30FzEk8YdSMvyy96DkLokRsChLWqWybmGuDZviiHHp0hmONBWXvsw0hL9gOUfB4Q z2Ma4UxPwhD22n/s8sqAXT4hw3XG/mg0/ZgmyDy5AnKRNHBEtn1erCWrvATm2Pux84aN bKGFwEm0jkdtZaBvsfrq6oGXJ4F0AMUO2a99cLEPz0kUmKUjBeYnZVWH43GH4nYvGPIs icyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727082011; x=1727686811; 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=C7bx9GY4C88dBex8aC4pyn+BoOTgJKuYKG8F73WeTuofXPOhJFyCWuiikjElfReGLa NPfBPL17o7+oC3g7uSDIZjRAkzD3xTCRPT9OFwf1itxZ9wZoyis5zPeao6IAu3O/74lF Uu6+VgdJNrmUzUoN0y3rYof6g81ly9xnDO5RbaVyoeYwhZU84ioS4G81gKRJAwetSFtw OshAtc8kWaL7KDniKT8JB1a80vXqaWpfDnRqcdsK/1DPekbcKDCskT5kPXbg8M5Inod7 qB36T9RCVUN8tS7i3spVbgjuTY2TAcDvJiqwCBnQddk+bVxfs5OFTSArJgwIR/HedrVC w9eg== X-Gm-Message-State: AOJu0YxXzjeIrwTG05iHefnBOZ+Ayiup36zhi6fY0GgVyquQhtKxD83/ OgoiuEvLTzR0nXKsZi2rfQy4Npbo4rmgRwJZDJKV8MJt8SoX/m+pgu5IrwbtbWY= X-Google-Smtp-Source: AGHT+IHKD8TbBuhZNA78ixhJRuTkMb5CHjLC/y94y7N/Zh8rTKZukg0MNAD7xHtlFpHf5wgQqm2ZPQ== X-Received: by 2002:a05:6512:3a94:b0:52e:ff2a:217 with SMTP id 2adb3069b0e04-536ad3eb9a4mr5326003e87.50.1727082010811; Mon, 23 Sep 2024 02:00:10 -0700 (PDT) Received: from an.. ([2a02:810d:600:2744:e855:ba31:e4ab:c4bc]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb94a01sm9872262a12.91.2024.09.23.02.00.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 02:00:10 -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: [PATCH 1/4] install-buildtools: support buildtools-make-tarball and update to 4.1 Date: Mon, 23 Sep 2024 10:59:45 +0200 Message-Id: <20240923085948.49447-1-an010@live.com> X-Mailer: git-send-email 2.34.1 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 ; Mon, 23 Sep 2024 09:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204796 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 Mon Sep 23 08:59:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49450 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 41E86CF9C73 for ; Mon, 23 Sep 2024 09:00:22 +0000 (UTC) Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by mx.groups.io with SMTP id smtpd.web11.32267.1727082015475884301 for ; Mon, 23 Sep 2024 02:00:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bWJEYBj4; spf=pass (domain: gmail.com, ip: 209.85.208.51, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-5c275491c61so5529087a12.0 for ; Mon, 23 Sep 2024 02:00:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727082014; x=1727686814; 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=bWJEYBj4FZF2qArxkSpjj3rudQXyc9G3H6CQzgzFpXfVp6Qmx3dHuNpRI5pYVF2pLS bXKpKKSkrXhFuU55kGBrSmvnNrdha8348Pqz48R13xCqj+MchNuqIQAiN2HWyoWaDkN2 TqeqT9uqtQUxx2Nl8NbL8OGQdaE067zY3tGawm5U5jG/A0PwhGgTxWTtZO7uysZLHPIZ eHd+kiFSk0eJxG2Zx/0LGMlfjy6D30CJrQv3EX9T1APx9AEEXDYtNv0XyxxAqj4DYXfS WkiGOabz4fRfJxC8k7Z62SqmDmceQVQHlWnCMgNJ3BeQZhKM2zyiyCZa89qW0exumvJD u87A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727082014; x=1727686814; 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=iEfVgX91mtspANAgegoF4vYhPY7hS/tEaH6Z5Y+hf4AUReNfyZ4dbhXWsUqsYvuXpi FuL9QvxZRG50xaTXe+XOa6j60t6j8TrJA4mhr+Rn5to6vBQHjMYnutyl+eYd1QXMNXpL tTO17K1be7EJl8vPe6X2qfVWOzsKebq+QamMhrd4TLDH0enr73sy9FvqzWgY0hHmUZBP VWyaLphAfXOH5cDH91pYHWIo8xWKmTLTvx2FcoF6pGrVmOx0ZVQ3CmVatOGUXFhIxTdm BlH0bRCyb65/t4Z3M6SLfLQ1zotSQVDDdUoywannHNVt1xCA45GzuiDUnvlDBZIUttvl gBVA== X-Gm-Message-State: AOJu0YwJ/bWZtUXpK2utudaDy2hR9rI4JlsCw4yfDXmN8Fjs27JnOEUR lesjoQSG6W2vm0h5jGZJWjfXuav9Y5eODjpoH9kXTOkyIC1HLG0Uc2sRm1F2HeQ= X-Google-Smtp-Source: AGHT+IFMDJH/mX9c90nGNWRRmMbc5Qk1wJ2+kdAVTfEtkWiYGqMF1gXcX778WKxKK9nTw7hYYaC9kg== X-Received: by 2002:a05:6402:3481:b0:5c4:62b7:a2e3 with SMTP id 4fb4d7f45d1cf-5c464d76403mr11768557a12.0.1727082013594; Mon, 23 Sep 2024 02:00:13 -0700 (PDT) Received: from an.. ([2a02:810d:600:2744:e855:ba31:e4ab:c4bc]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb94a01sm9872262a12.91.2024.09.23.02.00.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 02:00:13 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic , Richard Purdie Subject: [PATCH 2/4] install-buildtools: remove md5 checksum validation Date: Mon, 23 Sep 2024 10:59:46 +0200 Message-Id: <20240923085948.49447-2-an010@live.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240923085948.49447-1-an010@live.com> References: <20240923085948.49447-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 ; Mon, 23 Sep 2024 09:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204797 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 Mon Sep 23 08:59:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49449 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 2CA14CF9C5B for ; Mon, 23 Sep 2024 09:00:22 +0000 (UTC) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by mx.groups.io with SMTP id smtpd.web10.32357.1727082017705120479 for ; Mon, 23 Sep 2024 02:00:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=h0fGXtK3; spf=pass (domain: gmail.com, ip: 209.85.208.46, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5c5b9bf9d8bso1249662a12.1 for ; Mon, 23 Sep 2024 02:00:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727082016; x=1727686816; 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=h0fGXtK3BgwruBbRam/n8pUDt2gyUGdNo7B0c9BcovLQZ9zhEmrzn4x5yatHz+RI2d n1qz6OGf9YIvwXCbbBeLUqtiMS9FNsG2Qiaj5rT9IH1gXL0ZX9yMxatONPl9dHSRGqyR HdTJXQ2Z/qgj8yPpVKXpQ5Vih5Z26NdDqX1SSoEQoUxg0dFAyGJWF8C3EBMsb54WzkTe MPxstOVDONUNqkKz2UYPH53rmIENzliU7v5U6cmU18SvlwMCsp35CQJUgi6bCfwLAWZL IDvvRZcWWgQ6XmWw5PXnxcEA9tsnYh3N/4b5OxEtA6Fo772kBKppHQNeBp96DEi3ZXTW PTSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727082016; x=1727686816; 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=GjfYAHOw+MwARySHmW3+jk0Gl0UgZxX2PHdlopx0PXPE06wn4h4eCxYzh9kBukJlUH 4GvK6EfQXrfVQTq31yFyxTMnhq+3nzR7cAwkh5Q0QzpXbPEpeY2VtCUmlo1XDPlp4jG3 vvvpwBvUYcNzr4kN6R3bA4d0PqqYZsXLsNVO8En6JmHk//JMTmaEGe5odvI3LsyI/3Ct VKcICpZRHAt3EwItFuMmSBkeelBiFO6M60CyL8rpeRV2KelKIY40hNQQNzqgZz4jdJpG 0xLw8ocCpdKl3UatgrpgWnBHKjPATrNPiscp3L5qdGMTvUZvbQ/Z1RMLAfKHYp8TokPt C4vA== X-Gm-Message-State: AOJu0YzSAzuw8Yu+YyD9KpieuiwNnSxiWOkqHHUYx/CprjF8uAV7WFP1 isHEyhv1J2S/9azMM8Yh4oGL2DI999x6wQ4y3enX484+qmbRDbe56IBBiM4Jv5I= X-Google-Smtp-Source: AGHT+IEHdAaOWTR6K7O9i2KdUVTZoD+h89KBGN6agxpabyMgbvUmA55uEBWDn5+agHc/LQRjY/jCoQ== X-Received: by 2002:a05:6402:2713:b0:5c3:c296:1bc9 with SMTP id 4fb4d7f45d1cf-5c464a7d174mr13322315a12.29.1727082015959; Mon, 23 Sep 2024 02:00:15 -0700 (PDT) Received: from an.. ([2a02:810d:600:2744:e855:ba31:e4ab:c4bc]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb94a01sm9872262a12.91.2024.09.23.02.00.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 02:00:14 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic , Richard Purdie Subject: [PATCH 3/4] install-buildtools: fix "test installation" step Date: Mon, 23 Sep 2024 10:59:47 +0200 Message-Id: <20240923085948.49447-3-an010@live.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240923085948.49447-1-an010@live.com> References: <20240923085948.49447-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 ; Mon, 23 Sep 2024 09:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204798 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 Mon Sep 23 08:59:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Nikolic X-Patchwork-Id: 49448 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 2E05CCF9C71 for ; Mon, 23 Sep 2024 09:00:22 +0000 (UTC) Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by mx.groups.io with SMTP id smtpd.web11.32269.1727082019612701599 for ; Mon, 23 Sep 2024 02:00:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=a2+oyjDh; spf=pass (domain: gmail.com, ip: 209.85.208.42, mailfrom: aleksandar.nikolic010@gmail.com) Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5c42e7adbe0so4674787a12.2 for ; Mon, 23 Sep 2024 02:00:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727082018; x=1727686818; 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=a2+oyjDholEVxRmT6ddmwshzMAx8XNrAvF8cyEFgO6V7paSqlpgocHZYGKnULN95c/ q+Pyi/GzgB5dxIiWeRsr87a1zaohS/v0vmS5fhUvDirqouflx6BCF9rkrZK5tLNFdKez VvUJnxFDuBByq8rWJgQFhAcD+ABTyCxqZYqYcFW7haFDOxic13bkeoV8bLuNNWbrSV14 R6P5hxq5pwF4px3iIF/Dkr7wU+fU08KvuOiKuwihur9uCt8IbW2fs1cTSJPlKZAW8axe 3AfaedjDs2WgGKOUsIpCYvEYiztzuW33175kyebkGZch3UUtaWXJlJIWhroiMXXj/ZAm lsBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727082018; x=1727686818; 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=StXZ4y8R5WdGdfWjv8KKGjN83RrQW2S6WtVJ4ez/95vHxoIy7IlA/Opdqecknl2PAc 8MELphYMff38aO8Io0MxzBaZbtKG103PhbqeqjMQ1Fq5fKQnhsNkSdXUlxt+78IRsCTJ Pvm+Unlu8znpnDbNIiT7PfaGm2fwr5t6YC/hRKXjq4lcaL/yZK1jMZBGbyhUaVNZzUt8 2DC410B4+AikfF5AR4SGT4yZCuaQw0M+EzxcbYSb/PoJcyoWjy4P8NkV9Me4qd5i1J0I +qzsEvSxP8GOsfV7p8Zuk554LaWOxUaL2czBNNhXtyvYlosE1Z2aKUhyrAUPJ8/uuFdm tRzA== X-Gm-Message-State: AOJu0YzgIvqu0OTzmAUeMCBX8ckNf5XTxSMgWPF00aSIoiMxWLVKjKhd Q0JqpBzHYCJWIx1pXOm0TVe1xDSvPiECKnluCaIr9VgrD4xGeisRiD+tFrID X-Google-Smtp-Source: AGHT+IGabKOPsddhb1Q0uIRf7Q1nllNX66bUKBPjg1xgEvAKufl+56VUNNBfZ22CqEvTRIewRV2Lfg== X-Received: by 2002:a05:6402:2712:b0:5c5:c5fb:d405 with SMTP id 4fb4d7f45d1cf-5c5c5fbd4bbmr399030a12.9.1727082017729; Mon, 23 Sep 2024 02:00:17 -0700 (PDT) Received: from an.. ([2a02:810d:600:2744:e855:ba31:e4ab:c4bc]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb94a01sm9872262a12.91.2024.09.23.02.00.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Sep 2024 02:00:17 -0700 (PDT) From: Aleksandar Nikolic X-Google-Original-From: Aleksandar Nikolic To: openembedded-core@lists.openembedded.org Cc: Aleksandar Nikolic Subject: [PATCH 4/4] scripts/install-buildtools: Update to 4.0.21 Date: Mon, 23 Sep 2024 10:59:48 +0200 Message-Id: <20240923085948.49447-4-an010@live.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240923085948.49447-1-an010@live.com> References: <20240923085948.49447-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 ; Mon, 23 Sep 2024 09:00:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/204799 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