misc update

diff --git a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
index 79e109d4ac4dea99bf71fee9a49923a6ceaea7e0..e86746ac8a0ef7e46c3fe671306e32a31b7f4db8 100644 (file)
--- a/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
+++ b/GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy.c
@@ -1984,6 +1984,7 @@ static grub_err_t ventoy_cmd_list_img(grub_extcmd_context_t ctxt, int argc, char
         return grub_error(GRUB_ERR_BAD_ARGUMENT, "Must clear image before list");
     }
 
+    g_enumerate_time_checked  = 0;
     g_enumerate_start_time_ms = grub_get_time_ms();
 
     strdata = ventoy_get_env("VTOY_FILT_DOT_UNDERSCORE_FILE");

diff --git a/GRUB2/buildgrub.sh b/GRUB2/buildgrub.sh
index c172a6815f6aa0f82a39cec41f5133678ce80c51..a9de4f5f8326d4e44fa9a330f22d67f490737b76 100644 (file)
--- a/GRUB2/buildgrub.sh
+++ b/GRUB2/buildgrub.sh
@@ -23,7 +23,7 @@ echo '======== build grub2 for x86_64-efi ==============='
 make distclean
 ./autogen.sh
 ./configure  --with-platform=efi --prefix=$VT_GRUB_DIR/INSTALL/
-make -j 16
+make -j 16 || exit 1
 sh install.sh  uefi
 
 
@@ -32,7 +32,7 @@ echo '======== build grub2 for i386-efi ==============='
 make distclean
 ./autogen.sh
 ./configure --target=i386 --with-platform=efi  --prefix=$VT_GRUB_DIR/INSTALL/
-make -j 16
+make -j 16 || exit 1
 sh install.sh  i386efi
 
 
@@ -51,7 +51,7 @@ TARGET_CC=aarch64-linux-gnu-gcc   \
 TARGET_OBJCOPY=aarch64-linux-gnu-objcopy \
 TARGET_STRIP=aarch64-linux-gnu-strip TARGET_NM=aarch64-linux-gnu-nm \
 TARGET_RANLIB=aarch64-linux-gnu-ranlib
-make -j 16
+make -j 16 || exit 1
 sh install.sh arm64
 
 
@@ -61,7 +61,7 @@ echo '======== build grub2 for i386-pc ==============='
 make distclean
 ./autogen.sh
 ./configure --target=i386 --with-platform=pc --prefix=$VT_GRUB_DIR/INSTALL/
-make -j 16
+make -j 16 || exit 1
 sh install.sh
 
 

diff --git a/INSTALL/docker_ci_build.sh b/INSTALL/docker_ci_build.sh
index 687e2d17eccaea3fd165dcd90450c67bae8e08da..cb284ad19ee98ee4b992f946b67927d15426714d 100644 (file)
--- a/INSTALL/docker_ci_build.sh
+++ b/INSTALL/docker_ci_build.sh
@@ -4,7 +4,6 @@ VTOY_PATH=$PWD/..
 
 wget -q -P $VTOY_PATH/DOC/ https://www.fefe.de/dietlibc/dietlibc-0.34.tar.xz
 wget -q -P $VTOY_PATH/DOC/ https://musl.libc.org/releases/musl-1.2.1.tar.gz
-wget -q -P $VTOY_PATH/DOC/ https://musl.libc.org/releases/musl-1.2.1.tar.gz
 wget -q -P $VTOY_PATH/GRUB2/ https://ftp.gnu.org/gnu/grub/grub-2.04.tar.xz
 wget -q -O $VTOY_PATH/EDK2/edk2-edk2-stable201911.zip https://codeload.github.com/tianocore/edk2/zip/edk2-stable201911
 wget -q -P /opt/ https://releases.linaro.org/components/toolchain/binaries/7.4-2019.02/aarch64-linux-gnu/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz