Skip to content

Commit 68d468d

Browse files
committed
spk.mk: Use @publicarray proposal to manage <=6.1 DSM version
1 parent 2ccde9f commit 68d468d

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

mk/spksrc.spk.mk

+9-8
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,18 @@ endif
104104
@echo distributor=\"$(DISTRIBUTOR)\" >> $@
105105
@echo distributor_url=\"$(DISTRIBUTOR_URL)\" >> $@
106106

107+
ifneq ($(strip $(OS_MIN_VER)),)
108+
@echo os_min_ver=\"$(OS_MIN_VER)\" >> $@
109+
else
110+
@echo os_min_ver=\"$(TC_OS_MIN_VER)\" >> $@
111+
endif
112+
ifeq ($(shell expr "$(TC_OS_MIN_VER)" \<= 6.1),1)
107113
ifneq ($(strip $(FIRMWARE)),)
108114
@echo firmware=\"$(FIRMWARE)\" >> $@
109-
else ifneq ($(strip $(OS_MIN_VER)),)
110-
@echo os_min_ver=\"$(OS_MIN_VER)\" >> $@
115+
else
116+
@echo firmware=\"$(TC_OS_MIN_VER)\" >> $@
117+
endif
111118
endif
112-
@if (( $(echo $${TC_OS_MIN_VER}' <= 6.1' | bc -l) )); then
113-
@echo os_min_ver=\"$(TC_OS_MIN_VER)\" >> $@ ; \
114-
else ; \
115-
@echo firmware=\"$(TC_OS_MIN_VER)\" >> $@ ; \
116-
@echo os_min_ver=\"$(TC_OS_MIN_VER)\" >> $@ ; \
117-
fi
118119
ifneq ($(strip $(OS_MAX_VER)),)
119120
@echo os_max_ver=\"$(OS_MAX_VER)\" >> $@
120121
endif

0 commit comments

Comments
 (0)