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

bugfix: 编译错误时仍可启动虚拟机的问题

Browse Source
This commit is contained in:
fslongjin 2022-09-01 15:44:30 +08:00
parent 00181545f8
commit 08df258142
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -29,6 +29,10 @@ kernel:
echo "make all in $$subdir";\ echo "make all in $$subdir";\
cd $$subdir;\ cd $$subdir;\
$(MAKE) all;\ $(MAKE) all;\
if [ "$$?" != "0" ]; then\
echo "内核编译失败";\
exit 1;\
fi;\
cd ..;\ cd ..;\
done done
@ -40,6 +44,10 @@ user:
echo "make all in $$subdir";\ echo "make all in $$subdir";\
cd $$subdir;\ cd $$subdir;\
$(MAKE) all;\ $(MAKE) all;\
if [ "$$?" != "0" ]; then\
echo "用户态程序编译失败";\
exit 1;\
fi;\
cd ..;\ cd ..;\
done done

4
kernel/Makefile
View File

@ -42,6 +42,9 @@ all: kernel
cd $$x;\ cd $$x;\
$(MAKE) generate_kallsyms kernel_root_path="$(shell pwd)";\ $(MAKE) generate_kallsyms kernel_root_path="$(shell pwd)";\
cd ..;\ cd ..;\
if [ "$$?" != "0" ]; then\
exit $$?;\
fi;\
done done
# 重新链接 # 重新链接
@ -59,7 +62,6 @@ $(kernel_subdirs): ECHO
$(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" kernel_root_path="$(shell pwd)" $(MAKE) -C $@ all CFLAGS="$(CFLAGS)" ASFLAGS="$(ASFLAGS)" PIC="$(PIC)" kernel_root_path="$(shell pwd)"
kernel: head.o main.o $(kernel_subdirs) kernel: head.o main.o $(kernel_subdirs)

8
run.sh
View File

@ -28,11 +28,19 @@ if [ ! "$1" == "--nobuild" ]; then
echo "运行在docker内" echo "运行在docker内"
IN_DOCKER=1 IN_DOCKER=1
make all -j 16 make all -j 16
if [ "$?" != "0" ]; then\
echo "DragonOS编译失败";\
exit 1;\
fi;\
make clean make clean
GENERATE_ISO=1 GENERATE_ISO=1
else else
make all -j 16 make all -j 16
if [ "$?" != "0" ]; then\
echo "DragonOS编译失败";\
exit 1;\
fi;\
make clean make clean
GENERATE_ISO=1 GENERATE_ISO=1
fi fi