Another approach to test

mreid-tt · Oct 3, 2024 · 9c876f6 · 9c876f6
1 parent 4ef8e70
commit 9c876f6
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/mk/spksrc.pre-check.mk b/mk/spksrc.pre-check.mk
@@ -82,18 +82,18 @@ endif
 
 # Check minimum DSM requirements of package
 
-echo "===> VARIABLE - REQUIRED_MIN_DSM: $(REQUIRED_MIN_DSM)"
-echo "===> VARIABLE - TCVERSION: $(TCVERSION)"
+@$(echo "===> VARIABLE - REQUIRED_MIN_DSM: $(REQUIRED_MIN_DSM)")
+@$(echo "===> VARIABLE - TCVERSION: $(TCVERSION)")
 
 ifneq ($(REQUIRED_MIN_DSM),)
-  # Check if ARCH is noarch and TCVERSION is empty
   ifeq ($(ARCH),noarch)
-    ifeq ($(TCVERSION),)
-      TCVERSION=3.1
+    ifneq ($(REQUIRED_MIN_DSM),$(firstword $(sort 3.1 $(REQUIRED_MIN_DSM))))
+      ifneq (,$(BUILD_UNSUPPORTED_FILE))
+        $(shell echo $(date --date=now +"%Y.%m.%d %H:%M:%S") - $(SPK_FOLDER): DSM Toolchain 3.1 is lower than $(REQUIRED_MIN_DSM) >> $(BUILD_UNSUPPORTED_FILE))
+      endif
+      @$(error DSM Toolchain 3.1 is lower than $(REQUIRED_MIN_DSM))
     endif
-  endif
-
-  ifeq (,$(findstring $(ARCH),$(SRM_ARCHS)))
+  else ifeq (,$(findstring $(ARCH),$(SRM_ARCHS)))
     ifneq ($(REQUIRED_MIN_DSM),$(firstword $(sort $(TCVERSION) $(REQUIRED_MIN_DSM))))
       ifneq (,$(BUILD_UNSUPPORTED_FILE))
         $(shell echo $(date --date=now +"%Y.%m.%d %H:%M:%S") - $(SPK_FOLDER): DSM Toolchain $(TCVERSION) is lower than $(REQUIRED_MIN_DSM) >> $(BUILD_UNSUPPORTED_FILE))