Update DTC to 1.6.1

packages/dtc/dtc.nuspec

@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>dtc-msys2</id>
-    <version>1.5.1</version>
+    <version>1.6.1</version>
     <owners>Carles Cufí</owners>
 
     <title>Device Tree Compiler (MSYS2 version)</title>
@@ -21,6 +21,9 @@
     <summary>The command-line Device Tree Compiler.</summary>
     <description>Device Tree Compiler (dtc) toolchain for working with device tree source and binary files and also libfdt, a utility library for reading and manipulating the binary format.</description>
     <releaseNotes>https://git.kernel.org/pub/scm/utils/dtc/dtc.git/tree/README</releaseNotes>
+    <dependencies>
+      <dependency id="zstandard" />
+    </dependencies>
   </metadata>
   <files>
     <file src="tools\**" target="tools" />

packages/dtc/tools/VERIFICATION.txt

@@ -4,32 +4,20 @@ in verifying that this package's contents are trustworthy.
 
 The files included in this package can be obtained from the MSYS2 repository:
 
-* 32-bit:
-http://repo.msys2.org/msys/i686/dtc-1.5.1-2-i686.pkg.tar.xz
-http://repo.msys2.org/msys/i686/msys2-runtime-3.1.7-2-i686.pkg.tar.xz
-http://repo.msys2.org/msys/i686/gcc-libs-9.3.0-1-i686.pkg.tar.xz
-http://repo.msys2.org/msys/i686/libyaml-0.2.4-1-i686.pkg.tar.xz
-
 * 64-bit:
-http://repo.msys2.org/msys/x86_64/dtc-1.5.1-2-x86_64.pkg.tar.xz
-http://repo.msys2.org/msys/x86_64/msys2-runtime-3.1.7-2-x86_64.pkg.tar.xz
-http://repo.msys2.org/msys/x86_64/gcc-libs-9.3.0-1-x86_64.pkg.tar.xz
-http://repo.msys2.org/msys/x86_64/libyaml-0.2.4-1-x86_64.pkg.tar.xz
+https://repo.msys2.org/msys/x86_64/dtc-1.6.1-3-x86_64.pkg.tar.zst
+https://repo.msys2.org/msys/x86_64/msys2-runtime-3.4.5-1-x86_64.pkg.tar.zst
+https://repo.msys2.org/msys/x86_64/gcc-libs-11.3.0-4-x86_64.pkg.tar.zst
+https://repo.msys2.org/msys/x86_64/libyaml-0.2.5-2-x86_64.pkg.tar.zst
 
 You can use one of the following methods to obtain the checksum (SHA256): 
     - Use powershell function 'Get-FileHash'
     - Use Chocolatey utility 'checksum.exe -t sha256'
 
 Checksums:
 
-* 32-bit:
-dtc-1.5.1-2-i686.pkg.tar.xz: 5442ED283EF9DDAA3BE5B5D4C1C52963A7955613F22E13632616B36C512419ED
-msys2-runtime-3.1.7-2-i686.pkg.tar.xz: F0E3FBF4E5332E06B624559B47B19D12C094ACDB8F201837CCF3014F27F186E4
-gcc-libs-9.3.0-1-i686.pkg.tar.xz: 54F03C84EB192C35298C5A7FC4FF258107207B7BA75F0FDF17E701BA6A174372
-libyaml-0.2.4-1-i686.pkg.tar.xz: 37BC03328B561512EBF86D25E26701CCDB70F0BDBF8C8DFD7EDA4A70004566A6
-
 * 64-bit:
-dtc-1.5.1-2-x86_64.pkg.tar.xz: 35A6936640C23BA33632AD2830A30FC6A47CF3318ADCCE1EE2D4EC7D1DFE0020
-msys2-runtime-3.1.7-2-x86_64.pkg.tar.xz: CEA16E60334E36A0B8250E1B30C5DEDDFDEB341E19729FB27C6450CB13D7B628
-gcc-libs-9.3.0-1-x86_64.pkg.tar.xz: 79A74BB1EF1D7F4EB12F7437AC24371EC9E41A3D96B653A2EC7F09D1E7AA9C63
-libyaml-0.2.4-1-x86_64.pkg.tar.xz: E9240AE944D7EF63FA70BA9730DDDA21AA3FFB95F7AB64E65E00E2AF664672C8
+dtc-1.6.1-3-x86_64.pkg.tar.zst: 7815185E2C1579DA62FD70D6511E0C2DFF212FF43EEF4E24AFBEAADA776F149F
+msys2-runtime-3.4.5-1-x86_64.pkg.tar.zst: C9F05EF31B227A4C037F670FD2218AF18B92E57A10FFC7E334CC323F9454DF09
+gcc-libs-11.3.0-4-x86_64.pkg.tar.zst: 77FC9612C4AC2A4683806B24D057103A8CC1FC4EF6ADE23D13C6925192EF3F8D
+libyaml-0.2.5-2-x86_64.pkg.tar.zst: 11509C6E3133B3FC63F99CC04E89A1CC5685AA746E96BD5F481E3424FBD4F6C1

packages/dtc/tools/chocolateyinstall.ps1

@@ -3,52 +3,44 @@
 $packageName= 'dtc-msys2'
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 
-$yamlxvFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit yaml .pkg.tar.xz"; Get-Item "$toolsDir\libyaml-*x86_64.pkg.tar.xz"
-} else { Write-Host "Getting x32 bit yaml .pkg.tar.xz"; Get-Item "$toolsDir\libyaml-*i686.pkg.tar.xz" }
+Write-Host "Getting x64 bit yaml .pkg.tar.zst"
+$yamlxvFile = Get-Item "$toolsDir\libyaml-*x86_64.pkg.tar.zst"
 
-$libxvFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit libs .pkg.tar.xz"; Get-Item "$toolsDir\gcc-libs-*x86_64.pkg.tar.xz"
-} else { Write-Host "Getting x32 bit libs .pkg.tar.xz"; Get-Item "$toolsDir\gcc-libs-*i686.pkg.tar.xz" }
+Write-Host "Getting x64 bit libs .pkg.tar.zst"
+$libxvFile = Get-Item "$toolsDir\gcc-libs-*x86_64.pkg.tar.zst"
 
-$rtxvFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit core .pkg.tar.xz"; Get-Item "$toolsDir\msys2-runtime-*x86_64.pkg.tar.xz"
-} else { Write-Host "Getting x32 bit core .pkg.tar.xz"; Get-Item "$toolsDir\msys2-runtime-*i686.pkg.tar.xz" }
+Write-Host "Getting x64 bit core .pkg.tar.zst"
+$rtxvFile = Get-Item "$toolsDir\msys2-runtime-*x86_64.pkg.tar.zst"
 
-$dtcxvFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit dtc .pkg.tar.xz"; Get-Item "$toolsDir\dtc-*x86_64.pkg.tar.xz"
-} else { Write-Host "Getting x32 bit dtc .pkg.tar.xz"; Get-Item "$toolsDir\dtc-*i686.pkg.tar.xz" }
+Write-Host "Getting x64 bit dtc .pkg.tar.zst"
+$dtcxvFile = Get-Item "$toolsDir\dtc-*x86_64.pkg.tar.zst"
 
-Get-ChocolateyUnzip -FileFullPath $yamlxvfile -Destination $toolsDir
-Get-ChocolateyUnzip -FileFullPath $libxvfile -Destination $toolsDir
-Get-ChocolateyUnzip -FileFullPath $rtxvfile -Destination $toolsDir
-Get-ChocolateyUnzip -FileFullPath $dtcxvfile -Destination $toolsDir
+zstd --quiet --decompress $yamlxvfile
+zstd --quiet --decompress $libxvfile
+zstd --quiet --decompress $rtxvfile
+zstd --quiet --decompress $dtcxvfile
 
-$yamltarFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit libs .pkg.tar"; Get-Item "$toolsDir\libyaml-*x86_64.pkg.tar"
-} else { Write-Host "Getting x32 bit libs .pkg.tar"; Get-Item "$toolsDir\libyaml-*i686.pkg.tar" }
+Write-Host "Getting x64 bit libs .pkg.tar"
+$yamltarFile = Get-Item "$toolsDir\libyaml-*x86_64.pkg.tar"
 
-$libtarFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit libs .pkg.tar"; Get-Item "$toolsDir\gcc-libs-*x86_64.pkg.tar"
-} else { Write-Host "Getting x32 bit libs .pkg.tar"; Get-Item "$toolsDir\gcc-libs-*i686.pkg.tar" }
+Write-Host "Getting x64 bit libs .pkg.tar"
+$libtarFile = Get-Item "$toolsDir\gcc-libs-*x86_64.pkg.tar"
 
-$rttarFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit core .pkg.tar"; Get-Item "$toolsDir\msys2-runtime-*x86_64.pkg.tar"
-} else { Write-Host "Getting x32 bit core .pkg.tar"; Get-Item "$toolsDir\msys2-runtime-*i686.pkg.tar" }
+Write-Host "Getting x64 bit core .pkg.tar"
+$rttarFile = Get-Item "$toolsDir\msys2-runtime-*x86_64.pkg.tar"
 
-$dtctarFile = if ((Get-ProcessorBits 64) -and $env:chocolateyForceX86 -ne 'true') {
-         Write-Host "Getting x64 bit dtc .pkg.tar"; Get-Item "$toolsDir\dtc-*x86_64.pkg.tar"
-} else { Write-Host "Getting x32 bit dtc .pkg.tar"; Get-Item "$toolsDir\dtc-*i686.pkg.tar" }
+Write-Host "Getting x64 bit dtc .pkg.tar"
+$dtctarFile = Get-Item "$toolsDir\dtc-*x86_64.pkg.tar"
 
-Get-ChocolateyUnzip -FileFullPath $dtctarfile -Destination $toolsDir
+Get-ChocolateyUnzip -FileFullPath64 $dtctarfile -Destination $toolsDir
 # Get file list for DTC
 $dtcFiles = Get-ChildItem $toolsDir\usr\bin | ForEach-Object { $_.FullName }
-Get-ChocolateyUnzip -FileFullPath $libtarfile -Destination $toolsDir
-Get-ChocolateyUnzip -FileFullPath $rttarfile -Destination $toolsDir
-Get-ChocolateyUnzip -FileFullPath $yamltarfile -Destination $toolsDir
+Get-ChocolateyUnzip -FileFullPath64 $libtarfile -Destination $toolsDir
+Get-ChocolateyUnzip -FileFullPath64 $rttarfile -Destination $toolsDir
+Get-ChocolateyUnzip -FileFullPath64 $yamltarfile -Destination $toolsDir
 
 # don't need tars anymore
-Remove-Item ($toolsDir + '\*.' + 'xz')
+Remove-Item ($toolsDir + '\*.' + 'zst')
 Remove-Item ($toolsDir + '\*.' + 'tar')
 
 # Clean up \usr\bin folder, we only need a set of files