The package rpms/dotnet3.1.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/dotnet3.1.git/commit/?id=7a263992...
https://src.fedoraproject.org/cgit/rpms/dotnet3.1.git/commit/?id=72b578e3....
Change:
+%ifarch aarch64
+%ifarch x86_64
Thanks.
Full change:
============
commit 7a263992b7fd6f8140aca09fb38eefd86c5beeb5
Author: Omair Majid <omajid(a)redhat.com>
Date: Fri Jun 26 12:28:10 2020 -0400
Re-bootstrap for aarch64
diff --git a/build-bootstrap-tarball b/build-bootstrap-tarball
new file mode 100755
index 0000000..1ce0468
--- /dev/null
+++ b/build-bootstrap-tarball
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -euo pipefail
+
+set -x
+
+sdk_version=3.1.105
+
+arch=$(uname -m)
+if [[ $arch == "x86_64" ]]; then
+ arch=x64
+elif [[ $arch == "aarch64" ]]; then
+ arch=arm64
+fi
+
+if [ ! -d dotnet-source-build-tarball ]; then
+ if [ ! -d source-build ]; then
+ git clone
https://github.com/dotnet/source-build
+ fi
+ pushd source-build
+ sed -i -e 's|cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE||'
repos/coreclr.common.props
+ git clean -xdf
+ ./build-source-tarball.sh ../dotnet-source-build-tarball/ --
-p:DownloadSourceBuildReferencePackagesTimeoutSeconds=100000
+ popd
+fi
+
+rm -rf dotnet-v${sdk_version}-SDK dotnet-v${sdk_version}-SDK.tar.gz
+
+cp -a dotnet-source-build-tarball dotnet-v${sdk_version}-SDK
+cp -a source-build/artifacts/$arch/Release/Private.SourceBuilt.Artifacts.*.tar.gz
dotnet-v${sdk_version}-SDK/packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
+
+tar czf dotnet-v${sdk_version}-SDK-$arch.tar.gz dotnet-v${sdk_version}-SDK
+
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 2ab31b2..d2f4385 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -39,6 +39,10 @@
%global use_bundled_libunwind 1
%endif
+%ifarch aarch64
+%global use_bundled_libunwind 1
+%endif
+
%ifarch x86_64
%global runtime_arch x64
%endif
@@ -58,7 +62,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: .NET Core Runtime and SDK
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and
EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
URL:
https://github.com/dotnet/
@@ -522,6 +526,12 @@ echo "Testing build results for debug symbols..."
%changelog
+* Fri Jun 26 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-3
+- Re-bootstrap aarch64
+
+* Fri Jun 19 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-3
+- Disable bootstrap
+
* Thu Jun 18 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-1
- Bootstrap aarch64
diff --git a/sources b/sources
index 6e94189..26e153f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (dotnet-v3.1.105-SDK.tar.gz) =
c29caae388ace246af3003d8dd27b6e8255531970629b28b560c4ab2b580cf811f29abacb599f03e551e0a23842d7844226a19bb48ac51ba6fe8c934336fd5c0
-SHA512 (dotnet-v3.1.105-SDK-arm64.tar.gz) =
133c7d4ea14fd8adc8910049d43446152d2cac0edbb0e0e2cbf60af2524475417e80a1889dfd070166a0930ef31ffc4bed1eae3a7ffd9f3f67f0003ae049ad63
+SHA512 (dotnet-v3.1.105-SDK-arm64.tar.gz) =
928bf589d993a1b733d969043126d972653506e8d38ea66b20670bdf88f4ef0957f80b200afaffd85a2b6a8858e15a42f921ff3ceff7f2aa0c47316fff98fac1
SHA512 (dotnet-v3.1.105-SDK-x64.tar.gz) =
17ce5e4d139f70cdb71615e057d9b698c255e2fb5e22df789570b5b8e2a94d49f8c52f97a5ee4bcfad54cee3fdc55e6c554090ac8b78b6ca5c8e4668bb4872f3
commit 72b578e3fca6a5360dc7ad1c4f7ffa0d0ea1c1c5
Author: Omair Majid <omajid(a)redhat.com>
Date: Fri Jun 26 11:36:42 2020 -0400
Revert "Disable bootstrap"
This reverts commit 590948ae871a5f8e08e00aac7aa150adc926e416.
The bootstrapped build doesn't work. Lets try re-bootstrapping to work
around it.
diff --git a/dotnet3.1.spec b/dotnet3.1.spec
index 6c6ef8f..2ab31b2 100644
--- a/dotnet3.1.spec
+++ b/dotnet3.1.spec
@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
# Avoid provides/requires from private libraries
%global privlibs libhostfxr
@@ -58,7 +58,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
-Release: 3%{?dist}
+Release: 2%{?dist}
Summary: .NET Core Runtime and SDK
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and
EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
URL:
https://github.com/dotnet/
@@ -68,6 +68,8 @@ URL:
https://github.com/dotnet/
Source0: dotnet-v%{src_version}-SDK.tar.gz
Source1: check-debug-symbols.py
Source2: dotnet.sh.in
+Source4: dotnet-v%{src_version}-SDK-arm64.tar.gz
+Source5: dotnet-v%{src_version}-SDK-x64.tar.gz
# Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS
Patch100: corefx-optflags-support.patch
@@ -318,7 +320,15 @@ These are not meant for general use.
%prep
-%setup -q -n dotnet-v%{src_version}-SDK
+%ifarch aarch64
+%setup -T -b 4 -q -n dotnet-v%{src_version}-SDK
+%endif
+
+%ifarch x86_64
+%setup -T -b 5 -q -n dotnet-v%{src_version}-SDK
+%endif
+
+# %%setup -q -n dotnet-v%%{src_version}-SDK
%if %{without bootstrap}
# Remove all prebuilts
@@ -512,10 +522,7 @@ echo "Testing build results for debug symbols..."
%changelog
-* Fri Jun 19 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-3
-- Disable bootstrap
-
-* Thu Jun 18 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-2
+* Thu Jun 18 2020 Omair Majid <omajid(a)redhat.com> - 3.1.105-1
- Bootstrap aarch64
* Tue Jun 16 2020 Chris Rummel <crummel(a)microsoft.com> - 3.1.105-1
diff --git a/sources b/sources
index a777f1d..6e94189 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
SHA512 (dotnet-v3.1.105-SDK.tar.gz) =
c29caae388ace246af3003d8dd27b6e8255531970629b28b560c4ab2b580cf811f29abacb599f03e551e0a23842d7844226a19bb48ac51ba6fe8c934336fd5c0
+SHA512 (dotnet-v3.1.105-SDK-arm64.tar.gz) =
133c7d4ea14fd8adc8910049d43446152d2cac0edbb0e0e2cbf60af2524475417e80a1889dfd070166a0930ef31ffc4bed1eae3a7ffd9f3f67f0003ae049ad63
+SHA512 (dotnet-v3.1.105-SDK-x64.tar.gz) =
17ce5e4d139f70cdb71615e057d9b698c255e2fb5e22df789570b5b8e2a94d49f8c52f97a5ee4bcfad54cee3fdc55e6c554090ac8b78b6ca5c8e4668bb4872f3