fix: fix compatibility with MacOS Sequoia

Signed-off-by: Yiyang Wu <[email protected]>
SJTU-IPADS · Dec 11, 2024 · 33594c5 · 33594c5
1 parent 6a8c345
commit 33594c5
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 5 deletions.
diff --git a/Lab3/user/chcore-libc/CMakeLists.txt b/Lab3/user/chcore-libc/CMakeLists.txt
@@ -101,7 +101,7 @@ add_custom_target(libc-build ALL
 # Install libc as usual
 add_custom_target(libc-install ALL
     WORKING_DIRECTORY ${_libc_target_dir}
-    COMMAND make install
+    COMMAND make -j1 install
     DEPENDS libc-build)
 
 # clean target

diff --git a/Lab4/user/chcore-libc/CMakeLists.txt b/Lab4/user/chcore-libc/CMakeLists.txt
@@ -101,7 +101,7 @@ add_custom_target(libc-build ALL
 # Install libc as usual
 add_custom_target(libc-install ALL
     WORKING_DIRECTORY ${_libc_target_dir}
-    COMMAND make install
+    COMMAND make -j1 install
     DEPENDS libc-build)
 
 # clean target

diff --git a/Lab5/user/chcore-libc/CMakeLists.txt b/Lab5/user/chcore-libc/CMakeLists.txt
@@ -101,7 +101,7 @@ add_custom_target(libc-build ALL
 # Install libc as usual
 add_custom_target(libc-install ALL
     WORKING_DIRECTORY ${_libc_target_dir}
-    COMMAND make install
+    COMMAND make -j1 install
     DEPENDS libc-build)
 
 # clean target

diff --git a/Scripts/chbuild b/Scripts/chbuild
@@ -279,6 +279,7 @@ _docker_run() {
             -u $(id -u ${USER}):$(id -g ${USER}) \
             -v ${LABROOT}:${LABROOT} -w $(pwd) \
             --security-opt=seccomp:unconfined \
+            --platform=linux/amd64 \
             ipads/oslab:24.09 \
             $self $@
     fi

diff --git a/Scripts/kernel.mk b/Scripts/kernel.mk
@@ -16,7 +16,7 @@ _QEMU := $(SCRIPTS)/qemu_wrapper.sh $(QEMU)
 QEMU_GDB_PORT := 1234
 QEMU_OPTS := -machine raspi3b -nographic -serial mon:stdio -m size=1G -kernel $(KERNEL_IMG)
 CHBUILD := $(SCRIPTS)/chbuild
-SERIAL := $(shell tr -dc A-Za-z0-9 </dev/urandom | head -c 13; echo)
+SERIAL := $(shell LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 13; echo)
 
 export LABROOT LABDIR SCRIPTS LAB TIMEOUT
 

diff --git a/Scripts/lab.mk b/Scripts/lab.mk
@@ -38,6 +38,7 @@ DOCKER_RUN ?= $(DOCKER) run -it --rm \
 		-u $(shell id -u $(USER)):$(shell id -g $(USER)) \
 		-v $(LABROOT):$(LABROOT) -w $(CURDIR) \
 		--security-opt=seccomp:unconfined \
+    --platform=linux/amd64 \
 		ipads/oslab:24.09
 endif
 QEMU-SYS ?= qemu-system-aarch64

diff --git a/Scripts/submit.mk b/Scripts/submit.mk
@@ -1,6 +1,6 @@
 include $(CURDIR)/filelist.mk
 
-FILES := $(FILES) $(shell find -name "*.pdf" \
+FILES := $(FILES) $(shell find . -name "*.pdf" \
 		 -o -name "*.doc" \
 		 -o -name "*.docx")
 submit: