diff --git a/.gitignore b/.gitignore index 550c82c..461fda2 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /dotnet-s390x-prebuilts-2022-10-12.tar.gz /dotnet-v7.0.100.tar.gz /dotnet-v7.0.101.tar.gz +/dotnet-v7.0.102.tar.gz diff --git a/build-dotnet-tarball b/build-dotnet-tarball index 7c9a3aa..8b32840 100755 --- a/build-dotnet-tarball +++ b/build-dotnet-tarball @@ -141,7 +141,10 @@ fi rm -rf "${tarball_name}" -tar xf "${unmodified_tarball_name}.tar.gz" +mkdir -p "${unmodified_tarball_name}" +pushd "${unmodified_tarball_name}" +tar xf ../"${unmodified_tarball_name}.tar.gz" +popd mv "${unmodified_tarball_name}" "${tarball_name}" pushd "${tarball_name}" diff --git a/dotnet7.0.spec b/dotnet7.0.spec index 40856ff..d14a25d 100644 --- a/dotnet7.0.spec +++ b/dotnet7.0.spec @@ -8,10 +8,10 @@ %global dotnetver 7.0 -%global host_version 7.0.1 -%global runtime_version 7.0.1 +%global host_version 7.0.2 +%global runtime_version 7.0.2 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 7.0.101 +%global sdk_version 7.0.102 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | 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 }') @@ -627,6 +627,9 @@ export COMPlus_LTTng=0 %changelog +* Thu Jan 12 2023 Omair Majid - 7.0.102-1 +- Update to .NET SDK 7.0.102 and Runtime 7.0.2 + * Wed Jan 11 2023 Omair Majid - 7.0.101-1 - Update to .NET SDK 7.0.101 and Runtime 7.0.1 diff --git a/rename-tarball b/rename-tarball deleted file mode 100755 index 7695205..0000000 --- a/rename-tarball +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -# Usage: -# ./rename-tarball original-name.tar.gz new-name.tar.gz -# -# The generated new-name.tar.gz will always have a single main -# directory (named new-name to match the tarball name) in the archive. -# If the original tarball had multiple files in the main directory of -# the archive, all those files will be moved to under the new main -# directory. - -set -euo pipefail -IFS=$'\n\t' - -positional_args=() -while [[ "$#" -gt 0 ]]; do - arg="${1}" - case "${arg}" in - -h|--help) - print_usage - exit 0 - ;; - *) - positional_args+=("$1") - shift - ;; - esac -done - -if [[ -z "${positional_args[0]:-}" ]]; then - echo "error: missing original tarball name" - exit 1 -fi - -original_path=$(readlink -f "${positional_args[0]:-}") -original_name=$(basename "$original_path") - -new_name=${positional_args[1]:-} -if [[ -z ${new_name} ]]; then - echo "error: missing new tarball name" - exit 1 -fi - -original_name=${original_name/%.tar.gz} -new_name=${new_name/.tar.gz} - -echo "Original: ${original_name}.tar.gz" -echo "New name: ${new_name}.tar.gz" - -rm -rf "temp-${new_name}" -mkdir "temp-${new_name}" -pushd "temp-${new_name}" > /dev/null -tar xf "${original_path}" -# `find` always shows the current directory as one of the entries in -# the output. A total of 2 entries means there is only one main -# directory in the extracted archive, and we can just move it to the -# expected location. -if [[ $(find . -maxdepth 1 | wc -l) == 2 ]]; then - mv -- ./* ../"${new_name}" -else - mkdir -p ../"${new_name}" - mv -- ./* ../"${new_name}" -fi -popd > /dev/null -tar czf "${new_name}.tar.gz" "${new_name}" -rm -rf "${new_name}" -rmdir "temp-${new_name}" diff --git a/sources b/sources index 16ba9db..1d97b90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v7.0.101.tar.gz) = 94464ec8720ecfbf86c5bee3417171834ae32a983fb216de4d50e690bbfff3fb0a2d5bb6e707b3dd27141c2c997d0a643802dd8a5d884193f816e69d6682788b +SHA512 (dotnet-v7.0.102.tar.gz) = d8d682a0737378333753a94885f042508c832d94cb0e6a52103ed6a88b5b31028dbc067aae7dcfd43b959e63555b20146bcc9e828873d38b79bed1fc5199b43d diff --git a/update-release b/update-release index 54c7307..5147b5c 100755 --- a/update-release +++ b/update-release @@ -71,13 +71,13 @@ 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 - ./rename-tarball "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" + mv "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then - ./rename-tarball "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" + mv "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then - ./rename-tarball "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + mv "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz" elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then - ./rename-tarball "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" + mv "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz" fi fi