Skip to content

Commit 731d936

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from 8 repositories (#66539)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 8c97244 commit 731d936

10 files changed

Lines changed: 391 additions & 165 deletions

File tree

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "1.0.0-prerelease.22160.1",
18+
"version": "1.0.0-prerelease.22164.2",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Version.Details.xml‎

Lines changed: 104 additions & 104 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
3737
<MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
3838
<MicrosoftCodeAnalysisCSharpVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisCSharpVersion>
39-
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22160.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
39+
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22166.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
4040
<MicrosoftCodeAnalysisVersion>4.2.0-2.22128.1</MicrosoftCodeAnalysisVersion>
4141
<!--
4242
TODO: Remove pinned compiler version once arcade supplies runtime with a compiler capable of handling !!
@@ -46,31 +46,31 @@
4646
<!-- SDK dependencies -->
4747
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
4848
<!-- Arcade dependencies -->
49-
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22159.9</MicrosoftDotNetApiCompatVersion>
50-
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksFeedVersion>
51-
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22157.6</MicrosoftDotNetCodeAnalysisVersion>
52-
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22157.6</MicrosoftDotNetGenAPIVersion>
53-
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22157.6</MicrosoftDotNetGenFacadesVersion>
54-
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22157.6</MicrosoftDotNetXUnitExtensionsVersion>
55-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22157.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
56-
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksArchivesVersion>
57-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksInstallersVersion>
58-
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksPackagingVersion>
59-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
60-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksTemplatingVersion>
61-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22157.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
62-
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22157.6</MicrosoftDotNetRemoteExecutorVersion>
63-
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22157.6</MicrosoftDotNetVersionToolsTasksVersion>
64-
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22157.6</MicrosoftDotNetPackageTestingVersion>
49+
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22166.1</MicrosoftDotNetApiCompatVersion>
50+
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksFeedVersion>
51+
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22166.1</MicrosoftDotNetCodeAnalysisVersion>
52+
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22166.1</MicrosoftDotNetGenAPIVersion>
53+
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22166.1</MicrosoftDotNetGenFacadesVersion>
54+
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22166.1</MicrosoftDotNetXUnitExtensionsVersion>
55+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22166.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
56+
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksArchivesVersion>
57+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksInstallersVersion>
58+
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksPackagingVersion>
59+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
60+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksTemplatingVersion>
61+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22166.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
62+
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22166.1</MicrosoftDotNetRemoteExecutorVersion>
63+
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22166.1</MicrosoftDotNetVersionToolsTasksVersion>
64+
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22166.1</MicrosoftDotNetPackageTestingVersion>
6565
<!-- NuGet dependencies -->
6666
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
6767
<!-- Installer dependencies -->
68-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.3.22157.1</MicrosoftNETCoreAppRuntimewinx64Version>
69-
<MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.3.22157.1</MicrosoftNETCoreDotNetHostVersion>
70-
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.3.22157.1</MicrosoftNETCoreDotNetHostPolicyVersion>
68+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-preview.3.22163.2</MicrosoftNETCoreAppRuntimewinx64Version>
69+
<MicrosoftNETCoreDotNetHostVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreDotNetHostVersion>
70+
<MicrosoftNETCoreDotNetHostPolicyVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreDotNetHostPolicyVersion>
7171
<MicrosoftExtensionsDependencyModelVersion>3.1.0</MicrosoftExtensionsDependencyModelVersion>
7272
<!-- CoreClr dependencies -->
73-
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.3.22157.1</MicrosoftNETCoreILAsmVersion>
73+
<MicrosoftNETCoreILAsmVersion>7.0.0-preview.3.22163.2</MicrosoftNETCoreILAsmVersion>
7474
<runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxarm64MicrosoftNETCoreRuntimeObjWriterVersion>
7575
<runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxx64MicrosoftNETCoreRuntimeObjWriterVersion>
7676
<runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>1.0.0-alpha.1.22157.1</runtimelinuxmuslarm64MicrosoftNETCoreRuntimeObjWriterVersion>
@@ -113,24 +113,24 @@
113113
<SystemSecurityCryptographyOpenSslVersion>5.0.0</SystemSecurityCryptographyOpenSslVersion>
114114
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
115115
<SystemServiceModelPrimitivesVersion>4.9.0</SystemServiceModelPrimitivesVersion>
116-
<SystemTextJsonVersion>7.0.0-preview.3.22157.1</SystemTextJsonVersion>
116+
<SystemTextJsonVersion>7.0.0-preview.3.22163.2</SystemTextJsonVersion>
117117
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
118118
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
119119
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
120-
<runtimenativeSystemIOPortsVersion>7.0.0-preview.3.22157.1</runtimenativeSystemIOPortsVersion>
120+
<runtimenativeSystemIOPortsVersion>7.0.0-preview.3.22163.2</runtimenativeSystemIOPortsVersion>
121121
<!-- Runtime-Assets dependencies -->
122-
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22160.1</SystemRuntimeNumericsTestDataVersion>
123-
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22160.1</SystemComponentModelTypeConverterTestDataVersion>
124-
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22160.1</SystemDrawingCommonTestDataVersion>
125-
<SystemIOCompressionTestDataVersion>7.0.0-beta.22160.1</SystemIOCompressionTestDataVersion>
126-
<SystemIOPackagingTestDataVersion>7.0.0-beta.22160.1</SystemIOPackagingTestDataVersion>
127-
<SystemNetTestDataVersion>7.0.0-beta.22160.1</SystemNetTestDataVersion>
128-
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22160.1</SystemPrivateRuntimeUnicodeDataVersion>
129-
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22160.1</SystemRuntimeTimeZoneDataVersion>
130-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22160.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
131-
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22160.1</SystemTextRegularExpressionsTestDataVersion>
132-
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22160.1</SystemWindowsExtensionsTestDataVersion>
133-
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22160.1</MicrosoftDotNetCilStripSourcesVersion>
122+
<SystemRuntimeNumericsTestDataVersion>7.0.0-beta.22166.2</SystemRuntimeNumericsTestDataVersion>
123+
<SystemComponentModelTypeConverterTestDataVersion>7.0.0-beta.22166.2</SystemComponentModelTypeConverterTestDataVersion>
124+
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22166.2</SystemDrawingCommonTestDataVersion>
125+
<SystemIOCompressionTestDataVersion>7.0.0-beta.22166.2</SystemIOCompressionTestDataVersion>
126+
<SystemIOPackagingTestDataVersion>7.0.0-beta.22166.2</SystemIOPackagingTestDataVersion>
127+
<SystemNetTestDataVersion>7.0.0-beta.22166.2</SystemNetTestDataVersion>
128+
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22166.2</SystemPrivateRuntimeUnicodeDataVersion>
129+
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22166.2</SystemRuntimeTimeZoneDataVersion>
130+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22166.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
131+
<SystemTextRegularExpressionsTestDataVersion>7.0.0-beta.22166.2</SystemTextRegularExpressionsTestDataVersion>
132+
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.22166.2</SystemWindowsExtensionsTestDataVersion>
133+
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.22166.2</MicrosoftDotNetCilStripSourcesVersion>
134134
<!-- dotnet-optimization dependencies -->
135135
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.22121.2</optimizationwindows_ntx64MIBCRuntimeVersion>
136136
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.22121.2</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -152,10 +152,10 @@
152152
<!-- Testing -->
153153
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
154154
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
155-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22160.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
156-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22160.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
157-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22160.1</MicrosoftDotNetXHarnessCLIVersion>
158-
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.22157.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
155+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22164.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
156+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22164.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
157+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22164.2</MicrosoftDotNetXHarnessCLIVersion>
158+
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.22164.2</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
159159
<XUnitVersion>2.4.2-pre.22</XUnitVersion>
160160
<XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
161161
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
@@ -176,16 +176,16 @@
176176
<!-- MsQuic -->
177177
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.22160.2</SystemNetMsQuicTransportVersion>
178178
<!-- Mono LLVM -->
179-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22121.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
180-
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22121.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
181-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22121.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
182-
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22121.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
183-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22121.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
184-
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22121.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
185-
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22121.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
186-
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22121.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
179+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22164.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
180+
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22164.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
181+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22164.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
182+
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22164.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
183+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22164.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
184+
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22164.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
185+
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22164.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
186+
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22164.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
187187
<!-- emscripten / Node -->
188-
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.3.22128.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
188+
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-preview.3.22167.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
189189
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
190190
<!-- workloads -->
191191
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ while :; do
194194
__LLDB_Package="liblldb-6.0-dev"
195195
;;
196196
tizen)
197-
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ]; then
198-
echo "Tizen is available only for arm, armel and arm64."
197+
if [ "$__BuildArch" != "arm" ] && [ "$__BuildArch" != "armel" ] && [ "$__BuildArch" != "arm64" ] && [ "$__BuildArch" != "x86" ] ; then
198+
echo "Tizen is available only for arm, armel, arm64 and x86."
199199
usage;
200200
exit 1;
201201
fi

‎eng/common/cross/toolchain.cmake‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
6363
elseif(TARGET_ARCH_NAME STREQUAL "x86")
6464
set(CMAKE_SYSTEM_PROCESSOR i686)
6565
set(TOOLCHAIN "i686-linux-gnu")
66+
if(TIZEN)
67+
set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0")
68+
endif()
6669
elseif (FREEBSD)
6770
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
6871
set(triple "x86_64-unknown-freebsd12")
@@ -91,6 +94,10 @@ if(TIZEN)
9194
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
9295
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu)
9396
endif()
97+
if(TARGET_ARCH_NAME STREQUAL "x86")
98+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/)
99+
include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu)
100+
endif()
94101
endif()
95102

96103
if(ANDROID)
@@ -197,6 +204,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
197204
endif()
198205
elseif(TARGET_ARCH_NAME STREQUAL "x86")
199206
add_toolchain_linker_flag(-m32)
207+
208+
if(TIZEN)
209+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
210+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
211+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
212+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
213+
endif()
200214
elseif(ILLUMOS)
201215
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
202216
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
@@ -232,7 +246,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
232246
endif()
233247

234248
if(TIZEN)
235-
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$")
249+
if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64|x86)$")
236250
add_compile_options(-Wno-deprecated-declarations) # compile-time option
237251
add_compile_options(-D__extern_always_inline=inline) # compile-time option
238252
endif()

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
__X86_CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
5+
__TIZEN_CROSSDIR="$__X86_CrossDir/tizen"
6+
7+
if [[ -z "$ROOTFS_DIR" ]]; then
8+
echo "ROOTFS_DIR is not defined."
9+
exit 1;
10+
fi
11+
12+
TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
13+
mkdir -p $TIZEN_TMP_DIR
14+
15+
# Download files
16+
echo ">>Start downloading files"
17+
VERBOSE=1 $__X86_CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
18+
echo "<<Finish downloading files"
19+
20+
echo ">>Start constructing Tizen rootfs"
21+
TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
22+
cd $ROOTFS_DIR
23+
for f in $TIZEN_RPM_FILES; do
24+
rpm2cpio $f | cpio -idm --quiet
25+
done
26+
echo "<<Finish constructing Tizen rootfs"
27+
28+
# Cleanup tmp
29+
rm -rf $TIZEN_TMP_DIR
30+
31+
# Configure Tizen rootfs
32+
echo ">>Start configuring Tizen rootfs"
33+
ln -sfn asm-x86 ./usr/include/asm
34+
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
35+
echo "<<Finish configuring Tizen rootfs"

0 commit comments

Comments
 (0)