DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-21 14:23:39 +00:00
Code Issues Releases Wiki Activity

使nproc可以正确获取到cpu核心数 (#689)

Browse Source
This commit is contained in:
yuyi2439
2024-04-04 12:41:19 +08:00
committed by GitHub
parent 9b96c5b547
commit 9430523b46
6 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
user/Makefile
View File

@ -25,7 +25,7 @@ ifeq ("$(DADK_VERSION)", "")
@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
cargo install dadk
else
# 如果DADK版本过低，则自动更新
@echo "dadk version $(DADK_VERSION) installed"
@ -33,7 +33,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 --git https://git.mirrors.dragonos.org.cn/DragonOS-Community/DADK.git --tag v$(MIN_DADK_VERSION) || (echo "dadk update failed" && exit 1)
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
@ -55,11 +55,11 @@ all:
mkdir -p $(ROOT_PATH)/bin/sysroot
$(MAKE) dadk_run
$(MAKE) copy_services
$(MAKE) copy_sysconfig
@echo 用户态程序编译完成
copy_services: dadk_run
copy_sysconfig: dadk_run
cp -r sysconfig/* $(ROOT_PATH)/bin/sysroot/