Skip to content

Commit

Permalink
自动从dragonos镜像站更新dadk
Browse files Browse the repository at this point in the history
  • Loading branch information
fslongjin committed Nov 24, 2023
1 parent 3338a42 commit aef936b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions user/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ current_CFLAGS := $(CFLAGS)

DADK_VERSION=$(shell dadk -V | awk 'END {print $$2}')
# 最小的DADK版本
MIN_DADK_VERSION = 0.1.5
MIN_DADK_VERSION = 0.1.6
DADK_CACHE_DIR = $(ROOT_PATH)/bin/dadk_cache

# 旧版的libc安装路径
Expand All @@ -32,7 +32,7 @@ ifeq ("$(DADK_VERSION)", "")
@echo "\nYou can install dadk by running the following command:"
@echo "\n\tcargo install dadk"
@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\tcargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION)"
@echo "\n"
@echo "Auto installing dadk..."
CC=gcc AS=as AR=ar LD=ld OBJCOPY=objcopy NM=nm cargo install dadk
Expand All @@ -43,7 +43,7 @@ else
ifneq ($(shell printf '%s\n%s' "$(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)
CC=gcc AS=as AR=ar LD=ld OBJCOPY=objcopy NM=nm cargo install --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION) || (echo "dadk update failed" && exit 1)
@echo "dadk updated"
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion user/dadk/config/nova_shell-0.1.0.dadk
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
},
"install": {
"in_dragonos_path": "/"
},
}
}

0 comments on commit aef936b

Please sign in to comment.