From c55f007ee96bfa713e3c1788789463596099bea8 Mon Sep 17 00:00:00 2001
From: longjin <longjin@DragonOS.org>
Date: Tue, 19 Mar 2024 13:13:48 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0core=20utils=E5=88=B0?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 user/Makefile                          |  5 ++---
 user/dadk/config/core_utils-9.4.0.dadk | 26 ++++++++++++++++++++++++++
 user/dadk/config/musl_1_2_4.dadk       |  5 ++++-
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 user/dadk/config/core_utils-9.4.0.dadk

diff --git a/user/Makefile b/user/Makefile
index 87ff42394..76b92bb40 100644
--- a/user/Makefile
+++ b/user/Makefile
@@ -7,7 +7,7 @@ GARBAGE := $(foreach DIR,$(DIRS),$(addprefix $(DIR)/,$(GARBAGE_PATTERNS)))
 
 DADK_VERSION=$(shell dadk -V | awk 'END {print $$2}')
 # 最小的DADK版本
-MIN_DADK_VERSION = 0.1.8
+MIN_DADK_VERSION = 0.1.10
 DADK_CACHE_DIR = $(ROOT_PATH)/bin/dadk_cache
 
 ECHO:
@@ -60,11 +60,10 @@ all:
 	@echo 用户态程序编译完成
 
 copy_services: dadk_run
+	@mkdir -p $(ROOT_PATH)/bin/sysroot/etc/reach/system
 	cp -r services/* $(ROOT_PATH)/bin/sysroot/etc/reach/system/
 
 
-	
-
 .PHONY: clean
 clean:
 	rm -rf $(GARBAGE)
diff --git a/user/dadk/config/core_utils-9.4.0.dadk b/user/dadk/config/core_utils-9.4.0.dadk
new file mode 100644
index 000000000..d9d9dec91
--- /dev/null
+++ b/user/dadk/config/core_utils-9.4.0.dadk
@@ -0,0 +1,26 @@
+{
+  "name": "Core utils",
+  "version": "9.4.0",
+  "description": "GNU Core utils",
+  "task_type": {
+    "BuildFromSource": {
+      "Archive": {
+        "url": "https://mirrors.dragonos.org.cn/pub/third_party/gnu/coreutils/coreutils-9.4.tar.xz"
+      }
+    }
+  },
+  "depends": [],
+  "build": {
+    "build_command": "./configure CC=x86_64-linux-musl-gcc CFLAGS=-static && make -j $(nproc) && DESTDIR=$DADK_CURRENT_BUILD_DIR make install"
+  },
+  "clean": {
+    "clean_command": "make clean"
+  },
+  "install": {
+    "in_dragonos_path": "/"
+  },
+
+  "build_once": true,
+
+  "install_once": true
+}
diff --git a/user/dadk/config/musl_1_2_4.dadk b/user/dadk/config/musl_1_2_4.dadk
index f70c84cce..25e9102c7 100644
--- a/user/dadk/config/musl_1_2_4.dadk
+++ b/user/dadk/config/musl_1_2_4.dadk
@@ -20,5 +20,8 @@
   "clean": {
     "clean_command": "make clean"
   },
-  "envs": []
+  "envs": [],
+  "build_once": true,
+
+  "install_once": true
 }
\ No newline at end of file