chore: 把dadk换成insiders版本

Signed-off-by: longjin <[email protected]>

dadk-manifest.toml

@@ -0,0 +1,24 @@
+# DADK 总控文件
+
+[metadata]
+# Target architecture. Options: x86_64, riscv64
+arch = "x86_64"
+
+# Hypervisor config path
+hypervisor-config = "config/hypervisor.toml"
+
+# RootFS config path
+rootfs-config = "config/rootfs.toml"
+
+# Boot config path
+boot-config = "config/boot.toml"
+
+# System root directory folder (DADK will copy the files in this directory to the root directory of the disk image)
+sysroot-dir = "bin/sysroot"
+
+# DADK Root Cache directory path
+cache-root-dir = "bin/dadk_cache"
+
+# User configuration directory path
+# 这个字段只是临时用于兼容旧版本，v0.2版本重构完成后会删除
+user-config-dir = "user/dadk/config"

user/Makefile

@@ -41,15 +41,12 @@ endif
 .PHONY: dadk_run
 dadk_run: install_dadk
 	mkdir -p $(DADK_CACHE_DIR)
-	dadk --config-dir dadk/config --cache-dir $(DADK_CACHE_DIR) --dragonos-dir $(ROOT_PATH)/bin/sysroot build
-	dadk --config-dir dadk/config --cache-dir $(DADK_CACHE_DIR) --dragonos-dir $(ROOT_PATH)/bin/sysroot install
+	dadk-insiders user build -w $(ROOT_PATH)
+	dadk-insiders user install -w $(ROOT_PATH)
 
 .PHONY: dadk_clean
 dadk_clean: install_dadk
 	@echo dadk_clean
-# 不运行dadk clean的原因是，把clean的工作交给应用程序自己去做，这样可以节省编译时间
-#dadk --config-dir dadk/config --cache-dir $(DADK_CACHE_DIR) --dragonos-dir $(ROOT_PATH)/bin/sysroot clean src
-#dadk --config-dir dadk/config --cache-dir $(DADK_CACHE_DIR) --dragonos-dir $(ROOT_PATH)/bin/sysroot clean target
 
 all:
 	mkdir -p $(ROOT_PATH)/bin/sysroot

user/dadk/config/about.dadk

@@ -6,7 +6,7 @@
     "task_type": {
       "BuildFromSource": {
         "Local": {
-          "path": "apps/about"
+          "path": "user/apps/about"
         }
       }
     },

user/dadk/config/clear-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/clear"
+        "path": "user/apps/clear"
       }
     }
   },

user/dadk/config/dmesg-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/dmesg"
+        "path": "user/apps/dmesg"
       }
     }
   },

user/dadk/config/http_server-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/http_server"
+        "path": "user/apps/http_server"
       }
     }
   },

user/dadk/config/riscv_init-0.1.0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/riscv_init"
+        "path": "user/apps/riscv_init"
       }
     }
   },

user/dadk/config/test_alarm_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_alarm"
+        "path": "user/apps/test_alarm"
       }
     }
   },

user/dadk/config/test_backlog_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-backlog"
+        "path": "user/apps/test-backlog"
       }
     }
   },

user/dadk/config/test_bind-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_bind"
+        "path": "user/apps/test_bind"
       }
     }
   },

user/dadk/config/test_blockcache_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-blockcache"
+        "path": "user/apps/test-blockcache"
       }
     }
   },

user/dadk/config/test_chown_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-chown"
+        "path": "user/apps/test-chown"
       }
     }
   },

user/dadk/config/test_cred-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_cred"
+        "path": "user/apps/test_cred"
       }
     }
   },

user/dadk/config/test_dup3_0_1_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_dup3"
+        "path": "user/apps/test_dup3"
       }
     }
   },

user/dadk/config/test_ebpf_0_1_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_ebpf"
+        "path": "user/apps/test_ebpf"
       }
     }
   },

user/dadk/config/test_eventfd_0_1_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_eventfd"
+        "path": "user/apps/test_eventfd"
       }
     }
   },

user/dadk/config/test_filemap-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_filemap"
+        "path": "user/apps/test_filemap"
       }
     }
   },

user/dadk/config/test_for_robustfutex_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-for-robustfutex"
+        "path": "user/apps/test-for-robustfutex"
       }
     }
   },

user/dadk/config/test_fstat-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_fstat"
+        "path": "user/apps/test_fstat"
       }
     }
   },

user/dadk/config/test_fstatfs_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_fstatfs"
+        "path": "user/apps/test_fstatfs"
       }
     }
   },

user/dadk/config/test_gettimeofday-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_gettimeofday"
+        "path": "user/apps/test_gettimeofday"
       }
     }
   },

user/dadk/config/test_kvm_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_kvm"
+        "path": "user/apps/test_kvm"
       }
     }
   },

user/dadk/config/test_lo_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_lo"
+        "path": "user/apps/test_lo"
       }
     }
   },

user/dadk/config/test_mkfifo-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_mkfifo"
+        "path": "user/apps/test_mkfifo"
       }
     }
   },

user/dadk/config/test_mount_1_0_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-mount"
+        "path": "user/apps/test-mount"
       }
     }
   },

user/dadk/config/test_pty-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_pty"
+        "path": "user/apps/test_pty"
       }
     }
   },

user/dadk/config/test_ramfs-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_ramfs"
+        "path": "user/apps/test_ramfs"
       }
     }
   },

user/dadk/config/test_shm-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_shm"
+        "path": "user/apps/test_shm"
       }
     }
   },

user/dadk/config/test_sigint-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_sigint"
+        "path": "user/apps/test_sigint"
       }
     }
   },

user/dadk/config/test_signal-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_signal"
+        "path": "user/apps/test_signal"
       }
     }
   },

user/dadk/config/test_socket-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_socket"
+        "path": "user/apps/test_socket"
       }
     }
   },

user/dadk/config/test_sqlite3-3.42.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_sqlite3"
+        "path": "user/apps/test_sqlite3"
       }
     }
   },

user/dadk/config/test_statfs_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_statfs"
+        "path": "user/apps/test_statfs"
       }
     }
   },

user/dadk/config/test_statx_0_1_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_statx"
+        "path": "user/apps/test_statx"
       }
     }
   },

user/dadk/config/test_symlink_0_1_0.dadk

@@ -6,7 +6,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test-symlink"
+        "path": "user/apps/test-symlink"
       }
     }
   },

user/dadk/config/test_tokio-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_tokio"
+        "path": "user/apps/test_tokio"
       }
     }
   },

user/dadk/config/test_uart-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_uart"
+        "path": "user/apps/test_uart"
       }
     }
   },

user/dadk/config/test_utimensat_0_1_0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/test_utimensat"
+        "path": "user/apps/test_utimensat"
       }
     }
   },

user/dadk/config/user_manage-0.1.0.dadk

@@ -5,7 +5,7 @@
   "task_type": {
     "BuildFromSource": {
       "Local": {
-        "path": "apps/user-manage"
+        "path": "user/apps/user-manage"
       }
     }
   },