Skip to content

Commit

Permalink
Dotnet runtime: remove unsupported archs (#5301)
Browse files Browse the repository at this point in the history
* dotnet-runtime: remove unsupported archs from generic ARMv7.

* dotnet-runtime: update to v6.0.12
- update dotnet-runtime
- use DOTNET_UNSUPPORTED_ARCHS to exclude unsupported archs from packages
  • Loading branch information
hgy59 authored Dec 18, 2022
1 parent e430c85 commit ffd0e74
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 22 deletions.
9 changes: 4 additions & 5 deletions cross/dotnet-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = aspnetcore-runtime
PKG_VERS = 6.0.5
PKG_VERS = 6.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)
Expand All @@ -8,13 +8,12 @@ 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/a0e9ceb8-04eb-4510-876c-795a6a123dda/6141e57558eddc2d4629c7c14c2c6fa1/$(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/eda01ff6-fb9f-49ce-bdc1-67c688f9f1fa/75b195f97f4b219fccbac4432a6afaf0/$(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/8ba7087e-4513-41e5-8359-a4bcd2a3661f/e6828f0d8cf1ecc63074c9ff57685e27/$(PKG_NAME)-$(PKG_VERS)-linux-arm64.$(PKG_EXT)
PKG_DIST_SITE_LIST = https://download.visualstudio.microsoft.com/download/pr/4ba0f30d-0a77-4997-8d8d-1b113d60253b/5caeeb07572b0b6a26f2a82f7a4eb31d/$(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/57b2bdaf-8455-4b1a-b25b-5950c950bd38/471d6de036e6f367f3a4aae5252d885a/$(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
PKG_DIST_SITE_LIST += https://download.visualstudio.microsoft.com/download/pr/8072e219-57e4-48c3-b138-2b4067844ab2/b0712ad06fd0740963bf4ba2eff7f5ea/$(PKG_NAME)-$(PKG_VERS)-linux-arm64.$(PKG_EXT)

ifeq ($(findstring $(ARCH), $(x64_ARCHS)),$(ARCH))
PKG_DIST_ARCH = $(word 1,$(PKG_DIST_ARCH_LIST))
Expand Down
18 changes: 9 additions & 9 deletions cross/dotnet-runtime/digests
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
aspnetcore-runtime-6.0.5-linux-x64.tar.gz SHA1 8f9cc620916f42e565cb58e4c0767c25412681d6
aspnetcore-runtime-6.0.5-linux-x64.tar.gz SHA256 95a3cc7c4e7de792e39e40ffda72127ba49a49604b61fee18d50f970c9c1e903
aspnetcore-runtime-6.0.5-linux-x64.tar.gz MD5 432fcf1d9695180ff643e4f5142ab242
aspnetcore-runtime-6.0.5-linux-arm.tar.gz SHA1 69533731cd3647e799450adf69f3399d4da3f53c
aspnetcore-runtime-6.0.5-linux-arm.tar.gz SHA256 cfc2046f516d89cec3b0052029044691448f8dcd0a3e8779776a234124846308
aspnetcore-runtime-6.0.5-linux-arm.tar.gz MD5 afc5fcd8896891246d17ce91911b9e32
aspnetcore-runtime-6.0.5-linux-arm64.tar.gz SHA1 e005e69e80a9f2919c44c3f28c98a45c837d1939
aspnetcore-runtime-6.0.5-linux-arm64.tar.gz SHA256 70dc0a73b71761a2f717bf8917f7ea4a1be4c41d2cffbe29df68f38d26e8061e
aspnetcore-runtime-6.0.5-linux-arm64.tar.gz MD5 5b4cc66556bec9466456c833d735707d
aspnetcore-runtime-6.0.12-linux-x64.tar.gz SHA1 2058f16805c4680e499eba301c19de3ec2d182c1
aspnetcore-runtime-6.0.12-linux-x64.tar.gz SHA256 dd60c551d63eb66cd9bdc7ef223c00f49341e67f8ddda2e4ab412c3ee8997765
aspnetcore-runtime-6.0.12-linux-x64.tar.gz MD5 41b2e52c52f116ee68bdd5da53306fa8
aspnetcore-runtime-6.0.12-linux-arm.tar.gz SHA1 6e425179b364227bd689087258895fb724b4e100
aspnetcore-runtime-6.0.12-linux-arm.tar.gz SHA256 2131903c85087017ec680e44676c4eb46e7bd0a12f0683c2a7790ec75b243d75
aspnetcore-runtime-6.0.12-linux-arm.tar.gz MD5 af368f975fcd18ad6326382fc64594dd
aspnetcore-runtime-6.0.12-linux-arm64.tar.gz SHA1 d2214b9323dd62a4dae331bc8bf7a6d0cb71b19d
aspnetcore-runtime-6.0.12-linux-arm64.tar.gz SHA256 0090d031615b7d49855186cff7e4cbc99636ba664880780f84ce0d5ce25e4b0b
aspnetcore-runtime-6.0.12-linux-arm64.tar.gz MD5 9771b7e57f31e35be5e990338e87bc6f
1 change: 1 addition & 0 deletions mk/spksrc.archs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ DEPRECATED_ARCHS = powerpc ppc824x ppc854x ppc853x
DOTNET_UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(ARMv7L_ARCHS)
# .NET for x86 (32-bit) is supported on windows only (for linux, it must be built from source)
DOTNET_UNSUPPORTED_ARCHS += $(i686_ARCHS)
# ARMv7_ARCHS without full vfpv3 support (having only vfpv3-d16) are not supported
# issue #5315
DOTNET_UNSUPPORTED_ARCHS += armada370
# issue #5302
Expand Down
15 changes: 7 additions & 8 deletions spk/dotnet-runtime/Makefile
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
SPK_NAME = dotnet-runtime
SPK_VERS = 6.0.5
SPK_REV = 2
SPK_VERS = 6.0.12
SPK_REV = 3
SPK_ICON = src/dotnet.png

UNSUPPORTED_ARCHS = $(PPC_ARCHS) $(ARMv5_ARCHS) $(i686_ARCHS) $(ARMv7L_ARCHS)
OPTIONAL_DEPENDS = cross/libstdc++
DEPENDS = cross/libicu cross/dotnet-runtime

UNSUPPORTED_ARCHS = $(DOTNET_UNSUPPORTED_ARCHS)

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 v6.0.5 (security patch)."
CHANGELOG = "1. Update to dotnet-runtime v6.0.12 (several security patches).<br/>2. Remove unsupported armv7 archs from provided packages."

STARTABLE = no
DISPLAY_NAME = .NET 6.0 runtime

HOMEPAGE = https://dotnet.microsoft.com/
LICENSE = MIT

OPTIONAL_DEPENDS = cross/libstdc++
DEPENDS = cross/libicu cross/dotnet-runtime

include ../../mk/spksrc.common.mk

ifeq ($(call version_lt, ${TCVERSION}, 7.0),1)
# we do not only need the updated libstdc++ library, we also need to
# adjust the library search path for dotnet to use this version.
Expand Down
Empty file removed spk/dotnet-runtime/PLIST
Empty file.

0 comments on commit ffd0e74

Please sign in to comment.