Update crossgen2.tag.gz of .NET8 version

Change-Id: Ic0209dc4584702eacbd781abcd0b159672e6fb15

diff --git a/packaging/crossgen2-mic.tar.gz b/packaging/crossgen2-mic.tar.gz
new file mode 100644 (file)
index 0000000..22daf94
Binary files /dev/null and b/packaging/crossgen2-mic.tar.gz differ

diff --git a/packaging/crossgen2.tar.gz b/packaging/crossgen2.tar.gz
deleted file mode 100644 (file)
index cd15df2..0000000
Binary files a/packaging/crossgen2.tar.gz and /dev/null differ

diff --git a/packaging/dotnet-build-tools.spec b/packaging/dotnet-build-tools.spec
index 00e3c87a798a0d83a80071cc2d44933d98f188e6..48cbe6b5de6626109dbb262f1aadd31708a1d152 100644 (file)
--- a/packaging/dotnet-build-tools.spec
+++ b/packaging/dotnet-build-tools.spec
@@ -12,7 +12,7 @@ Source0:    %{name}-%{version}.tar.gz
 Source1:    macros.dotnet-build-tools
 Source21:   dotnet-sdk-%{version}-linux-x64.tar.gz
 Source22:   deps.tar.gz
-Source23:   crossgen2.tar.gz
+Source23:   crossgen2-mic.tar.gz
 
 AutoReqProv: no
 
@@ -60,6 +60,7 @@ do
 done
 
 # Prepare crossgen2
+tar xvfz dotnet/crossgen2/crossgen2.tar.gz -C dotnet/crossgen2
 chmod 0755 ./dotnet/crossgen2/* -R
 patchelf --set-interpreter %{SDK_PATH}/crossgen2/ld-linux-x86-64.so.2 ./dotnet/crossgen2/crossgen2
 patchelf --set-rpath %{SDK_PATH}/crossgen2/ ./dotnet/crossgen2/crossgen2
@@ -67,6 +68,11 @@ for file in $( find ./dotnet/crossgen2 -type f \( -name "*.so" -or -name "*.so.*
 do
     patchelf --set-rpath %{SDK_PATH}/crossgen2/ ${file}
 done
+
+pushd dotnet/crossgen2
+tar -zcvf crossgen2.tar.gz crossgen2
+rm crossgen2
+popd
 %endif
 
 # overrides
@@ -109,3 +115,8 @@ install -p -m 644 ./targets/Tizen.Pre.Compiled.Reference.targets %{buildroot}%{S
 %post
 dotnet --version
 dotnet workload list
+
+pushd %{SDK_PATH}/crossgen2
+tar -zxvf crossgen2.tar.gz
+rm -f crossgen2.tar.gz
+popd

diff --git a/targets/Tizen.Pre.Compiled.targets b/targets/Tizen.Pre.Compiled.targets
index c36e0e88e16a113a782c5f6ebbe0d8e32e026705..124bbd0efac1076b2d247adfe8d12d992e5491bf 100644 (file)
--- a/targets/Tizen.Pre.Compiled.targets
+++ b/targets/Tizen.Pre.Compiled.targets
@@ -28,8 +28,17 @@
     <Exec Command="mkdir $(BinNativeImagePath)" Condition="@(DllListOfBin->Count()) != 0 OR @(PdbListOfBin->Count()) != 0" />
     <Exec Command="mkdir $(LibNativeImagePath)" Condition="@(DllListOfLib->Count()) != 0 OR @(PdbListOfLib->Count()) != 0" />
 
-    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfBin.Identity)' != ''" />
-    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_$(TizenGBSBuildArch)_x64.so --targetarch $(TizenGBSBuildArch) -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' != '' and '%(DllListOfLib.Identity)' != ''" />
+<!-- riscv64 -->
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_riscv64_x64.so --targetarch riscv64 -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'riscv64' and '%(DllListOfBin.Identity)' != ''" />
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_unix_riscv64_x64.so --targetarch riscv64 -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'riscv64' and '%(DllListOfLib.Identity)' != ''" />
+
+<!-- aarch64, x86_64 -->
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_universal_arm64_x64.so --targetarch arm64 -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'arm64' and '%(DllListOfBin.Identity)' != ''" />
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_universal_arm64_x64.so --targetarch arm64 -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'arm64' and '%(DllListOfLib.Identity)' != ''" />
+
+<!-- arm, armel -->
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_universal_arm_x64.so --targetarch armel -o $(BinNativeImagePath)%(DllListOfBin.Filename).ni%(DllListOfBin.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfBin.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'armel' and '%(DllListOfBin.Identity)' != ''" />
+    <Exec Command="crossgen2 --jitpath /usr/share/dotnet-build-tools/sdk/crossgen2/libclrjit_universal_arm_x64.so --targetarch armel -o $(LibNativeImagePath)%(DllListOfLib.Filename).ni%(DllListOfLib.Extension) --resilient --Ot -r:/usr/share/dotnet.tizen/netcoreapp/*.dll -r:/usr/share/dotnet.tizen/framework/*.dll -r:$(IntermediateOutputPath)crossgen2/ref/*.dll %(DllListOfLib.Identity)" EnvironmentVariables="DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1" Condition="'$(TizenGBSBuildArch)' == 'armel' and '%(DllListOfLib.Identity)' != ''" />
 
     <Exec Command="cp %(PdbListOfBin.Identity) $(BinNativeImagePath)" Condition="'%(PdbListOfBin.Identity)' != ''" />
     <Exec Command="cp %(PdbListOfLib.Identity) $(LibNativeImagePath)" Condition="'%(PdbListOfLib.Identity)' != ''" />