From abf3f634bf7e13e829556e962e7c73a85d163335 Mon Sep 17 00:00:00 2001 From: LoGin Date: Sat, 5 Aug 2023 15:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=89=E8=A3=85=E3=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0dadk=20(#319)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * auto install/auto update dadk --- user/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/user/Makefile b/user/Makefile index 583321a3..9155ffe4 100644 --- a/user/Makefile +++ b/user/Makefile @@ -14,7 +14,7 @@ current_CFLAGS := $(CFLAGS) DADK_VERSION = $(shell dadk -V | awk 'END {print $2}') # 最小的DADK版本 -MIN_DADK_VERSION = 0.1.1 +MIN_DADK_VERSION = 0.1.2 DADK_CACHE_DIR = $(ROOT_PATH)/bin/dadk_cache # 旧版的libc安装路径 @@ -34,9 +34,17 @@ ifeq ("$(DADK_VERSION)", "") @echo "\nOr you can install dadk from source by running the following command:" @echo "\n\tcargo install --git https://github.com/DragonOS-Community/DADK.git" @echo "\n" - @exit 1 + @echo "Auto installing dadk..." + CC=gcc AS=as AR=ar LD=ld OBJCOPY=objcopy NM=nm cargo install dadk else @echo "dadk version $(DADK_VERSION) installed" +# 如果DADK版本过低,则自动更新 +ifeq ($(shell printf '%s\n' "$(DADK_VERSION)" "$(MIN_DADK_VERSION)" | sort -V | head -n1), $(MIN_DADK_VERSION)) + @echo "dadk version is too low, please update to $(MIN_DADK_VERSION) or higher version" + @echo "Updating dadk..." + CC=gcc AS=as AR=ar LD=ld OBJCOPY=objcopy NM=nm cargo install dadk || (echo "dadk update failed" && exit 1) + @echo "dadk updated" +endif endif dadk_run: install_dadk