From 3ed876c12136d4a5e3c15b3063e088980c00e128 Mon Sep 17 00:00:00 2001 From: Charlie <1034+ipvb@user.noreply.gitee.com> Date: Tue, 29 Dec 2020 10:21:02 +0800 Subject: [PATCH 1/4] update version. update cmake to 3.19.2 git to 2.30.0 (kernel no tar) --- version | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version b/version index 78b234b..23474bc 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ -GIT_REAL_VERSION="2.29.2" -GIT_KERNAL_HASH="f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1" +GIT_REAL_VERSION="2.30.0" +GIT_KERNAL_HASH="8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61" GIT_GITHUB_HASH="8cc15abf2bc1cfa4b8acc37025cf92ec73c20efdb3f243793fef71dfe87478be" -CMAKE_VERSION="3.18" -CMAKE_PATCH="4" +CMAKE_VERSION="3.19" +CMAKE_PATCH="2" -- Gitee From 4eab30472209cb4d30ad21c4b8ae6359597c812d Mon Sep 17 00:00:00 2001 From: Charlie <1034+ipvb@user.noreply.gitee.com> Date: Tue, 29 Dec 2020 10:22:04 +0800 Subject: [PATCH 2/4] update version. Fix hash --- version | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version b/version index 23474bc..06369b9 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ GIT_REAL_VERSION="2.30.0" -GIT_KERNAL_HASH="8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61" -GIT_GITHUB_HASH="8cc15abf2bc1cfa4b8acc37025cf92ec73c20efdb3f243793fef71dfe87478be" +GIT_KERNAL_HASH="d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e" +GIT_GITHUB_HASH="8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61" CMAKE_VERSION="3.19" CMAKE_PATCH="2" -- Gitee From 767cbe80f9e0012b215886e7aa87287f4bf9c172 Mon Sep 17 00:00:00 2001 From: Charlie <1034+ipvb@user.noreply.gitee.com> Date: Tue, 29 Dec 2020 10:24:24 +0800 Subject: [PATCH 3/4] update ps/version.ps1. --- ps/version.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ps/version.ps1 b/ps/version.ps1 index ba8a8ed..14d887e 100644 --- a/ps/version.ps1 +++ b/ps/version.ps1 @@ -5,21 +5,21 @@ $ZLIB_VERSION = "1.2.11" $ZLIB_HASH = "629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff" -$OPENSSL_VERSION = "1.1.1h" -$OPENSSL_HASH = "5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9" +$OPENSSL_VERSION = "1.1.1i" +$OPENSSL_HASH = "e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242" $NGHTTP2_VERSION = "1.41.0" $NGHTTP2_HASH = "3d53e8bd1513a271a45b6ecda2e22fa05e9eb90fa92f7c5daf57b08c6e40cc55" # tar.gz -$CURL_VERSION = "7.73.0" -$CURL_HASH = "ba98332752257b47b9dea6d8c0ad25ec1745c20424f1dd3ff2c99ab59e97cf91" +$CURL_VERSION = "7.74.0" +$CURL_HASH = "e56b3921eeb7a2951959c02db0912b5fcd5fdba5aca071da819e1accf338bbd7" $EXPAT_VERSION = "2.2.7" $EXPAT_HASH = "30e3f40acf9a8fdbd5c379bdcc8d1178a1d9af306de29fc8ece922bc4c57bef8" -$GIT_VERSION = "2.29.2" -$GIT_HASH = "f2fc436ebe657821a1360bcd1e5f4896049610082419143d60f6fa13c2f607c1" +$GIT_VERSION = "2.30.0" +$GIT_HASH = "55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19" # Filename $ZLIB_FILENAME = "zlib-${ZLIB_VERSION}" -- Gitee From aa760d5a16b33f288b790b5dd646384a4e36f779 Mon Sep 17 00:00:00 2001 From: Charlie <1034+ipvb@user.noreply.gitee.com> Date: Tue, 29 Dec 2020 10:24:51 +0800 Subject: [PATCH 4/4] Fix kernel hash --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 06369b9..9023e76 100644 --- a/version +++ b/version @@ -1,5 +1,5 @@ GIT_REAL_VERSION="2.30.0" -GIT_KERNAL_HASH="d24c4fa2a658318c2e66e25ab67cc30038a35696d2d39e6b12ceccf024de1e5e" +GIT_KERNAL_HASH="55735021109565721af805af382c45cce73c3cfaa59daad22443d1477d334d19" GIT_GITHUB_HASH="8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61" CMAKE_VERSION="3.19" CMAKE_PATCH="2" -- Gitee