rpms
/
dotnet6.0
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to .NET SDK 6.0.125 and Runtime 6.0.25 

Resolves: RHEL-15348
This commit is contained in:
Omair Majid 2023-12-11 17:48:25 -05:00
parent 1acfda67f8
commit edf69f0662
4 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@ SOURCES/dotnet-v6.0.114.tar.gz
/dotnet-v6.0.122.tar.gz
/dotnet-v6.0.123.tar.gz
/dotnet-v6.0.124.tar.gz
/dotnet-v6.0.125.tar.gz

10
dotnet6.0.spec
View File

@ -21,10 +21,10 @@
# until that's done, disable LTO. This has to happen before setting the flags below.
%define _lto_cflags %{nil}
%global host_version 6.0.24
%global runtime_version 6.0.24
%global host_version 6.0.25
%global runtime_version 6.0.25
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.124
%global sdk_version 6.0.125
%global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
%global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@ -631,6 +631,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%changelog
* Mon Dec 11 2023 Omair Majid <omajid@redhat.com> - 6.0.125-2
- Update to .NET SDK 6.0.125 and Runtime 6.0.25
- Resolves: RHEL-15348
* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 6.0.124-2
- Update to .NET SDK 6.0.124 and Runtime 6.0.24
- Resolves: RHEL-14466

2
sources
View File

@ -1 +1 @@
SHA512 (dotnet-v6.0.124.tar.gz) = 9cd79f216e3e15b32dfb888b925a5e0301ce603bcc5c4055e3585b743022ac02d63a684b64fbf2d8acce59fdf4a022d25a29b5785987b8b20b5377b5f17baed7
SHA512 (dotnet-v6.0.125.tar.gz) = 71c49ee7f3b9fec8af67cb5c9203f887dce34074c86c02b8d2af0996f3af86da58947f0bf1ebbb8341006f5842ccf446a909a572b6ff44d49be378e8c7037f1b

62
update-release
View File

@ -8,7 +8,7 @@ IFS=$'\n\t'
print_usage() {
echo " Usage:"
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]"
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]"
}
user_provided_tarball_name=""
@ -28,6 +28,11 @@ while [[ "$#" -gt 0 ]]; do
print_usage
exit 0
;;
--release-json)
release_json="$2"
shift;
shift;
;;
--tarball)
user_provided_tarball_name="$2"
shift;
@ -61,28 +66,10 @@ fi
host_version="$runtime_version"
if [[ "$runtime_version" == "3.1"* ]]; then
tag=v${sdk_version}-SDK
else
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
tag=v${sdk_version}
fi
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
else
if [[ -n "${user_provided_tarball_name}" ]]; then
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
fi
fi
if [[ ! -f "dotnet-${tag}.tar.gz" ]]; then
./build-dotnet-tarball "${tag}"
tag=v${runtime_version}
fi
set -x
@ -91,6 +78,39 @@ sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%globa
sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file"
sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file"
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
else
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
else
if [[ -n "${user_provided_tarball_name}" ]]; then
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
fi
fi
./build-dotnet-tarball "${tag}"
fi
else
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
elif [[ -n ${user_provided_tarball_name} ]]; then
cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz"
cp -a "${release_json}" release.json
else
rm -f release.json
spectool -g "$spec_file"
fi
fi
comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
commit_message="$comment
"