Browse Source

默认安装gnu tar到dragonos的/usr/bin目录下 (#442)

LoGin 1 year ago
parent
commit
edaf015400
3 changed files with 26 additions and 2 deletions
  1. 1 1
      tools/create_hdd_image.sh
  2. 1 1
      user/Makefile
  3. 24 0
      user/dadk/config/tar_1_35.dadk

+ 1 - 1
tools/create_hdd_image.sh

@@ -49,7 +49,7 @@ EOF
 echo "Creating virtual disk image..."
 ARGS=`getopt -o P: -- "$@"`
 # 创建一至少为256MB磁盘镜像(类型选择raw)
-qemu-img create -f raw disk.img 256M
+qemu-img create -f raw disk.img 2048M
 #将规范化后的命令行参数分配至位置参数($1,$2,...)
 eval set -- "${ARGS}"
 #echo formatted parameters=[$@]

+ 1 - 1
user/Makefile

@@ -14,7 +14,7 @@ current_CFLAGS := $(CFLAGS)
 
 DADK_VERSION=$(shell dadk -V | awk 'END {print $$2}')
 # 最小的DADK版本
-MIN_DADK_VERSION = 0.1.4
+MIN_DADK_VERSION = 0.1.5
 DADK_CACHE_DIR = $(ROOT_PATH)/bin/dadk_cache
 
 # 旧版的libc安装路径

+ 24 - 0
user/dadk/config/tar_1_35.dadk

@@ -0,0 +1,24 @@
+{
+  "name": "tar",
+  "version": "1.35",
+  "description": "gnu tar",
+  "rust_target": null,
+  "task_type": {
+    "InstallFromPrebuilt": {
+      "Archive": {
+        "url": "https://mirrors.dragonos.org/pub/third_party/gnu/tar/tar-1.35-x86_64-linux-gnu.tar.xz"
+      }
+    }
+  },
+  "depends": [],
+  "build": {
+    
+  },
+  "install": {
+    "in_dragonos_path": "/usr"
+  },
+  "clean": {
+    "clean_command": null
+  },
+  "envs": []
+}