Only use acpi when secureboot if enabled in UEFI mode.

[Ventoy.git] / INSTALL / ventoy_pack.sh

diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh
index 8969e4823ce7905c57c244967143380e8d26d6f1..3e62539a4e06dd0321e6bc92b848819f1acbca96 100644 (file)
--- a/INSTALL/ventoy_pack.sh
+++ b/INSTALL/ventoy_pack.sh
@@ -1,5 +1,14 @@
 #!/bin/sh
 
 #!/bin/sh
 

+if [ "$1" = "CI" ]; then
+    OPT='-dR'
+else
+    OPT='-a'
+fi
+
+dos2unix -q ./tool/ventoy_lib.sh
+dos2unix -q ./tool/VentoyWorker.sh
+

 . ./tool/ventoy_lib.sh
 
 GRUB_DIR=../GRUB2/INSTALL
 . ./tool/ventoy_lib.sh
 
 GRUB_DIR=../GRUB2/INSTALL


@@ -13,6 +22,7 @@ fi
 
 cd ../IMG
 sh mkcpio.sh
 
 cd ../IMG
 sh mkcpio.sh

+sh mkloopex.sh

 cd -
 
 
 cd -
 
 


@@ -28,7 +38,7 @@ while ! grep -q 524288 /sys/block/${LOOP#/dev/}/size 2>/dev/null; do
     sleep 1
 done
 
     sleep 1
 done
 

-format_ventoy_disk $LOOP 
+format_ventoy_disk_mbr 0 $LOOP fdisk

 
 $GRUB_DIR/sbin/grub-bios-setup  --skip-fs-probe  --directory="./grub/i386-pc"  $LOOP
 
 
 $GRUB_DIR/sbin/grub-bios-setup  --skip-fs-probe  --directory="./grub/i386-pc"  $LOOP
 


@@ -45,21 +55,23 @@ mount ${LOOP}p2  $tmpmnt
 mkdir -p $tmpmnt/grub
 
 # First copy grub.cfg file, to make it locate at front of the part2
 mkdir -p $tmpmnt/grub
 
 # First copy grub.cfg file, to make it locate at front of the part2

-cp -a ./grub/grub.cfg     $tmpmnt/grub/
+cp $OPT ./grub/grub.cfg     $tmpmnt/grub/

 
 ls -1 ./grub/ | grep -v 'grub\.cfg' | while read line; do
 
 ls -1 ./grub/ | grep -v 'grub\.cfg' | while read line; do

-    cp -a ./grub/$line $tmpmnt/grub/
+    cp $OPT ./grub/$line $tmpmnt/grub/

 done
 
 done
 

-cp -a ./ventoy   $tmpmnt/
-cp -a ./EFI   $tmpmnt/
-cp -a ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/
+cp $OPT ./ventoy   $tmpmnt/
+cp $OPT ./EFI   $tmpmnt/
+cp $OPT ./tool/ENROLL_THIS_KEY_IN_MOKMANAGER.cer $tmpmnt/

 
 
 mkdir -p $tmpmnt/tool
 
 
 mkdir -p $tmpmnt/tool

-cp -a ./tool/mount*     $tmpmnt/tool/
+cp $OPT ./tool/i386/mount.exfat-fuse     $tmpmnt/tool/mount.exfat-fuse_i386
+cp $OPT ./tool/x86_64/mount.exfat-fuse   $tmpmnt/tool/mount.exfat-fuse_x86_64
+cp $OPT ./tool/aarch64/mount.exfat-fuse  $tmpmnt/tool/mount.exfat-fuse_aarch64

 
 

-rm -f $tmpmnt/grub/i386-pc/*
+rm -f $tmpmnt/grub/i386-pc/*.img

 
 
 umount $tmpmnt && rm -rf $tmpmnt
 
 
 umount $tmpmnt && rm -rf $tmpmnt


@@ -73,9 +85,14 @@ dd if=$LOOP of=$tmpdir/boot/boot.img bs=1 count=512  status=none
 dd if=$LOOP of=$tmpdir/boot/core.img bs=512 count=2047 skip=1 status=none
 xz --check=crc32 $tmpdir/boot/core.img
 
 dd if=$LOOP of=$tmpdir/boot/core.img bs=512 count=2047 skip=1 status=none
 xz --check=crc32 $tmpdir/boot/core.img
 

-cp -a ./tool $tmpdir/
-cp -a Ventoy2Disk.sh $tmpdir/
-
+cp $OPT ./tool $tmpdir/
+rm -f $tmpdir/ENROLL_THIS_KEY_IN_MOKMANAGER.cer
+cp $OPT Ventoy2Disk.sh $tmpdir/
+cp $OPT README $tmpdir/
+cp $OPT plugin $tmpdir/
+cp $OPT CreatePersistentImg.sh $tmpdir/
+dos2unix -q $tmpdir/Ventoy2Disk.sh
+dos2unix -q $tmpdir/CreatePersistentImg.sh

 
 #32MB disk img
 dd status=none if=$LOOP of=$tmpdir/ventoy/ventoy.disk.img bs=512 count=$VENTOY_SECTOR_NUM skip=$part2_start_sector
 
 #32MB disk img
 dd status=none if=$LOOP of=$tmpdir/ventoy/ventoy.disk.img bs=512 count=$VENTOY_SECTOR_NUM skip=$part2_start_sector


@@ -87,28 +104,50 @@ rm -f ventoy-${curver}-linux.tar.gz
 
 
 CurDir=$PWD
 
 
 CurDir=$PWD

-cd $tmpdir/tool

 
 

-for file in $(ls); do
-    if [ "$file" != "xzcat" ] && [ "$file" != "ventoy_lib.sh" ]; then
-        xz --check=crc32 $file
-    fi
+for d in i386 x86_64 aarch64; do
+    cd $tmpdir/tool/$d
+    for file in $(ls); do
+        if [ "$file" != "xzcat" ]; then
+            xz --check=crc32 $file
+        fi
+    done
+    cd $CurDir

 done
 
 done
 

-cd $CurDir
+#chmod 
+find $tmpdir/ -type d -exec chmod 755 "{}" +
+find $tmpdir/ -type f -exec chmod 644 "{}" +
+chmod +x $tmpdir/Ventoy2Disk.sh
+chmod +x $tmpdir/CreatePersistentImg.sh
+

 tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir
 
 tar -czvf ventoy-${curver}-linux.tar.gz $tmpdir
 

+
+

 rm -f ventoy-${curver}-windows.zip
 rm -f ventoy-${curver}-windows.zip

-cp -a Ventoy2Disk.exe $tmpdir/
-cp -a $LANG_DIR/languages.ini $tmpdir/ventoy/
+cp $OPT Ventoy2Disk*.exe $tmpdir/
+cp $OPT $LANG_DIR/languages.ini $tmpdir/ventoy/

 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh
 rm -rf $tmpdir/tool
 rm -f $tmpdir/*.sh

+rm -f $tmpdir/README

 
 
 zip -r ventoy-${curver}-windows.zip $tmpdir/
 
 rm -rf $tmpdir
 
 
 
 zip -r ventoy-${curver}-windows.zip $tmpdir/
 
 rm -rf $tmpdir
 

+cd ../LiveCD
+if [ "$1" = "CI" ]; then
+    echo "=============== run docker_ci.sh ==============="
+    sh docker_ci.sh $1
+fi
+echo "=============== run livecd.sh ==============="
+sh livecd.sh $1
+cd $CurDir
+
+mv ../LiveCD/ventoy*.iso ./
+

 if [ -e ventoy-${curver}-windows.zip ] && [ -e ventoy-${curver}-linux.tar.gz ]; then
     echo -e "\n ============= SUCCESS =================\n"
 else
 if [ -e ventoy-${curver}-windows.zip ] && [ -e ventoy-${curver}-linux.tar.gz ]; then
     echo -e "\n ============= SUCCESS =================\n"
 else


@@ -116,4 +155,5 @@ else
     exit 1
 fi
 
     exit 1
 fi
 

+rm -f log.txt