import CS dotnet9.0-9.0.103-2.el10

2025-03-27 13:08:15 +00:00 · 2025-03-27 13:08:15 +00:00 · e2cd99b4fc
commit e2cd99b4fc
parent 06ba899818
6 changed files with 144 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-dotnet-9.0.0-preview.7.24405.7.tar.gz
+dotnet-9.0.2.tar.gz
--- a/dotnet-9.0.0-preview.7.24405.7.tar.gz.sig
+++ b/dotnet-9.0.0-preview.7.24405.7.tar.gz.sig
@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: BSN Pgp v1.0.0.0
-
-iQIcBAABCAAGBQJmu5eNAAoJEP2/U8JNtIcuaCMP/A2xMiqIMuM86tph6rryvEmR
-2YRNCgFttGOP9CB85I7pcjoswR9fVPY1nbSLHwn8mQs0D61JOww2nPnnAmz5+OCL
-a0qS4dFnyDEwCD26hLecZu1Slj+ZED7Mtc/Xg0aGUsCnEb8CEpjINIylziKbIgtN
-aOhSIHXzfX6jsOtvN1qlmnKHtKYLuP4g065vUSRApPEnMZAsWylaePYgWMqSyi6A
-LU3oiKgYB+ZauIcZgn1pZ+Wkm85KeFqVs5YOBuykR3POsQlxw/4+W1UhqWvlo51X
-i5cQb98b5tCPWiQdP9pCRia9si+qmaOVFjmAbUpiP3o3EQ6XYQmbn8hLQvCw5gWs
-GzmKRQ0NStRqY/k5k3mQydISEblC1tu5Am23EwdEQTHmJw47s5bvZ6XIHIX5kPW6
-Vwx9HQjFrdljs27Dl36jefXybt0JZUSWV+91cTu3ABqfOn29T5iXcnsoxKLP2R4f
-8GzxQiVJyCQVnO2mcsTwKNFFZkXAXNT+y47/qMNZkNGjRS0kJ4GVzUzgaX759yGA
-DCu3iBIC5TVtHWXUnjS8IO5l/iv9sLp8cprmpyGK3N4iSxekSAUQ2vKdGHwJMsLC
-dDqFc5swnqvu8zhdvm0SAyZ+O79MByS4gonCw0ANHkycDeQ7EhkrLVwQ3c9VfQlU
-oq/PRZ8rLNomYZ+hBNML
-=b2gc
-----END PGP SIGNATURE-----
--- a/dotnet-9.0.2.tar.gz.sig
+++ b/dotnet-9.0.2.tar.gz.sig
@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: BSN Pgp v1.0.0.0
+
+iQIcBAABCAAGBQJnmX1LAAoJEP2/U8JNtIcu7eUQAM6jtQwO6Clelg420wzIBOEk
+dhukzzMDjftWsy8+G2EYBZjcclBaAn8en4ifCH+/Ax/FE8kHYbHccskglzLmOXTK
+RCnp393UbqfEsWpEpssUyW/wLEOnxNbxr5u8/ke8yjtUk6p/axrB6HT4TpwgxkBd
+LCg+BpOFZAgLBToX5VVpvmIDZNDuRwFBq5v5z1s+chGmZUOWqmXTpvIuCk4IUUZj
+uZClUOnSWK3O6BkNgiFIzgXircIgw6YNC6s6/Z2n5s3lT1sViaja6sCeyhGd2jdM
+9kTChAxYu0xr55QjoU5N3WSgDVkyYNIPgydRBTzfdpkFrokuymxOuYmxQaykNAD0
+RIDO1dRiQaUFQBfX3V9HAZLkoH8IWod5e1QOQWso28l6P3UdvCt43H0lpXVbfx65
+UTQcetSMVDvVCK5DsNIzqKVxnVy+sk8S9Zjqi7pat2WBCj9MqjwL4zU13fLgAVJM
+mlqK0ctT6PXllmJ1cobO2VYuhyxawj2GnOrAK60pB4hgYq8t/Ke44ZtgV0LzYFOb
+FVkmHmzYVD+ypw81TucWXXzQo5g5un5lV75pS5Zqb2LlWYO7W23xCCLMP+pAt/H
+F0hejvAtib2GEqYhdjPH0XOOxbdXkhTGxepBnfjOPxhgwlck7ufrt5n4buODxZim
+X4aq/VXU0TFLAf5xF9/t
+=QwLl
+-----END PGP SIGNATURE-----
--- a/dotnet9.0.spec
+++ b/dotnet9.0.spec
@ -10,20 +10,20 @@

 # upstream can produce releases with a different tag than the SDK version
 #%%global upstream_tag v%%{runtime_version}
-%global upstream_tag v9.0.0-preview.7.24405.7
+%global upstream_tag v9.0.2
 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')

-%global hostfxr_version 9.0.0-preview.7.24405.7
-%global runtime_version 9.0.0-preview.7.24405.7
-%global aspnetcore_runtime_version 9.0.0-preview.7.24406.2
-%global sdk_version 9.0.100-preview.7.24407.1
+%global hostfxr_version %{runtime_version}
+%global runtime_version 9.0.2
+%global aspnetcore_runtime_version 9.0.2
+%global sdk_version 9.0.103
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{aspnetcore_runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')

-%global runtime_rpm_version 9.0.0~preview.7.24405.7
-%global aspnetcore_runtime_rpm_version 9.0.0~preview.7.24406.2
-%global sdk_rpm_version 9.0.100~preview.7.24407.1
+%global runtime_rpm_version %{runtime_version}
+%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
+%global sdk_rpm_version %{sdk_version}

 %global use_bundled_brotli 0
 %global use_bundled_libunwind 1
@ -70,7 +70,7 @@

 Name:           dotnet%{dotnetver}
 Version:        %{sdk_rpm_version}
-Release:        0.2%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib

@ -81,22 +81,22 @@ URL:            https://github.com/dotnet/
 # ./build-dotnet-bootstrap-tarball %%{upstream_tag}
 Source0:        dotnet-%{upstream_tag}-x64-bootstrap.tar.gz
 # The bootstrap SDK version is one listed in the global.json file of the main source archive
-%global bootstrap_sdk_version 9.0.100-preview.7.24380.2
+%global bootstrap_sdk_version 9.0.101
 # Binaries can be at one of several different URLs:
 # GA releases:
-# Source1:        https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz
+Source1:        https://builds.dotnet.microsoft.com/dotnet/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz
 # Preview releases:
-Source1:        https://dotnetbuilds.azureedge.net/public/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz
+# Source1:       https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz
 # To generate ppc64le and s390x archives:
 # 1. Find the source commits and versions of repos, use one of:
-#   - https://dotnetbuilds.azureedge.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt
-#   - https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt
+#   - https://builds.dotnet.microsoft.com/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt
+#   - https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt
 # 2. Find the VMR sync commit using `git log --grep $commit`
 # 3. Build the VMR commit in cross-build mode for the architecture
 # 4. Use `build-prebuilt-archive` to create the archive from the VMR
 # 5. Update the version below to match the SDK that was built from the VMR
 # The ppc64le/s390x SDK version is one produced
-%global bootstrap_sdk_version_ppc64le_s390x 9.0.100-preview.7.24380.1
+%global bootstrap_sdk_version_ppc64le_s390x 9.0.101
 Source2:        dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-ppc64le.tar.gz
 Source3:        dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-s390x.tar.gz
 %else
@ -409,9 +409,13 @@ Summary:        Ahead-of-Time (AOT) support for the .NET %{dotnetver} Software D

 Requires:       dotnet-sdk-%{dotnetver}%{?_isa} >= %{sdk_rpm_version}-%{release}

-#TODO
+# When installing AOT support, also install all dependencies needed to build
+# NativeAOT applications. AOT invokes `clang ... -lssl -lcrypto -lbrotlienc
+# -lbrotlidec -lz ...`.
+Requires:       brotli-devel
 Requires:       clang
-Requires:       zlib
+Requires:       openssl-devel
+Requires:       zlib-devel

 %description -n dotnet-sdk-aot-%{dotnetver}
 This package provides Ahead-of-time (AOT) compilation support for the .NET SDK.
@ -562,6 +566,8 @@ rm -rf src/runtime/src/native/external/zlib-intel
 rm -rf src/runtime/src/native/external/zlib-ng
 %endif

+lscpu
+


 %build
@ -605,6 +611,14 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//')
 CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//')
 %endif

+%if 0%{?rhel} >= 10
+# Workaround for https://github.com/dotnet/runtime/issues/109611
+# FIXME: Remove this, and replace with upstream fix
+CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //')
+CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //')
+LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //')
+%endif
+
 # Enabling fortify-source and "-Wall -Weverything" produces new warnings from libc. Turn them off.
 CFLAGS="$CFLAGS -Wno-used-but-marked-unused"
 CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused"
@ -638,24 +652,58 @@ system_libs=
    system_libs=$system_libs+zlib+
 %endif

-VERBOSE=1 timeout 5h \
-    ./build.sh \
-    --source-only \
-    --release-manifest %{SOURCE5} \
+%ifarch ppc64le s390x
+max_attempts=3
+%else
+max_attempts=1
+%endif
+
+function retry_until_success {
+    local exit_code=1
+    local tries=$1
+    shift
+    set +e
+    while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do
+        (( tries = tries - 1 ))
+        "$@"
+        exit_code=$?
+    done
+    set -e
+    return $exit_code
+}
+
+cat >dotnet-rpm-build.sh <<EOF
+#!/bin/bash
+
+set -euo pipefail
+set -x
+
+find -depth -name 'artifacts' -type d -print -exec rm -rf {} \;
+
+./build.sh \
+  --source-only \
+  --release-manifest %{SOURCE5} \
 %if %{without bootstrap}
-    --with-sdk previously-built-dotnet \
+  --with-sdk previously-built-dotnet \
 %endif
 %ifarch %{mono_archs}
-    --use-mono-runtime \
+  --use-mono-runtime \
 %endif
-    -- \
-    /p:UseSystemLibs=${system_libs} \
-    /p:TargetRid=%{runtime_id} \
-    /p:OfficialBuilder="$vendor" \
-    /p:MinimalConsoleLogOutput=false \
-    /p:ContinueOnPrebuiltBaselineError=true \
-    /v:n \
-    /p:LogVerbosity=n
+  -- \
+  /p:UseSystemLibs=${system_libs} \
+  /p:TargetRid=%{runtime_id} \
+  /p:OfficialBuilder="$vendor" \
+  /p:MinimalConsoleLogOutput=false \
+  /p:ContinueOnPrebuiltBaselineError=true \
+  /v:n \
+  /p:LogVerbosity=n
+EOF
+
+chmod +x dotnet-rpm-build.sh
+
+VERBOSE=1 retry_until_success $max_attempts \
+    timeout 5h \
+    ./dotnet-rpm-build.sh


 sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE21} > dotnet.sh
@ -838,6 +886,46 @@ export COMPlus_LTTng=0


 %changelog
+* Mon Feb 17 2025 Omair Majid <omajid@redhat.com> - 9.0.103-2
+- Update to .NET SDK 9.0.103 and Runtime 9.0.2
+- Resolves: RHEL-76904
+
+* Sat Jan 25 2025 Omair Majid <omajid@redhat.com> - 9.0.102-2
+- Disable bootstrap
+- Related: RHEL-71549
+
+* Fri Jan 24 2025 Omair Majid <omajid@redhat.com> - 9.0.102-1
+- Rebootstrap
+- Related: RHEL-71549
+
+* Thu Jan 16 2025 Omair Majid <omajid@redhat.com> - 9.0.102-0.9
+- Update to .NET SDK 9.0.102 and Runtime 9.0.1
+- Resolves: RHEL-71549
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 9.0.100~rc.2.24474.1-0.8
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Wed Oct 23 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.2.24474.1-0.7
+- Disable bootstrap
+- Related: RHEL-62799
+
+* Tue Oct 22 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.2.24474.1-0.6
+- Rebootstrap
+- Related: RHEL-62799
+
+* Thu Oct 17 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.2.24474.1-0.5
+- Add missing runtime dependencies to -aot- subpackage
+- Related: RHEL-62799
+
+* Tue Oct 15 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.2.24474.1-0.4
+- Update to .NET SDK 9.0.100-rc.2.24474.1 and Runtime 9.0.0-rc.2.24473.5
+- Resolves: RHEL-62799
+
+* Wed Sep 11 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.1.24452.12-0.3
+- Update to .NET SDK 9.0.100-rc.1.24452.12 and Runtime 9.0.0-rc.1.24431.7
+- Resolves: RHEL-59011
+
 * Sun Aug 18 2024 Omair Majid <omajid@redhat.com> - 9.0.100~preview.7.24407.1-0.2
 - Disable bootstrap
 - Related: RHEL-48619
--- a/release.json
+++ b/release.json
@ -1,10 +1,10 @@
 {
-  "release": "9.0.0-preview.7",
+  "release": "9.0.2",
  "channel": "9.0",
-  "tag": "v9.0.0-preview.7.24405.7",
-  "sdkVersion": "9.0.100-preview.7.24407.12",
-  "runtimeVersion": "9.0.0-preview.7.24405.7",
-  "aspNetCoreVersion": "9.0.0-preview.7.24406.2",
+  "tag": "v9.0.2",
+  "sdkVersion": "9.0.103",
+  "runtimeVersion": "9.0.2",
+  "aspNetCoreVersion": "9.0.2",
  "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "aecea31eada5f5506de2112d72b3bd238a5317b4"
+  "sourceVersion": "c4e5fd73fe5d8c004bf46cb4f1ded77ca8124b1a"
 }
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (dotnet-9.0.0-preview.7.24405.7.tar.gz) = 90f1b95d604183eacbe9ee84737bcfec7a594f464f88a30fefc80e94a487773a7434fe5ebd1b7e5fe613912d78bc0620f1c6e0b1f7a780de17d9f3697abed8f5
+SHA512 (dotnet-9.0.2.tar.gz) = c6ba0972eb21757d70e9dff4fd7e540378fec3eb94931fbe7205234ee53efc976c682154c5224a16ff1dab223f4deea7c2b378d197039e6974b35bd8fa6f62cf