Merge remote-tracking branch 'refs/remotes/origin/main'

ruyisdk-debian-riscv · Dec 26, 2023 · e55c579 · e55c579
2 parents 5346c0a + 0a18bdb
commit e55c579
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -38,7 +38,7 @@ RUN --mount=type=cache,sharing=shared,target=/var/cache \
 
 FROM builder as build_image
 WORKDIR /builder
-COPY --from=build_rootfs /build/rv64-sid/ ./rv64-port/
+#COPY --from=build_rootfs /build/rv64-sid/ ./rv64-port/
 COPY create_image.sh build.sh ./
 COPY rootfs/setup_rootfs.sh ./
 

diff --git a/create_image.sh b/create_image.sh
@@ -84,7 +84,7 @@ function copy_rootfs(){
 
     cp -v /tmp/vf2_kernel_deb/*.deb ${ROOTFS_POINT}/tmp
     cp -v /builder/setup_rootfs.sh ${ROOTFS_POINT}
-    chroot "${ROOTFS_POINT}" qemu-riscv64-static /bin/sh /setup_rootfs.sh
+    chroot "${ROOTFS_POINT}" qemu-riscv64-static /bin/sh ${ROOTFS_POINT}/setup_rootfs.sh
     rm "${ROOTFS_POINT}/setup_rootfs.sh" "${ROOTFS_POINT}/usr/bin/qemu-riscv64-static"
 
     umount "${ROOTFS_POINT}"