Skip to content

Commit

Permalink
Update dotnet 8 -> 8.0.12 & 9 -> 9.0.1 (SynoCommunity#6393)
Browse files Browse the repository at this point in the history
* Update dotnet 8 -> 8.0.12
Update dotnet 9 -> 9.0.1

Use new URL schemes for runtimes download.

* Simplify and remove unecessary code.

* Update native dotnet sdk 8.0.404 to 8.0.405.

---------

Co-authored-by: Brice FROMENTIN <[email protected]>
  • Loading branch information
brice-fromentin and brice-fromentin authored Jan 19, 2025
1 parent b70885f commit 5834869
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 67 deletions.
31 changes: 12 additions & 19 deletions cross/dotnet8-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,31 +1,23 @@
PKG_NAME = aspnetcore-runtime
PKG_VERS = 8.0.11
PKG_VERS = 8.0.12
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-$(PKG_DIST_ARCH).$(PKG_EXT)
PKG_DIST_SITE = https://download.visualstudio.microsoft.com/download/pr/$(PKG_DIST_FOLDER)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-linux-$(PKG_DIST_ARCH).$(PKG_EXT)
PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)

include ../../mk/spksrc.archs.mk

# use digests with multiple files and individual dist names
# both lists must have the same order
PKG_DIST_ARCH_LIST = linux-x64 linux-arm linux-arm64
PKG_DIST_SITE_LIST = https://download.visualstudio.microsoft.com/download/pr/6f89757c-3dde-4c3a-96a0-b04b1bde2c92/6a3591b360ed0f9d1118b97560b89625/$(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/003f180b-e695-4094-bc3f-ef6473883d43/e861cb56edd58b05b03b5a92cf995f12/$(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/64a9f696-b039-4a73-b705-288fbf9c2e8f/c36bc24d6d359c019408b4f94ee67b59/$(PKG_NAME)-$(PKG_VERS)-linux-arm64.$(PKG_EXT)

ifeq ($(findstring $(ARCH), $(x64_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 1,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 1,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
endif
ifeq ($(findstring $(ARCH), $(ARMv7_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 2,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 2,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
endif
ifeq ($(findstring $(ARCH), $(ARMv8_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 3,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 3,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
PKG_DIST_ARCH_LIST = x64 arm arm64

ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
PKG_DIST_ARCH = x64
else ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH))
PKG_DIST_ARCH = arm
else ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
PKG_DIST_ARCH = arm64
endif

ifeq ($(PKG_DIST_ARCH),)
Expand All @@ -44,3 +36,4 @@ include ../../mk/spksrc.install-resources.mk
dotnet_runtime_custom_install:
mkdir -p "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
tar -cf - -C $(EXTRACT_PATH) . | tar -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"

20 changes: 11 additions & 9 deletions cross/dotnet8-runtime/digests
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
aspnetcore-runtime-8.0.11-linux-x64.tar.gz SHA1 2fcbb6592dd4eb5a38f2927a357067823f744aa7
aspnetcore-runtime-8.0.11-linux-x64.tar.gz SHA256 3fc75c38783b282140d2e2513c570f76991101b3f895b67a6ae8fba2a2d96399
aspnetcore-runtime-8.0.11-linux-x64.tar.gz MD5 42a3f93e066069b0f96345ca1ae97af3
aspnetcore-runtime-8.0.11-linux-arm.tar.gz SHA1 8d8138541cbc44028aa93e0f577f55b03bde6e43
aspnetcore-runtime-8.0.11-linux-arm.tar.gz SHA256 a3b38882b0df6b1d320a921111e678d792658af23d36dadb678bca9f9c98bc19
aspnetcore-runtime-8.0.11-linux-arm.tar.gz MD5 2ab8354dc2e20fe45a0a7c60a8a0879e
aspnetcore-runtime-8.0.11-linux-arm64.tar.gz SHA1 705e324662864fecc2e6b89ad04fe56eb2beb247
aspnetcore-runtime-8.0.11-linux-arm64.tar.gz SHA256 4f83cb39dbd515ea8319a8c2c32f041a2972301343cd31621c4bb402a300cfd6
aspnetcore-runtime-8.0.11-linux-arm64.tar.gz MD5 ec8ca26fd758ba2c101b011166b4dc70
aspnetcore-runtime-8.0.12-linux-x64.tar.gz MD5 b0dcd3ad070cdfff5de5b473dba36e1c
aspnetcore-runtime-8.0.12-linux-x64.tar.gz SHA1 f9112dad95ef68b2b2c135608e3cb3291d7e3251
aspnetcore-runtime-8.0.12-linux-x64.tar.gz SHA256 8a441b42051607dc914b14b1a6271abbf81f72ba0579fcb21aabd8e845d68a70

aspnetcore-runtime-8.0.12-linux-arm.tar.gz MD5 7d8f35f931f8da10ee949390e7b4fbe0
aspnetcore-runtime-8.0.12-linux-arm.tar.gz SHA1 931436c1542d01f48ad33cc6d0a82e7d23520956
aspnetcore-runtime-8.0.12-linux-arm.tar.gz SHA256 5299c03e7de25e61e0c49cec0ca80642f541c142833c1ded9881c730f010da75

aspnetcore-runtime-8.0.12-linux-arm64.tar.gz MD5 70b992ba81155a88a8d08bbfd711eecc
aspnetcore-runtime-8.0.12-linux-arm64.tar.gz SHA1 c3c415abc0f81b5bcff7dfaf62548e1b9bf3619d
aspnetcore-runtime-8.0.12-linux-arm64.tar.gz SHA256 1c2b31eb0d1059f259822c651362d870efd21c5308a037dcc389a5e459b05573
31 changes: 12 additions & 19 deletions cross/dotnet9-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,31 +1,23 @@
PKG_NAME = aspnetcore-runtime
PKG_VERS = 9.0.0
PKG_VERS = 9.0.1
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-$(PKG_DIST_ARCH).$(PKG_EXT)
PKG_DIST_SITE = https://download.visualstudio.microsoft.com/download/pr/$(PKG_DIST_FOLDER)
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-linux-$(PKG_DIST_ARCH).$(PKG_EXT)
PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$(PKG_VERS)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
EXTRACT_PATH = $(WORK_DIR)/$(PKG_DIR)

include ../../mk/spksrc.archs.mk

# use digests with multiple files and individual dist names
# both lists must have the same order
PKG_DIST_ARCH_LIST = linux-x64 linux-arm linux-arm64
PKG_DIST_SITE_LIST = https://download.visualstudio.microsoft.com/download/pr/e4791376-b70d-431f-bd98-5397c876b946/64ffc29a4edc8fd70b151c2963b38b09/$(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/84aa8e86-c6a1-4562-84f3-828e836ef26c/96772a224b9ff3be8904b63f37d7cf63/$(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/b2029a3e-c67e-4905-ad1f-08b164322520/bd68ea0b77f12df21b935da338fdaf25/$(PKG_NAME)-$(PKG_VERS)-linux-arm64.$(PKG_EXT)

ifeq ($(findstring $(ARCH), $(x64_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 1,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 1,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
endif
ifeq ($(findstring $(ARCH), $(ARMv7_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 2,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 2,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
endif
ifeq ($(findstring $(ARCH), $(ARMv8_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 3,$(PKG_DIST_ARCH_LIST))
PKG_DIST_FOLDER = $(shell echo $(word 3,$(PKG_DIST_SITE_LIST)) | grep -o1P ".*/download/pr/\K([^/]*/[^/]*)")
PKG_DIST_ARCH_LIST = x64 arm arm64

ifeq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
PKG_DIST_ARCH = x64
else ifeq ($(findstring $(ARCH),$(ARMv7_ARCHS)),$(ARCH))
PKG_DIST_ARCH = arm
else ifeq ($(findstring $(ARCH),$(ARMv8_ARCHS)),$(ARCH))
PKG_DIST_ARCH = arm64
endif

ifeq ($(PKG_DIST_ARCH),)
Expand All @@ -44,3 +36,4 @@ include ../../mk/spksrc.install-resources.mk
dotnet_runtime_custom_install:
mkdir -p "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
tar -cf - -C $(EXTRACT_PATH) . | tar -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"

20 changes: 11 additions & 9 deletions cross/dotnet9-runtime/digests
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
aspnetcore-runtime-9.0.0-linux-x64.tar.gz MD5 2c998f639d0accaa5bc95897dcfe3457
aspnetcore-runtime-9.0.0-linux-x64.tar.gz SHA1 38f09aca9ef8f85812bd01b8bd2fab87fc33aec8
aspnetcore-runtime-9.0.0-linux-x64.tar.gz SHA256 e00636ad9ca0fbcd777188036b52e520279dc4ac38fde3d14898869d16557ae0
aspnetcore-runtime-9.0.0-linux-arm.tar.gz MD5 d6464c1cc89a6ebb9b945096b44eeac5
aspnetcore-runtime-9.0.0-linux-arm.tar.gz SHA1 bbfd89cc61608323789d130f98d49fb7f426cc3d
aspnetcore-runtime-9.0.0-linux-arm.tar.gz SHA256 f3bf3dfe0f21afae8a130c07e67028abd1b80ac5523624729dac39ad0f2d8d9f
aspnetcore-runtime-9.0.0-linux-arm64.tar.gz MD5 3c5728f2b36debee4824a87a9d4af09f
aspnetcore-runtime-9.0.0-linux-arm64.tar.gz SHA1 d2fd672e4f89345e7636c39b8c4677d919082dde
aspnetcore-runtime-9.0.0-linux-arm64.tar.gz SHA256 9811d42c2dc6ffd9b6b69d4f2f6387f0d4add812eddf28ea178b5f751741bf7c
aspnetcore-runtime-9.0.1-linux-x64.tar.gz MD5 8be3ff5949d04f3fae7d89b90b665440
aspnetcore-runtime-9.0.1-linux-x64.tar.gz SHA1 757694256ed94e1244319ed3d2e6dda22087c34a
aspnetcore-runtime-9.0.1-linux-x64.tar.gz SHA256 32f6e342b46b7d26c547647b58b1889ef707995a008bd8844fa5fa4acc0a24fb

aspnetcore-runtime-9.0.1-linux-arm.tar.gz MD5 b3f195fb40e44965f6e93c27528e3d15
aspnetcore-runtime-9.0.1-linux-arm.tar.gz SHA1 2e42d80e0e207e754590545eaccb8cc253d18e87
aspnetcore-runtime-9.0.1-linux-arm.tar.gz SHA256 d997306894ad364e195a17a87f57fab9fe7f1a6e8dedc724c295bdedee161e33

aspnetcore-runtime-9.0.1-linux-arm64.tar.gz MD5 07da3aff29423d39162447df41a78430
aspnetcore-runtime-9.0.1-linux-arm64.tar.gz SHA1 448cf274cb9612c3dd6cc2fd1a170d5d81dd2346
aspnetcore-runtime-9.0.1-linux-arm64.tar.gz SHA256 f59d07afa69aabaf9085caff6f1a116a0e51a5e8d2ca73071c14e2e5e76328af
4 changes: 2 additions & 2 deletions native/dotnet-sdk-8.0/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PKG_NAME = dotnet-sdk-8.0
# Version 8.0.11, SDK 8.0.404
# Version 8.0.12, SDK 8.0.405
# https://dotnet.microsoft.com/download/dotnet/8.0
PKG_VERS = 8.0.404
PKG_VERS = 8.0.405
PKG_EXT = tar.gz
PKG_DIST_NAME = dotnet-sdk-$(PKG_VERS)-linux-x64.$(PKG_EXT)
PKG_DIST_SITE = https://builds.dotnet.microsoft.com/dotnet/Sdk/${PKG_VERS}
Expand Down
6 changes: 3 additions & 3 deletions native/dotnet-sdk-8.0/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dotnet-sdk-8.0.404-linux-x64.tar.gz SHA1 cfa52d37c2873264cff8a7962a598be111c3cba9
dotnet-sdk-8.0.404-linux-x64.tar.gz SHA256 5bf340ba6acb314c703c2492a3a6e1530d7cdbfd3b5bf86788ee8b4afefd3573
dotnet-sdk-8.0.404-linux-x64.tar.gz MD5 ff27aff23e06e596a3e1dff73870061f
dotnet-sdk-8.0.405-linux-x64.tar.gz MD5 a257768426ad2199ca7dfb322934db38
dotnet-sdk-8.0.405-linux-x64.tar.gz SHA1 f8279c8716d6902ed66b3d08e0eb9279c7707ef6
dotnet-sdk-8.0.405-linux-x64.tar.gz SHA256 ce792eb7d9b3b01e781bf18529c2217b3d337637d70b441fd6587df5d6c15908
6 changes: 3 additions & 3 deletions spk/dotnet8-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = dotnet8-runtime
SPK_VERS = 8.0.11
SPK_REV = 3
SPK_VERS = 8.0.12
SPK_REV = 4
SPK_ICON = src/dotnet.png

OPTIONAL_DEPENDS = cross/libstdc++
Expand All @@ -13,7 +13,7 @@ DOTNET_CORE_ARCHS = 1

MAINTAINER = hgy59
DESCRIPTION = Free. Cross-platform. Open source. A developer platform for building all apps. This package installs the dotnet runtime and the asp.net.core runtime.
CHANGELOG = "Update to dotnet-runtime v8.0.11."
CHANGELOG = "Update to dotnet-runtime v8.0.12."

STARTABLE = no
DISPLAY_NAME = .NET 8 runtime
Expand Down
6 changes: 3 additions & 3 deletions spk/dotnet9-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SPK_NAME = dotnet9-runtime
SPK_VERS = 9.0.0
SPK_REV = 1
SPK_VERS = 9.0.1
SPK_REV = 2
SPK_ICON = src/dotnet.png

OPTIONAL_DEPENDS = cross/libstdc++
Expand All @@ -13,7 +13,7 @@ DOTNET_CORE_ARCHS = 1

MAINTAINER = brice-fromentin
DESCRIPTION = Free. Cross-platform. Open source. A developer platform for building all apps. This package installs the dotnet runtime and the asp.net.core runtime.
CHANGELOG = "Initial release of dotnet-runtime v9.0.0."
CHANGELOG = "Update to dotnet-runtime v9.0.1."

STARTABLE = no
DISPLAY_NAME = .NET 9 runtime
Expand Down

0 comments on commit 5834869

Please sign in to comment.