Skip to content

Commit 886e2ff

Browse files
dotnet-maestro[bot]ericstj
dotnet-maestro[bot]
and
ericstj
authored
[main] Update dependencies from dotnet/arcade (#7266)
* Update dependencies from https://github.com/dotnet/arcade build 20241010.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24510.1 * Update dependencies from https://github.com/dotnet/arcade build 20241011.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24510.1 -> To Version 10.0.0-beta.24511.1 * Update dependencies from https://github.com/dotnet/arcade build 20241015.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24511.1 -> To Version 10.0.0-beta.24515.3 * Update dependencies from https://github.com/dotnet/arcade build 20241027.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24527.1 * Update dependencies from https://github.com/dotnet/arcade build 20241101.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24551.1 * Update dependencies from https://github.com/dotnet/arcade build 20241110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24560.1 * Update dependencies from https://github.com/dotnet/arcade build 20241114.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24564.1 * Update dependencies from https://github.com/dotnet/arcade build 20241122.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24572.3 * Update dependencies from https://github.com/dotnet/arcade build 20241128.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24578.2 * Update dependencies from https://github.com/dotnet/arcade build 20241206.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24606.6 * Update dependencies from https://github.com/dotnet/arcade build 20241213.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24613.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <[email protected]>
1 parent 23052ec commit 886e2ff

File tree

15 files changed

+254
-192
lines changed

15 files changed

+254
-192
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24613.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
12+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24504.4">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.24613.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
16+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24504.4">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24613.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
20+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24504.4">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24613.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
24+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.24504.4">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.24613.2">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
33+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24504.4">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24613.2">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
37+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24504.4">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24613.2">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
41+
<Sha>255d5e0c89958af276883a988108c2d616438805</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9595
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
9696
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
97-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24504.4</MicrosoftDotNetXUnitExtensionsVersion>
97+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24613.2</MicrosoftDotNetXUnitExtensionsVersion>
9898
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
9999
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
100100
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎eng/common/build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ function Build {
231231
/p:Restore=$restore \
232232
/p:Build=$build \
233233
/p:DotNetBuildRepo=$product_build \
234-
/p:ArcadeBuildFromSource=$source_build \
235234
/p:DotNetBuildSourceOnly=$source_build \
236235
/p:Rebuild=$rebuild \
237236
/p:Test=$test \

‎eng/common/core-templates/job/job.yml‎

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -128,33 +128,11 @@ jobs:
128128
- ${{ preStep }}
129129

130130
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
131-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
132-
- task: MicroBuildSigningPlugin@4
133-
displayName: Install MicroBuild plugin
134-
inputs:
135-
signType: $(_SignType)
136-
zipSources: false
137-
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
139-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
140-
env:
141-
TeamName: $(_TeamName)
142-
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
143-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
131+
- template: /eng/common/core-templates/steps/install-microbuild.yml
132+
parameters:
133+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
134+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
144135
continueOnError: ${{ parameters.continueOnError }}
145-
condition: and(
146-
succeeded(),
147-
or(
148-
and(
149-
eq(variables['Agent.Os'], 'Windows_NT'),
150-
in(variables['_SignType'], 'real', 'test')
151-
),
152-
and(
153-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
154-
ne(variables['Agent.Os'], 'Windows_NT'),
155-
eq(variables['_SignType'], 'real')
156-
)
157-
))
158136

159137
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
160138
- task: NuGetAuthenticate@1
@@ -183,26 +161,12 @@ jobs:
183161
- ${{ each step in parameters.componentGovernanceSteps }}:
184162
- ${{ step }}
185163

186-
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
187-
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
188-
- task: MicroBuildCleanup@1
189-
displayName: Execute Microbuild cleanup tasks
190-
condition: and(
191-
always(),
192-
or(
193-
and(
194-
eq(variables['Agent.Os'], 'Windows_NT'),
195-
in(variables['_SignType'], 'real', 'test')
196-
),
197-
and(
198-
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
199-
ne(variables['Agent.Os'], 'Windows_NT'),
200-
eq(variables['_SignType'], 'real')
201-
)
202-
))
164+
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
165+
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
166+
parameters:
167+
enableMicrobuild: ${{ parameters.enableMicrobuild }}
168+
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
203169
continueOnError: ${{ parameters.continueOnError }}
204-
env:
205-
TeamName: $(_TeamName)
206170

207171
# Publish test results
208172
- ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}:

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ parameters:
1212
# The name of the job. This is included in the job ID.
1313
# targetRID: ''
1414
# The name of the target RID to use, instead of the one auto-detected by Arcade.
15-
# nonPortable: false
15+
# portableBuild: false
1616
# Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than
17-
# linux-x64), and compiling against distro-provided packages rather than portable ones.
17+
# linux-x64), and compiling against distro-provided packages rather than portable ones. The
18+
# default is portable mode.
1819
# skipPublishValidation: false
1920
# Disables publishing validation. By default, a check is performed to ensure no packages are
2021
# published by source-build.

‎eng/common/core-templates/steps/cleanup-microbuild.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
- task: MicroBuildCleanup@1
12+
displayName: Execute Microbuild cleanup tasks
13+
condition: and(
14+
always(),
15+
or(
16+
and(
17+
eq(variables['Agent.Os'], 'Windows_NT'),
18+
in(variables['_SignType'], 'real', 'test')
19+
),
20+
and(
21+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
22+
ne(variables['Agent.Os'], 'Windows_NT'),
23+
eq(variables['_SignType'], 'real')
24+
)
25+
))
26+
continueOnError: ${{ parameters.continueOnError }}
27+
env:
28+
TeamName: $(_TeamName)

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
parameters:
2+
# Enable cleanup tasks for MicroBuild
3+
enableMicrobuild: false
4+
# Enable cleanup tasks for MicroBuild on Mac and Linux
5+
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
6+
enableMicrobuildForMacAndLinux: false
7+
continueOnError: false
8+
9+
steps:
10+
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
11+
# Remove Python downgrade with https://github.com/dotnet/arcade/issues/15151
12+
- ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
13+
- task: UsePythonVersion@0
14+
displayName: 'Use Python 3.11.x'
15+
inputs:
16+
versionSpec: '3.11.x'
17+
18+
- task: MicroBuildSigningPlugin@4
19+
displayName: Install MicroBuild plugin
20+
inputs:
21+
signType: $(_SignType)
22+
zipSources: false
23+
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
24+
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
25+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
26+
env:
27+
TeamName: $(_TeamName)
28+
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
29+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
30+
continueOnError: ${{ parameters.continueOnError }}
31+
condition: and(
32+
succeeded(),
33+
or(
34+
and(
35+
eq(variables['Agent.Os'], 'Windows_NT'),
36+
in(variables['_SignType'], 'real', 'test')
37+
),
38+
and(
39+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
40+
ne(variables['Agent.Os'], 'Windows_NT'),
41+
eq(variables['_SignType'], 'real')
42+
)
43+
))

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@ steps:
7676
assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml
7777
fi
7878
79+
portableBuildArgs=
80+
if [ '${{ parameters.platform.portableBuild }}' != '' ]; then
81+
portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}'
82+
fi
83+
7984
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8085
--configuration $buildConfig \
8186
--restore --build --pack $publishArgs -bl \
@@ -85,8 +90,7 @@ steps:
8590
$targetRidArgs \
8691
$runtimeOsArgs \
8792
$baseOsArgs \
88-
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
89-
/p:ArcadeBuildFromSource=true \
93+
$portableBuildArgs \
9094
/p:DotNetBuildSourceOnly=true \
9195
/p:DotNetBuildRepo=true \
9296
/p:AssetManifestFileName=$assetManifestFileName

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,12 @@ __UbuntuPackages+=" symlinks"
5252
__UbuntuPackages+=" libicu-dev"
5353
__UbuntuPackages+=" liblttng-ust-dev"
5454
__UbuntuPackages+=" libunwind8-dev"
55-
__UbuntuPackages+=" libnuma-dev"
5655

5756
__AlpinePackages+=" gettext-dev"
5857
__AlpinePackages+=" icu-dev"
5958
__AlpinePackages+=" libunwind-dev"
6059
__AlpinePackages+=" lttng-ust-dev"
6160
__AlpinePackages+=" compiler-rt"
62-
__AlpinePackages+=" numactl-dev"
6361

6462
# runtime libraries' dependencies
6563
__UbuntuPackages+=" libcurl4-openssl-dev"
@@ -73,8 +71,8 @@ __AlpinePackages+=" krb5-dev"
7371
__AlpinePackages+=" openssl-dev"
7472
__AlpinePackages+=" zlib-dev"
7573

76-
__FreeBSDBase="13.3-RELEASE"
77-
__FreeBSDPkg="1.17.0"
74+
__FreeBSDBase="13.4-RELEASE"
75+
__FreeBSDPkg="1.21.3"
7876
__FreeBSDABI="13"
7977
__FreeBSDPackages="libunwind"
8078
__FreeBSDPackages+=" icu"
@@ -371,7 +369,7 @@ while :; do
371369
;;
372370
freebsd14)
373371
__CodeName=freebsd
374-
__FreeBSDBase="14.0-RELEASE"
372+
__FreeBSDBase="14.2-RELEASE"
375373
__FreeBSDABI="14"
376374
__SkipUnmount=1
377375
;;
@@ -424,13 +422,12 @@ case "$__AlpineVersion" in
424422
elif [[ "$__AlpineArch" == "riscv64" ]]; then
425423
__AlpineLlvmLibsLookup=1
426424
__AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive)
425+
elif [[ -n "$__AlpineVersion" ]]; then
426+
# use whichever alpine version is provided and select the latest toolchain libs
427+
__AlpineLlvmLibsLookup=1
427428
else
428429
__AlpineVersion=3.13 # 3.13 to maximize compatibility
429430
__AlpinePackages+=" llvm10-libs"
430-
431-
if [[ "$__AlpineArch" == "armv7" ]]; then
432-
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
433-
fi
434431
fi
435432
esac
436433

@@ -444,11 +441,6 @@ if [[ "$__BuildArch" == "armel" ]]; then
444441
__LLDB_Package="lldb-3.5-dev"
445442
fi
446443

447-
if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then
448-
# libnuma-dev is not available on armhf for xenial
449-
__UbuntuPackages="${__UbuntuPackages//libnuma-dev/}"
450-
fi
451-
452444
__UbuntuPackages+=" ${__LLDB_Package:-}"
453445

454446
if [[ -z "$__UbuntuRepo" ]]; then
@@ -574,7 +566,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
574566
curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version
575567
fi
576568
echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf
577-
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
569+
echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf
578570
mkdir -p "$__RootfsDir"/tmp
579571
# get and build package manager
580572
if [[ "$__hasWget" == 1 ]]; then

0 commit comments

Comments
 (0)