From edaf015400f83967c2fc940f07be0dbb5792246f Mon Sep 17 00:00:00 2001 From: LoGin Date: Wed, 15 Nov 2023 17:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=AE=89=E8=A3=85gnu=20tar?= =?UTF-8?q?=E5=88=B0dragonos=E7=9A=84/usr/bin=E7=9B=AE=E5=BD=95=E4=B8=8B?= =?UTF-8?q?=20(#442)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/create_hdd_image.sh | 2 +- user/Makefile | 2 +- user/dadk/config/tar_1_35.dadk | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 user/dadk/config/tar_1_35.dadk diff --git a/tools/create_hdd_image.sh b/tools/create_hdd_image.sh index 0d7263d9b..a8c847cfc 100755 --- a/tools/create_hdd_image.sh +++ b/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=[$@] diff --git a/user/Makefile b/user/Makefile index e66ae2df1..f11ae3416 100644 --- a/user/Makefile +++ b/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安装路径 diff --git a/user/dadk/config/tar_1_35.dadk b/user/dadk/config/tar_1_35.dadk new file mode 100644 index 000000000..ab992d7cf --- /dev/null +++ b/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": [] +}