From patchwork Sun Oct 27 10:43:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Liu X-Patchwork-Id: 51366 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 CB45DD10C1C for ; Sun, 27 Oct 2024 10:43:32 +0000 (UTC) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by mx.groups.io with SMTP id smtpd.web11.27518.1730025807376615962 for ; Sun, 27 Oct 2024 03:43:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ERq0jobI; spf=pass (domain: gmail.com, ip: 209.85.208.172, mailfrom: liu.ming50@gmail.com) Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-2fb51f39394so32711701fa.2 for ; Sun, 27 Oct 2024 03:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730025805; x=1730630605; 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=gX1UeK9Lf1HeybkSCfAOJYjCOOPieFUmDq21T2t6WEg=; b=ERq0jobIurRjHj0ur0BLN/NkIuBw2n6aPh0FYQQ+ukP0tesEuBDCUp7NAsXgJg2/MQ OqeI4n8u5hxgcmI7Ofunqxkk4CAHV4jtnL2JLrPOXA2bsFnGsjec7yXw7E9LVaiK7zpJ Us7XuaSiB6HMp+iPjV+qCdbdnlbSYO7aiA0vWY1kxTinHP9HUkAHr34Q/GoGWjIXgJIm /2z+Ki83SmEqBULs7ogicB9vFQJHSU9oEOUbPp88Umbgi1L/wDWp5kV3bAkcnyTYKVmz nA8cpxLDyK5Hp82DIsY2oD0wqHzsDvebGOc9fNLyADvy0clf4glkH8t1hZbwvBlqZN1j ZQ8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730025805; x=1730630605; 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=gX1UeK9Lf1HeybkSCfAOJYjCOOPieFUmDq21T2t6WEg=; b=hbH72pCQl8T7fTy1RpGP+G+8TQPaPF4hjugj9hazgZ0iEkagRAaYshHNek+Z3s3KGN 8LMlSH4uaLkCT0kswUIvGXo5y6Ssh6eGnppX3lzIh+/1X7staAOSVBc5wSXIC8GLrLWn xyGijn3QneqywrbI1jJ5NrmwxKtxnVOFyR/zp3zAgVMmYs+NCCQFA9P8pO1Ylzix4FnH eQoZHRd8AUPBwGv4Y/rgTVkLLEyU9T/GPKe4sJhRQedTaFmVw2EQBntn0/w6ApiDLS4Z WawwmjIQ6ZhlDPN29lVOF3KAQiSMVzBRxBSpm9uWK4nnJMFeyuJVvsts0dIPwUfF/b5p Arxw== X-Forwarded-Encrypted: i=1; AJvYcCVAn6nMQ1dPBTcRdYem7dke/Mwh6mK/3eL8Tt7UYMZWrlgIRGoUjYdSFCO8DziEsp2bMik/g5drDa3GgdR0PMcZjw==@lists.openembedded.org X-Gm-Message-State: AOJu0YyNJ9KAsBzCc/XYiWf0TNUllDp9NoWlfP4Lij3kDrBx3NJfEh52 yVGZDm0PX4DSuxdb/TVJcGDAMcY4rRgtJh79t/Y7AAqwlN8rqH5a X-Google-Smtp-Source: AGHT+IHpyysjaIPyvMz746vnuifiDriQIHahJmtoMmU4sRi1LrmNamoizH12ED3ENqDEXIZ+EoEBRg== X-Received: by 2002:a05:651c:310:b0:2fb:599a:a8e9 with SMTP id 38308e7fff4ca-2fcbdfcc4aemr14968391fa.15.1730025805004; Sun, 27 Oct 2024 03:43:25 -0700 (PDT) Received: from peterliu-Precision-5680.. (customer-212-100-112-191.stosn.net. [212.100.112.191]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fcb4617007sm8089771fa.126.2024.10.27.03.43.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 03:43:23 -0700 (PDT) From: Ming Liu To: ross.burton@arm.com, openembedded-core@lists.openembedded.org Cc: Ming Liu Subject: [OE-core] [PATCH V3 1/3] toolchain-shar-extract.sh: replace which with "command -v" Date: Sun, 27 Oct 2024 11:43:16 +0100 Message-ID: <20241027104318.8326-1-liu.ming50@gmail.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 ; Sun, 27 Oct 2024 10:43:32 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206394 Command 'which' is not POSIX or even universally installed on Linux systems, replace it with 'command -v'. Signed-off-by: Ming Liu --- meta/files/toolchain-shar-extract.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 3b4647fca7..7e40c67374 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -2,8 +2,8 @@ export LC_ALL=en_US.UTF-8 #Make sure at least one python is installed -INIT_PYTHON=$(which python3 2>/dev/null ) -[ -z "$INIT_PYTHON" ] && INIT_PYTHON=$(which python2 2>/dev/null) +INIT_PYTHON=$(command -v python3 2>/dev/null ) +[ -z "$INIT_PYTHON" ] && INIT_PYTHON=$(command -v python2 2>/dev/null) [ -z "$INIT_PYTHON" ] && echo "Error: The SDK needs a python installed" && exit 1 # Remove invalid PATH elements first (maybe from a previously setup toolchain now deleted @@ -229,7 +229,7 @@ if [ ! -x $target_sdk_dir -o ! -w $target_sdk_dir -o ! -r $target_sdk_dir ]; the exit 1 fi - SUDO_EXEC=$(which "sudo") + SUDO_EXEC=$(command -v "sudo") if [ -z $SUDO_EXEC ]; then echo "No command 'sudo' found, please install sudo first. Abort!" exit 1 From patchwork Sun Oct 27 10:43:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Liu X-Patchwork-Id: 51367 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 A8B65D10C1E for ; Sun, 27 Oct 2024 10:43:42 +0000 (UTC) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by mx.groups.io with SMTP id smtpd.web10.27490.1730025812978441572 for ; Sun, 27 Oct 2024 03:43:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=mgVDWU/D; spf=pass (domain: gmail.com, ip: 209.85.208.180, mailfrom: liu.ming50@gmail.com) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2fb51f39394so32711991fa.2 for ; Sun, 27 Oct 2024 03:43:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730025811; x=1730630611; 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=UdG8KY/RBhpHf9SFVQ3TjTtUz9JQP2YYR4r/fip3VDo=; b=mgVDWU/DKKZgbucWes38dGf56HHjcjZWRIEsfOx644J0mbzjt5iYXWl56x87BZquc3 8u4EIvplkV/M3/FRGo4F3vyPUf7OX/u+0BACug4et6dffGhZhfYkDdXvOf343zBFJsl3 lJ3q/cwOuFhVnBrEY8KOfj+lFu5xPP95lzeqquzlr1pJaExlBvtuBKBRvFlPwE6DwqcG bzC5Dc0kaPhZYXYIX1t53adbZuYeLCzepAIqaUm2heX/eIxdsrG2YdUyUnnvgH4IvoTK QsremrPkMGxDtKy8zz5hBgAtOQKOF18mbnpi/H0GyJzvRLltF8P6jqEn45OcZPuAS+Qs qXUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730025811; x=1730630611; 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=UdG8KY/RBhpHf9SFVQ3TjTtUz9JQP2YYR4r/fip3VDo=; b=G+y1v7zFDV8XvdOINv/neGbJRanYMgztfb/ZX7ZyjJmvvLR6IP8IhGKq5XR7AMjlIM e/LfAJkk0DPxSQkCGrxCT1isTRxFSRSFAHkjYu66+LLOewqcEZ0b72RzPCW17QdpAHBm tATXlhuJPDE6jsQWZAw4tGXuwwMBbwRfKPrnlWZs9BSQnfM1DvFn3bidEtH9+/jnarK+ m1BOurSdy7GlUaUe7Loux5G2vGfBUb+avAh0H+qha7JeH13G9XWHRbL8SPz4noNNfz+b U0elC240BaC/2prfc79qde6aHr9V4ZplQA7Xlj11sWkU0mzE+DZqLo+4EgLJI+wXn4Pn LMRw== X-Forwarded-Encrypted: i=1; AJvYcCWYF4kMLcbZBRrp4shUQcUENB4bnaehD4FOX0sfkaGp/ejUc2kO38sPKjIdzP3qSC45J+hoNwJNAtrDTlixxgIzyA==@lists.openembedded.org X-Gm-Message-State: AOJu0YxDCGy5me38fCtHabd6TQfgmUE8KeZbO1+GhZ1bwZ00eGo9umpf oelH9i6TWNvh9V7KHVAmGcmn4QnGd903L91fDh/3J+U3p+cQDjAy X-Google-Smtp-Source: AGHT+IGGuzBm6k6qHjt8pcCa9Kd7XQaj+fa4Mv9SeHuvF7Cxxr/+/TmxRCl1p6eCzJuYqR97CQUJBA== X-Received: by 2002:a2e:4c12:0:b0:2f6:57b1:98b0 with SMTP id 38308e7fff4ca-2fcbe0c3a14mr15703521fa.42.1730025810585; Sun, 27 Oct 2024 03:43:30 -0700 (PDT) Received: from peterliu-Precision-5680.. (customer-212-100-112-191.stosn.net. [212.100.112.191]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fcb4617007sm8089771fa.126.2024.10.27.03.43.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 03:43:28 -0700 (PDT) From: Ming Liu To: ross.burton@arm.com, openembedded-core@lists.openembedded.org Cc: Ming Liu Subject: [OE-core] [PATCH V3 2/3] toolchain-shar-extract.sh: check required tool before extracting SDK Date: Sun, 27 Oct 2024 11:43:17 +0100 Message-ID: <20241027104318.8326-2-liu.ming50@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241027104318.8326-1-liu.ming50@gmail.com> References: <20241027104318.8326-1-liu.ming50@gmail.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 ; Sun, 27 Oct 2024 10:43:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206395 To extract the SDK archive, the proper tools need to be present on system, check unzip for zip archive type, check xz for tar.xz archive type. Signed-off-by: Ming Liu --- meta/files/toolchain-shar-extract.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 7e40c67374..8368a81196 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -245,6 +245,10 @@ fi printf "Extracting SDK..." if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then + if [ -z "$(command -v unzip)" ]; then + echo "Aborted, unzip is required to extract the SDK archive, please make sure it's installed on your system!" + exit 1 + fi tail -n +$payload_offset "$0" > sdk.zip if $SUDO_EXEC unzip $EXTRA_TAR_OPTIONS sdk.zip -d $target_sdk_dir;then rm sdk.zip @@ -252,6 +256,10 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then rm sdk.zip && exit 1 fi else + if [ -z "$(command -v xz)" ]; then + echo "Aborted, xz is required to extract the SDK archive, please make sure it's installed on your system!" + exit 1 + fi tail -n +$payload_offset "$0"| $SUDO_EXEC tar mxJ -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 fi echo "done" From patchwork Sun Oct 27 10:43:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Liu X-Patchwork-Id: 51368 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 ABF14D10C1B for ; Sun, 27 Oct 2024 10:43:42 +0000 (UTC) Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) by mx.groups.io with SMTP id smtpd.web11.27519.1730025817956064959 for ; Sun, 27 Oct 2024 03:43:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Rd3JpFdb; spf=pass (domain: gmail.com, ip: 209.85.208.181, mailfrom: liu.ming50@gmail.com) Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2fb49510250so33022841fa.0 for ; Sun, 27 Oct 2024 03:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730025816; x=1730630616; 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=zzZsmEhB3rNU7V30Dk9TM6DiEt0mouUp/JooeZqPx8o=; b=Rd3JpFdbDa5+ia4bdSI51onAyZNo5fvdnVKiE8MbLD0XhsEJfLgQ/tNUHtduHp4GBi xc7UOiFKzG0iZK7SgfOK8Ihz+G6pHehvvmvqmN2wedhL9synJJcMovtnjui/yfJKAdOV Psyrphk5IhTniJrdO1rCYiwsh+wBCAgMURysm4tZNtU62ipIfzMnsSgJJ+LAsJ1HHUSc iGKMKviu74fOYMQl4qpX3k2GZah49n91tJ+prWLAiR9sL79jecgJl3PSeV/FavaLqzR4 tmPDRD0hzLeat0SdJYUqFAd+5BTikVuJ8sYQbfxfLNydrHyn2wJfRkSD5mG1TewOoTCD Rn2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730025816; x=1730630616; 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=zzZsmEhB3rNU7V30Dk9TM6DiEt0mouUp/JooeZqPx8o=; b=RqCZxKMHzmKWaDQfUSLmQ7rsdHaCkHJ4c1WjnbthasoX6j3vscxBz//9Re6lfYgyU2 UuoEhS7h+dr0tLkC75dDP/naPPYmE3XmOzXSzaSN1M2XnCbtlDy6iwk44pPpqEJSEHZM wcVvDA1QKTcibI+ErCxPa/ozDkW8J/vi9ubMmaC0FP5R1h3RGkaGRzXe1gwCLOUOzelF W0UMUVnA0w7WcJp4Gavlx4lt3Bfck9nr8mnRPlfH/1hjG7a1s6EklHB5PQIReiq/mNfb c3aASoIdR7ZZfSohWz41JavkMX4ir8c3ZWfd9akp9lhMdzyVmJFRy50GdFMMWPqJ1Orc jkKA== X-Forwarded-Encrypted: i=1; AJvYcCXToNg179dCPWcaEjTqGyqSwME0CB7DZNXme1zTwLCPl+73fe4+SqbuRjTYS+tLZecy5P6WzJQ3LDBRKWF00Or18w==@lists.openembedded.org X-Gm-Message-State: AOJu0Yz+7ErHDaRGjcusgZtgejzU/RE523GlnuoK930f8jgvuk6wbinF B3OC9fl5xzVnuuLExo74w0VQjFRJ6ID1/GPE2DlbAoqvnXf16lKzvUcQICut X-Google-Smtp-Source: AGHT+IEz+NTRnrhTsL6WXQlgRdUEulB8dWjBz1OO3hEr7mpQZ1HBL4COLmMVyUd7Id5CEIu/2vEZQA== X-Received: by 2002:a2e:9fca:0:b0:2fa:cd7e:3b40 with SMTP id 38308e7fff4ca-2fcbdf76eefmr13513141fa.11.1730025815640; Sun, 27 Oct 2024 03:43:35 -0700 (PDT) Received: from peterliu-Precision-5680.. (customer-212-100-112-191.stosn.net. [212.100.112.191]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2fcb4617007sm8089771fa.126.2024.10.27.03.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 03:43:33 -0700 (PDT) From: Ming Liu To: ross.burton@arm.com, openembedded-core@lists.openembedded.org Cc: Ming Liu Subject: [OE-core] [PATCH V3 3/3] meta: support tar.zst SDK_ARCHIVE_TYPE Date: Sun, 27 Oct 2024 11:43:18 +0100 Message-ID: <20241027104318.8326-3-liu.ming50@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241027104318.8326-1-liu.ming50@gmail.com> References: <20241027104318.8326-1-liu.ming50@gmail.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 ; Sun, 27 Oct 2024 10:43:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206396 zst is much faster than the default xz, test result on my Precision 5680 machine: Installing a tar.xz SDK takes 37 seconds while tar.zst only takes 17 seconds. Let's introduce support for tar.zst. Also add a sanity check for supported archive types. Signed-off-by: Ming Liu --- meta/classes-recipe/populate_sdk_base.bbclass | 12 ++++++++++-- meta/files/toolchain-shar-extract.sh | 6 ++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass index 16013d5872..031c65f05f 100644 --- a/meta/classes-recipe/populate_sdk_base.bbclass +++ b/meta/classes-recipe/populate_sdk_base.bbclass @@ -84,6 +84,7 @@ SDK_XZ_OPTIONS ?= "${XZ_DEFAULTS} ${SDK_XZ_COMPRESSION_LEVEL}" SDK_ZIP_OPTIONS ?= "-y" SDK_7ZIP_OPTIONS ?= "-mx=9 -mm=BZip2" SDK_7ZIP_TYPE ?= "7z" +SDK_ZSTD_COMPRESSION_LEVEL = "-17" # To support different sdk type according to SDK_ARCHIVE_TYPE, now support zip and tar.xz python () { @@ -95,9 +96,16 @@ python () { elif d.getVar('SDK_ARCHIVE_TYPE') == '7zip': d.setVar('SDK_ARCHIVE_DEPENDS', 'p7zip-native') d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; 7za a -r ${SDK_7ZIP_OPTIONS} ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_7ZIP_TYPE} .') - else: + elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.zst': + d.setVar('SDK_ARCHIVE_DEPENDS', 'zstd-native') + d.setVar('SDK_ARCHIVE_CMD', + 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | zstd -f -k -T0 -c ${SDK_ZSTD_COMPRESSION_LEVEL} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') + elif d.getVar('SDK_ARCHIVE_TYPE') == 'tar.xz': d.setVar('SDK_ARCHIVE_DEPENDS', 'xz-native') - d.setVar('SDK_ARCHIVE_CMD', 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') + d.setVar('SDK_ARCHIVE_CMD', + 'cd ${SDK_OUTPUT}/${SDKPATH}; tar ${SDKTAROPTS} -cf - . | xz ${SDK_XZ_OPTIONS} > ${SDKDEPLOYDIR}/${TOOLCHAIN_OUTPUTNAME}.${SDK_ARCHIVE_TYPE}') + else: + bb.fatal("Invalid SDK_ARCHIVE_TYPE: %s, the supported SDK archive types are: zip, 7z, tar.xz, tar.zst" % d.getVar('SDK_ARCHIVE_TYPE')) } SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 8368a81196..a5c5d0444e 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -255,6 +255,12 @@ if [ @SDK_ARCHIVE_TYPE@ = "zip" ]; then else rm sdk.zip && exit 1 fi +elif [ @SDK_ARCHIVE_TYPE@ = "tar.zst" ]; then + if [ -z "$(command -v zstd)" ]; then + echo "Aborted, zstd is required to extract the SDK archive, please make sure it's installed on your system!" + exit 1 + fi + tail -n +$payload_offset "$0"| zstd -T0 -dc | $SUDO_EXEC tar mx -C $target_sdk_dir --checkpoint=.2500 $EXTRA_TAR_OPTIONS || exit 1 else if [ -z "$(command -v xz)" ]; then echo "Aborted, xz is required to extract the SDK archive, please make sure it's installed on your system!"