Skip to content

Commit 1cd9bb4

Browse files
authored
添加core utils到系统 (#624)
1 parent 8c6f218 commit 1cd9bb4

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

user/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GARBAGE := $(foreach DIR,$(DIRS),$(addprefix $(DIR)/,$(GARBAGE_PATTERNS)))
77

88
DADK_VERSION=$(shell dadk -V | awk 'END {print $$2}')
99
# 最小的DADK版本
10-
MIN_DADK_VERSION = 0.1.8
10+
MIN_DADK_VERSION = 0.1.10
1111
DADK_CACHE_DIR = $(ROOT_PATH)/bin/dadk_cache
1212

1313
ECHO:
@@ -60,11 +60,10 @@ all:
6060
@echo 用户态程序编译完成
6161

6262
copy_services: dadk_run
63+
@mkdir -p $(ROOT_PATH)/bin/sysroot/etc/reach/system
6364
cp -r services/* $(ROOT_PATH)/bin/sysroot/etc/reach/system/
6465

6566

66-
67-
6867
.PHONY: clean
6968
clean:
7069
rm -rf $(GARBAGE)
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name": "Core utils",
3+
"version": "9.4.0",
4+
"description": "GNU Core utils",
5+
"task_type": {
6+
"BuildFromSource": {
7+
"Archive": {
8+
"url": "https://mirrors.dragonos.org.cn/pub/third_party/gnu/coreutils/coreutils-9.4.tar.xz"
9+
}
10+
}
11+
},
12+
"depends": [],
13+
"build": {
14+
"build_command": "./configure CC=x86_64-linux-musl-gcc CFLAGS=-static && make -j $(nproc) && DESTDIR=$DADK_CURRENT_BUILD_DIR make install"
15+
},
16+
"clean": {
17+
"clean_command": "make clean"
18+
},
19+
"install": {
20+
"in_dragonos_path": "/"
21+
},
22+
23+
"build_once": true,
24+
25+
"install_once": true
26+
}

user/dadk/config/musl_1_2_4.dadk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,8 @@
2020
"clean": {
2121
"clean_command": "make clean"
2222
},
23-
"envs": []
23+
"envs": [],
24+
"build_once": true,
25+
26+
"install_once": true
2427
}

0 commit comments

Comments
 (0)