DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-08 14:16:47 +00:00
Code Issues Releases Wiki Activity

fix: permission problems in container (#1106)

Browse Source
This commit is contained in:
Samuel Dai 2025-03-13 17:57:14 +08:00 committed by GitHub
parent 62dc88f313
commit ff739f08b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.vscode/settings.json vendored
View File

@ -147,8 +147,8 @@
//"./tools/Cargo.toml", //"./tools/Cargo.toml",
], ],
// "rust-analyzer.cargo.target": "riscv64gc-unknown-none-elf", "rust-analyzer.cargo.target": "riscv64gc-unknown-none-elf",
"rust-analyzer.cargo.target": "x86_64-unknown-none", // "rust-analyzer.cargo.target": "x86_64-unknown-none",
"rust-analyzer.check.overrideCommand": [ "rust-analyzer.check.overrideCommand": [
"make", "make",
"check", "check",

11
Makefile
View File

@ -88,21 +88,21 @@ write_diskimage-uefi: check_arch
bash -c "export ARCH=$(ARCH); cd tools && bash grub_auto_install.sh && sudo DADK=$(DADK) ARCH=$(ARCH) bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=uefi && cd .." bash -c "export ARCH=$(ARCH); cd tools && bash grub_auto_install.sh && sudo DADK=$(DADK) ARCH=$(ARCH) bash $(ROOT_PATH)/tools/write_disk_image.sh --bios=uefi && cd .."
# 不编译，直接启动QEMU # 不编译，直接启动QEMU
qemu: check_arch qemu: check_arch
sh -c "cd tools && bash run-qemu.sh --bios=legacy --display=window && cd .." sh -c "cd oscomp && bash run-qemu.sh --bios=legacy --display=window && cd .."
# 不编译，直接启动QEMU,不显示图像 # 不编译，直接启动QEMU,不显示图像
qemu-nographic: check_arch qemu-nographic: check_arch
sh -c "cd tools && bash run-qemu.sh --bios=legacy --display=nographic && cd .." sh -c "cd oscomp && bash run-qemu.sh --bios=legacy --display=nographic && cd .."
# 不编译，直接启动QEMU(UEFI) # 不编译，直接启动QEMU(UEFI)
qemu-uefi: check_arch qemu-uefi: check_arch
sh -c "cd tools && bash run-qemu.sh --bios=uefi --display=window && cd .." sh -c "cd oscomp && bash run-qemu.sh --bios=uefi --display=window && cd .."
# 不编译，直接启动QEMU,使用VNC Display作为图像输出 # 不编译，直接启动QEMU,使用VNC Display作为图像输出
qemu-vnc: check_arch qemu-vnc: check_arch
sh -c "cd tools && bash run-qemu.sh --bios=legacy --display=vnc && cd .." sh -c "cd oscomp && bash run-qemu.sh --bios=legacy --display=vnc && cd .."
# 不编译，直接启动QEMU(UEFI),使用VNC Display作为图像输出 # 不编译，直接启动QEMU(UEFI),使用VNC Display作为图像输出
qemu-uefi-vnc: check_arch qemu-uefi-vnc: check_arch
sh -c "cd tools && bash run-qemu.sh --bios=uefi --display=vnc && cd .." sh -c "cd oscomp && bash run-qemu.sh --bios=uefi --display=vnc && cd .."
# 编译并写入磁盘镜像 # 编译并写入磁盘镜像
build: check_arch build: check_arch
@ -159,6 +159,7 @@ log-monitor:
.PHONY: update-submodules .PHONY: update-submodules
update-submodules: update-submodules:
@echo "更新子模块" @echo "更新子模块"
@sudo chown -R $(USER):$(USER) .
@git submodule update --recursive --init @git submodule update --recursive --init
# @git submodule foreach git pull origin master # @git submodule foreach git pull origin master

2
dadk-manifest.toml
View File

@ -2,7 +2,7 @@
[metadata] [metadata]
# Target architecture. Options: x86_64, riscv64 # Target architecture. Options: x86_64, riscv64
arch = "x86_64" arch = "riscv64"
# Hypervisor config path # Hypervisor config path
hypervisor-config = "config/hypervisor.toml" hypervisor-config = "config/hypervisor.toml"

2
env.mk
View File

@ -2,7 +2,7 @@
ifeq ($(ARCH), ) ifeq ($(ARCH), )
# ！！！！在这里设置ARCH，可选 x86_64 和 riscv64 # ！！！！在这里设置ARCH，可选 x86_64 和 riscv64
# !!!!!!!如果不同时调整这里以及vscode的settings.json，那么自动补全和检查将会失效 # !!!!!!!如果不同时调整这里以及vscode的settings.json，那么自动补全和检查将会失效
export ARCH?=x86_64 export ARCH?=riscv64
endif endif
ifeq ($(EMULATOR), ) ifeq ($(EMULATOR), )

2
oscomp/run-qemu.sh
View File

@ -70,7 +70,7 @@ fi
# uboot版本 # uboot版本
UBOOT_VERSION="v2023.10" UBOOT_VERSION="v2023.10"
RISCV64_UBOOT_PATH="arch/riscv64/u-boot-${UBOOT_VERSION}-riscv64" RISCV64_UBOOT_PATH="../tools/arch/riscv64/u-boot-${UBOOT_VERSION}-riscv64"
DISK_NAME="disk-image-${ARCH}.img" DISK_NAME="disk-image-${ARCH}.img"