tc.mk: Force two (2x) digits for version

mk/spksrc.common.mk

@@ -28,7 +28,7 @@ AVAILABLE_TCS = $(notdir $(wildcard ../../toolchains/syno-*))
 AVAILABLE_ARCHS = $(notdir $(subst syno-,/,$(AVAILABLE_TCS)))
 
 # Toolchain filters
-SUPPORTED_ARCHS = $(sort $(filter-out $(ARCHS_DUPES), $(AVAILABLE_ARCHS)) apollolake-6.2 geminilake-6.2 purley-6.2)
+SUPPORTED_ARCHS = $(sort $(filter-out $(ARCHS_DUPES), $(AVAILABLE_ARCHS)) apollolake-6.2.3 geminilake-6.2.3 purley-6.2.3)
 DEFAULT_ARCHS = $(sort $(filter-out $(ARCHS_DUPES_DEFAULT), $(AVAILABLE_ARCHS)))
 LEGACY_ARCHS = $(sort $(filter-out $(SUPPORTED_ARCHS) $(ARCHS_DUPES), $(AVAILABLE_ARCHS)))
 # SRM - Synology Router Manager

mk/spksrc.spk.mk

@@ -104,19 +104,17 @@ endif
 	@echo distributor=\"$(DISTRIBUTOR)\" >> $@
 	@echo distributor_url=\"$(DISTRIBUTOR_URL)\" >> $@
 
-ifneq ($(strip $(FIRMWARE)),)
-	@echo firmware=\"$(FIRMWARE)\" >> $@
-else ifneq ($(strip $(OS_MIN_VER)),)
+ifneq ($(strip $(OS_MIN_VER)),)
 	@echo os_min_ver=\"$(OS_MIN_VER)\" >> $@
-else ifneq ($(strip $(TC_FIRMWARE)),)
-	@echo firmware=\"$(TC_FIRMWARE)\" >> $@
-	@echo os_min_ver=\"$(TC_FIRMWARE)\" >> $@
-else ifneq ($(strip $(TC_OS_MIN_VER)),)
-	@echo firmware=\"$(TC_OS_MIN_VER)\" >> $@
+else
 	@echo os_min_ver=\"$(TC_OS_MIN_VER)\" >> $@
+endif
+ifeq ($(shell expr "$(TC_OS_MIN_VER)" \<= 6.1),1)
+ifneq ($(strip $(FIRMWARE)),)
+	@echo firmware=\"$(FIRMWARE)\" >> $@
 else
-	@echo firmware=\"3.1-1594\" >> $@
-	@echo os_min_ver=\"3.1-1594\" >> $@
+	@echo firmware=\"$(TC_OS_MIN_VER)\" >> $@
+endif
 endif
 ifneq ($(strip $(OS_MAX_VER)),)
 	@echo os_max_ver=\"$(OS_MAX_VER)\" >> $@

mk/spksrc.tc-flags.mk

@@ -16,6 +16,10 @@ ifeq ($(strip $(TC_TYPE)),)
 TC_TYPE = DSM
 endif
 
+ifeq ($(strip $(TC_OS_MIN_VER)),)
+TC_OS_MIN_VER = $(word 1,$(subst ., ,$(TC_VERS))).$(word 2,$(subst ., ,$(TC_VERS)))-$(TC_BUILD)
+endif
+
 ifeq ($(strip $(TC_DIST_SITE_URL)),)
 TC_DIST_SITE_URL = https://sourceforge.net/projects/dsgpl/files/Tool%20Chain/$(TC_TYPE)%20$(TC_VERS)%20Tool%20Chains/
 endif

mk/spksrc.tc-vers.mk

@@ -1,65 +1,59 @@
-ifeq ($(strip $(TC_FIRMWARE)),)
-TC_FIRMWARE = $(TC_OS_MIN_VER)
-endif
-
-ifeq ($(strip $(TC_OS_MIN_VER)),)
 ifeq ($(TC_VERS),1.1)
-TC_OS_MIN_VER = $(TC_VERS)-6931
+TC_BUILD = 6931
 endif
 
 ifeq ($(TC_VERS),1.2)
-TC_OS_MIN_VER = $(TC_VERS)-7742
+TC_BUILD = 7742
 endif
 
 ifeq ($(TC_VERS),4.0)
-TC_OS_MIN_VER = $(TC_VERS)-2198
+TC_BUILD = 2198
 endif
 
 ifeq ($(TC_VERS),4.1)
-TC_OS_MIN_VER = $(TC_VERS)-2636
+TC_BUILD = 2636
 endif
 
 ifeq ($(TC_VERS),4.2)
-TC_OS_MIN_VER = $(TC_VERS)-3202
+TC_BUILD = 3202
 endif
 
 ifeq ($(TC_VERS),4.3)
-TC_OS_MIN_VER = $(TC_VERS)-3776
+TC_BUILD = 3776
 endif
 
 ifeq ($(TC_VERS),5.0)
-TC_OS_MIN_VER = $(TC_VERS)-4458
+TC_BUILD = 4458
 endif
 
 ifeq ($(TC_VERS),5.1)
-TC_OS_MIN_VER = $(TC_VERS)-5004
+TC_BUILD = 5004
 endif
 
 ifeq ($(TC_VERS),5.2)
-TC_OS_MIN_VER = $(TC_VERS)-5644
+TC_BUILD = 5644
 endif
 
 ifeq ($(TC_VERS),6.0)
-TC_OS_MIN_VER = $(TC_VERS)-7321
+TC_BUILD = 7321
 endif
 
 ifeq ($(TC_VERS),6.0.2)
-TC_OS_MIN_VER = $(TC_VERS)-8451
+TC_BUILD = 8451
 endif
 
 ifeq ($(TC_VERS),6.1)
-TC_OS_MIN_VER = $(TC_VERS)-15047
+TC_BUILD = 15047
 endif
 
 ifeq ($(TC_VERS),6.2)
-TC_OS_MIN_VER = $(TC_VERS)-22259
+TC_BUILD = 22259
 endif
 
 ifeq ($(TC_VERS),6.2.2)
-TC_OS_MIN_VER = $(TC_VERS)-24922
+TC_BUILD = 24922
 endif
 
 ifeq ($(TC_VERS),6.2.3)
-TC_OS_MIN_VER = $(TC_VERS)-25423
-endif
+TC_BUILD = 25423
 endif

mk/spksrc.tc.mk

@@ -79,7 +79,8 @@ tc_vars: fix
 	@echo TC_LIBRARY := $(TC_LIBRARY)
 	@echo TC_INCLUDE := $(TC_INCLUDE)
 	@echo TC_EXTRA_CFLAGS := $(TC_EXTRA_CFLAGS)
-	@echo TC_FIRMWARE := $(TC_FIRMWARE)
+	@echo TC_VERS := $(TC_VERS)
+	@echo TC_BUILD := $(TC_BUILD)
 	@echo TC_OS_MIN_VER := $(TC_OS_MIN_VER)
 	@echo TC_ARCH := $(TC_ARCH)