fix devcontainer for armmac users

Author: Ylarod

README.md

@@ -15,7 +15,7 @@ submodule 下的 prebuilts tarball 文件很大，非必要不要 clone submodul
 > [!TIP]
 > 对于中国大陆用户，可以使用 docker.cnb.cool/ylarod/ddk/ddk 来代替 ghcr.io/ylarod/ddk
 
-## 本地部署 Dev Container 开发环境
+### 本地部署 Dev Container 开发环境
 
 把下面内容放置到 .devcontainer/devcontainer.json
 
@@ -26,6 +26,14 @@ submodule 下的 prebuilts tarball 文件很大，非必要不要 clone submodul
 - [ddk-clang](https://github.com/Ylarod/ddk/blob/main/features/src/ddk-clang/devcontainer-feature.json)
 - [ddk-src](https://github.com/Ylarod/ddk/blob/main/features/src/ddk-src/devcontainer-feature.json)
 
+对于 M1 Mac + orbstack 用户，参考 `module_template/.devcontainer` 下的配置可以开发，还需要提取拉取镜像
+
+```bash
+docker run --platform linux/amd64 --rm -it docker.cnb.cool/ylarod/ddk/ddk-builder:latest
+```
+
+对于 x86_64 用户：
+
 ```yml
 {
   "name": "ddk-module-dev",

README_en.md

@@ -15,7 +15,7 @@ Prebuilts tarball in submodule is very large，do not clone submodules if unnece
 > [!TIP]
 > For users in Mainland China, you can use `docker.cnb.cool/ylarod/ddk/ddk` as a replacement for `ghcr.io/ylarod/ddk`.
 
-## Local Dev Container Development Environment
+### Local Dev Container Development Environment
 
 Place the following content in `.devcontainer/devcontainer.json`.
 
@@ -26,6 +26,14 @@ References:
 - [ddk-clang](https://github.com/Ylarod/ddk/blob/main/features/src/ddk-clang/devcontainer-feature.json)
 - [ddk-src](https://github.com/Ylarod/ddk/blob/main/features/src/ddk-src/devcontainer-feature.json)
 
+For users with M1 Mac + orbstack, Ref to `module_template/.devcontainer`, and pull image in advance.
+
+```bash
+docker run --platform linux/amd64 --rm -it docker.cnb.cool/ylarod/ddk/ddk-builder:latest
+```
+
+For x86_64 users:
+
 ```yml
 {
   "name": "ddk-module-dev",

module_template/.devcontainer/devcontainer.json

@@ -1,6 +1,10 @@
 {
   "name": "ddk-module-dev",
-  "image": "docker.cnb.cool/ylarod/ddk/ddk-builder:latest",
+  "dockerComposeFile": [
+    "docker-compose.yml"
+  ],
+  "service": "ddk",
+  "workspaceFolder": "/workspace",
   "features": {
     "ghcr.io/ylarod/ddk/features/ddk-clang:latest": {
       "clangVer": "clang-r416183b",
@@ -13,7 +17,7 @@
     }
   },
   "remoteUser": "root",
-  "postCreateCommand": "make && make compdb && echo Devcontainer ready",
+  "postCreateCommand": "echo Devcontainer ready",
   "customizations": {
     "vscode": {
       "extensions": [

module_template/.devcontainer/docker-compose.yml

@@ -0,0 +1,8 @@
+services:
+  ddk:
+    platform: linux/amd64
+    image: docker.cnb.cool/ylarod/ddk/ddk-builder:latest
+    stdin_open: true
+    tty: true
+    volumes:
+      - ..:/workspace:cached

module_template/Makefile

@@ -9,7 +9,7 @@ ccflags-y += -Wno-unused-result
 ccflags-y += -Wno-unused-function
 ccflags-y += -Wno-builtin-macro-redefined -U__FILE__ -D__FILE__='""'
 
-KDIR := $(KERNEL_SRC)
+KDIR := $(KDIR)
 MDIR := $(realpath $(dir $(abspath $(lastword $(MAKEFILE_LIST)))))
 
 $(info -- KDIR: $(KDIR))