NovaShell替换为默认shell

DragonOS-Community · Nov 22, 2023 · 0f98329 · 0f98329
1 parent c89d0c1
commit 0f98329
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/user/dadk/config/dragon_reach-0.1.0.dadk b/user/dadk/config/dragon_reach-0.1.0.dadk
@@ -6,7 +6,7 @@
     "BuildFromSource": {
       "Git": {
         "url" : "https://git.mirrors.dragonos.org/DragonOS-Community/DragonReach.git",
-        "revision": "d70ac4ed6b"
+        "revision": "4768985ade"
       }
     }
   },

diff --git a/user/dadk/config/nova_shell-0.1.0.dadk b/user/dadk/config/nova_shell-0.1.0.dadk
@@ -0,0 +1,29 @@
+{
+  "name": "NovaShell",
+  "version": "0.1.0",
+  "description": "NovaShell程序",
+  "task_type": {
+    "BuildFromSource": {
+      "Git": {
+        "url": "https://git.mirrors.dragonos.org/DragonOS-Community/NovaShell.git",
+        "revision": "81c6126119"
+      }
+    }
+  },
+  "depends": [],
+  "build": {
+    "build_command": "make install"
+  },
+  "clean": {
+    "clean_command": "make clean"
+  },
+  "install": {
+    "in_dragonos_path": "/"
+  },
+  "envs": [    
+    {
+      "key": "TARGET",
+      "value": "${ROOT_PATH}/user/dadk/target/x86_64-unknown-dragonos.json"
+    }
+  ]
+}
diff --git a/user/libs/libc/src/Makefile b/user/libs/libc/src/Makefile
@@ -7,7 +7,7 @@ CFLAGS += -I .
 
 libc_sub_dirs=math sys
 
-ifeq ($(ARCH), __x86_64__)
+ifeq ($(ARCH), x86_64)
 libc_sub_dirs += arch/x86_64
 endif