Simplify and remove unecessary code.

Author: brice-fromentin

Diff for: cross/dotnet8-runtime/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME = aspnetcore-runtime
 PKG_VERS = 8.0.12
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-$(PKG_DIST_ARCH).$(PKG_EXT)
+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)
@@ -10,22 +10,14 @@ 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  = $(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
-PKG_DIST_SITE_LIST += $(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
-PKG_DIST_SITE_LIST += $(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),)

Diff for: cross/dotnet9-runtime/Makefile

@@ -1,7 +1,7 @@
 PKG_NAME = aspnetcore-runtime
 PKG_VERS = 9.0.1
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-$(PKG_DIST_ARCH).$(PKG_EXT)
+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)
@@ -10,22 +10,14 @@ 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  = $(PKG_NAME)-$(PKG_VERS)-linux-x64.$(PKG_EXT)
-PKG_DIST_SITE_LIST += $(PKG_NAME)-$(PKG_VERS)-linux-arm.$(PKG_EXT)
-PKG_DIST_SITE_LIST += $(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),)