Skip to content

Commit 16d8126

Browse files
[main] Update dependencies from dotnet/arcade (#82342)
* Update dependencies from https://github.com/dotnet/arcade build 20230217.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23115.1 -> To Version 8.0.0-beta.23117.2 * Update dependencies from https://github.com/dotnet/arcade build 20230218.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23115.1 -> To Version 8.0.0-beta.23118.1 * Update dependencies from https://github.com/dotnet/arcade build 20230220.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23115.1 -> To Version 8.0.0-beta.23120.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 134de4b commit 16d8126

File tree

5 files changed

+165
-87
lines changed

5 files changed

+165
-87
lines changed

eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -100,73 +100,73 @@
100100
</Dependency>
101101
</ProductDependencies>
102102
<ToolsetDependencies>
103-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23115.1">
103+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23120.1">
104104
<Uri>https://github.com/dotnet/arcade</Uri>
105-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
105+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
106106
</Dependency>
107-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23115.1">
107+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23120.1">
108108
<Uri>https://github.com/dotnet/arcade</Uri>
109-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
109+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
110110
</Dependency>
111-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23115.1">
111+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23120.1">
112112
<Uri>https://github.com/dotnet/arcade</Uri>
113-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
113+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
114114
</Dependency>
115-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23115.1">
115+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23120.1">
116116
<Uri>https://github.com/dotnet/arcade</Uri>
117-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
117+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
118118
</Dependency>
119-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23115.1">
119+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23120.1">
120120
<Uri>https://github.com/dotnet/arcade</Uri>
121-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
121+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
122122
</Dependency>
123-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23115.1">
123+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23120.1">
124124
<Uri>https://github.com/dotnet/arcade</Uri>
125-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
125+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
126126
</Dependency>
127-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23115.1">
127+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23120.1">
128128
<Uri>https://github.com/dotnet/arcade</Uri>
129-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
129+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
130130
</Dependency>
131-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23115.1">
131+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23120.1">
132132
<Uri>https://github.com/dotnet/arcade</Uri>
133-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
133+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23115.1">
135+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23120.1">
136136
<Uri>https://github.com/dotnet/arcade</Uri>
137-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
137+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23115.1">
139+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23120.1">
140140
<Uri>https://github.com/dotnet/arcade</Uri>
141-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
141+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
142142
</Dependency>
143-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23115.1">
143+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23120.1">
144144
<Uri>https://github.com/dotnet/arcade</Uri>
145-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
145+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
146146
</Dependency>
147-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23115.1">
147+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23120.1">
148148
<Uri>https://github.com/dotnet/arcade</Uri>
149-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
149+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
150150
</Dependency>
151-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23115.1">
151+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23120.1">
152152
<Uri>https://github.com/dotnet/arcade</Uri>
153-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
153+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
154154
</Dependency>
155-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23115.1">
155+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23120.1">
156156
<Uri>https://github.com/dotnet/arcade</Uri>
157-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
157+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
158158
</Dependency>
159-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23115.1">
159+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23120.1">
160160
<Uri>https://github.com/dotnet/arcade</Uri>
161-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
161+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
162162
</Dependency>
163-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23115.1">
163+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23120.1">
164164
<Uri>https://github.com/dotnet/arcade</Uri>
165-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
165+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
166166
</Dependency>
167-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23115.1">
167+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23120.1">
168168
<Uri>https://github.com/dotnet/arcade</Uri>
169-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
169+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
170170
</Dependency>
171171
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23113.1">
172172
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -296,9 +296,9 @@
296296
<Uri>https://github.com/dotnet/xharness</Uri>
297297
<Sha>8d789cbeecb6c89bf470fdc7727a8f501724fc8a</Sha>
298298
</Dependency>
299-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23115.1">
299+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23120.1">
300300
<Uri>https://github.com/dotnet/arcade</Uri>
301-
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
301+
<Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
302302
</Dependency>
303303
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23068.4">
304304
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@
8484
<!-- SDK dependencies -->
8585
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.2.23107.1</MicrosoftDotNetApiCompatTaskVersion>
8686
<!-- Arcade dependencies -->
87-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksFeedVersion>
88-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23115.1</MicrosoftDotNetCodeAnalysisVersion>
89-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23115.1</MicrosoftDotNetGenAPIVersion>
90-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23115.1</MicrosoftDotNetGenFacadesVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23115.1</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23115.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23115.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23115.1</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23115.1</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23115.1</MicrosoftDotNetPackageTestingVersion>
87+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksFeedVersion>
88+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23120.1</MicrosoftDotNetCodeAnalysisVersion>
89+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23120.1</MicrosoftDotNetGenAPIVersion>
90+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23120.1</MicrosoftDotNetGenFacadesVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23120.1</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23120.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23120.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23120.1</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23120.1</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23120.1</MicrosoftDotNetPackageTestingVersion>
102102
<!-- NuGet dependencies -->
103103
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
104104
<!-- Installer dependencies -->

eng/common/cross/build-rootfs.sh

Lines changed: 104 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ usage()
66
{
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
9-
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
10-
echo " for FreeBSD can be: freebsd12, freebsd13"
11-
echo " for illumos can be: illumos"
12-
echo " for Haiku can be: haiku."
9+
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
10+
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
11+
echo " for FreeBSD can be: freebsd12, freebsd13"
12+
echo " for illumos can be: illumos"
13+
echo " for Haiku can be: haiku."
1314
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
1415
echo "llvmx[.y] - optional, LLVM version for LLVM related packages."
1516
echo "--skipunmount - optional, will skip the unmount of rootfs folder."
@@ -145,35 +146,54 @@ while :; do
145146
__Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg"
146147
fi
147148
;;
148-
ppc64le)
149-
__BuildArch=ppc64le
150-
__UbuntuArch=ppc64el
151-
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
152-
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
153-
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
154-
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
155-
unset __LLDB_Package
156-
;;
157149
riscv64)
158150
__BuildArch=riscv64
151+
__AlpineArch=riscv64
152+
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
153+
__AlpinePackages="${__AlpinePackages// compiler-rt-static/}"
154+
__QEMUArch=riscv64
159155
__UbuntuArch=riscv64
160156
__UbuntuRepo="http://deb.debian.org/debian-ports"
161-
__CodeName=sid
162157
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
163158
unset __LLDB_Package
164159

165160
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
166161
__Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring"
167162
fi
163+
164+
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
165+
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
166+
fi
167+
;;
168+
ppc64le)
169+
__BuildArch=ppc64le
170+
__AlpineArch=ppc64le
171+
__QEMUArch=ppc64le
172+
__UbuntuArch=ppc64el
173+
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
174+
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
175+
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
176+
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
177+
unset __LLDB_Package
178+
179+
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
180+
__AlpineVersion=3.15 # minimum version that supports compiler-rt
181+
fi
168182
;;
169183
s390x)
170184
__BuildArch=s390x
185+
__AlpineArch=s390x
186+
__QEMUArch=s390x
171187
__UbuntuArch=s390x
172188
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
173189
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
174190
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
175191
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
176192
unset __LLDB_Package
193+
194+
if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then
195+
__AlpineVersion=3.15 # minimum version that supports compiler-rt
196+
fi
177197
;;
178198
x64)
179199
__BuildArch=x64
@@ -252,22 +272,53 @@ while :; do
252272
__UbuntuRepo="http://ftp.debian.org/debian/"
253273
__LLDB_Package="liblldb-6.0-dev"
254274
;;
275+
bullseye) # Debian 11
276+
__CodeName=bullseye
277+
__UbuntuRepo="http://ftp.debian.org/debian/"
278+
;;
279+
sid) # Debian sid
280+
__CodeName=sid
281+
__UbuntuRepo="http://ftp.debian.org/debian/"
282+
;;
255283
tizen)
256284
__CodeName=
257285
__UbuntuRepo=
258286
__Tizen=tizen
259287
;;
260-
alpine|alpine3.13)
288+
alpine*)
261289
__CodeName=alpine
262290
__UbuntuRepo=
263-
__AlpineVersion=3.13
264-
__AlpinePackages+=" llvm10-libs"
265-
;;
266-
alpine3.14)
267-
__CodeName=alpine
268-
__UbuntuRepo=
269-
__AlpineVersion=3.14
270-
__AlpinePackages+=" llvm11-libs"
291+
version="${lowerI/alpine/}"
292+
293+
if [[ "$version" == "edge" ]]; then
294+
__AlpineVersion=edge
295+
else
296+
parts=(${version//./ })
297+
__AlpineMajorVersion="${parts[0]}"
298+
__AlpineMinoVersion="${parts[1]}"
299+
300+
if [[ -z "$__AlpineVersion" ]]; then
301+
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
302+
fi
303+
fi
304+
305+
case "$__AlpineVersion" in
306+
3.14) __AlpinePackages+=" llvm11-libs" ;;
307+
3.15) __AlpinePackages+=" llvm12-libs" ;;
308+
3.16) __AlpinePackages+=" llvm13-libs" ;;
309+
3.17) __AlpinePackages+=" llvm15-libs" ;;
310+
edge) __AlpineLlvmLibsLookup=1 ;;
311+
*)
312+
if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then
313+
__AlpineVersion=3.15 # minimum version that supports compiler-rt
314+
__AlpinePackages+=" llvm12-libs"
315+
elif [[ "$__AlpineArch" == "riscv64" ]]; then
316+
__AlpineLlvmLibsLookup=1
317+
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
318+
else
319+
__AlpineVersion=3.13 # 3.13 to maximize compatibility
320+
fi
321+
esac
271322
;;
272323
freebsd12)
273324
__CodeName=freebsd
@@ -341,18 +392,40 @@ mkdir -p "$__RootfsDir"
341392
__RootfsDir="$( cd "$__RootfsDir" && pwd )"
342393

343394
if [[ "$__CodeName" == "alpine" ]]; then
344-
__ApkToolsVersion=2.9.1
395+
__ApkToolsVersion=2.12.11
345396
__ApkToolsDir="$(mktemp -d)"
346-
wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir"
347-
tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir"
397+
398+
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir"
399+
chmod +x "$__ApkToolsDir/apk.static"
400+
348401
mkdir -p "$__RootfsDir"/usr/bin
349402
cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin"
350403

351-
"$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk" \
352-
-X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main" \
353-
-X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community" \
354-
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \
355-
add $__AlpinePackages
404+
if [[ "$__AlpineVersion" == "edge" ]]; then
405+
version=edge
406+
else
407+
version="v$__AlpineVersion"
408+
fi
409+
410+
"$__ApkToolsDir/apk.static" \
411+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
412+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
413+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \
414+
add $__AlpinePackages
415+
416+
if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then
417+
"$__ApkToolsDir/apk.static" \
418+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
419+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
420+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
421+
search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do
422+
"$__ApkToolsDir/apk.static" \
423+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
424+
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
425+
-U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \
426+
add "$name-libs"
427+
done
428+
fi
356429

357430
rm -r "$__ApkToolsDir"
358431
elif [[ "$__CodeName" == "freebsd" ]]; then

0 commit comments

Comments
 (0)