IA32 ARM64 support

IMG/cpio/ventoy/hook/debian/ventoy-hook.sh

@@ -70,6 +70,10 @@ ventoy_get_debian_distro() {
         echo 'vyos'; return
     fi
     
+    if $GREP -q 'kylin' /proc/version; then
+        echo 'kylin'; return
+    fi
+    
     echo 'default'
 }
 

IMG/cpio/ventoy/hook/primeos/ventoy-disk.sh

+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. /ventoy/hook/ventoy-hook-lib.sh
+
+VTPATH_OLD=$PATH; PATH=$BUSYBOX_PATH:$VTOY_PATH/tool:$PATH
+
+wait_for_usb_disk_ready
+vtdiskname=$(get_ventoy_disk_name)
+if [ "$vtdiskname" = "unknown" ]; then
+    vtlog "ventoy disk not found"
+    PATH=$VTPATH_OLD
+    exit 0
+fi
+
+ventoy_udev_disk_common_hook "${vtdiskname#/dev/}2" "noreplace"
+
+blkdev_num=$($VTOY_PATH/tool/dmsetup ls | grep ventoy | sed 's/.*(\([0-9][0-9]*\),.*\([0-9][0-9]*\).*/\1:\2/')
+vtDM=$(ventoy_find_dm_id ${blkdev_num})
+echo -n "/dev/$vtDM" > /ventoy/rootdev
+
+PATH=$VTPATH_OLD

IMG/cpio/ventoy/hook/primeos/ventoy-hook.sh

+#!/ventoy/busybox/sh
+#************************************************************************************
+# Copyright (c) 2020, longpanda <admin@ventoy.net>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# 
+#************************************************************************************
+
+. $VTOY_PATH/hook/ventoy-os-lib.sh
+
+$BUSYBOX_PATH/mkdir /dev
+
+$SED '/Detecting *PrimeOS/a\ ROOT=$(cat /ventoy/rootdev)' -i /init
+$SED "/Detecting *PrimeOS/a\ $BUSYBOX_PATH/sh  $VTOY_PATH/hook/primeos/ventoy-disk.sh" -i /init

IMG/cpio/ventoy/init

@@ -43,7 +43,7 @@ echo "kenel cmdline=$vtcmdline" >>$VTLOG
 
 #break here for debug
 if [ "$VTOY_BREAK_LEVEL" = "01" ] || [ "$VTOY_BREAK_LEVEL" = "11" ]; then
-    sleep 5
+    sleep 5    
     echo -e "\n\n\033[32m ################################################# \033[0m"
     echo -e "\033[32m ################ VENTOY DEBUG ################### \033[0m"
     echo -e "\033[32m ################################################# \033[0m \n"

IMG/cpio/ventoy/init_chain

@@ -145,7 +145,7 @@ done
 
 #break here for debug
 if [ "$VTOY_BREAK_LEVEL" = "02" ] || [ "$VTOY_BREAK_LEVEL" = "12" ]; then
-    sleep 5
+    sleep 5    
     echo -e "\n\n\033[32m ################################################# \033[0m"
     echo -e "\033[32m ################ VENTOY DEBUG ################### \033[0m"
     echo -e "\033[32m ################################################# \033[0m \n"   

IMG/cpio/ventoy/tool/vtoytool_install.sh

@@ -19,46 +19,67 @@
 
 echo "#### install vtoytool #####" >> $VTLOG
 
-if ! [ -e $BUSYBOX_PATH/ar ]; then
-    $BUSYBOX_PATH/ln -s $VTOY_PATH/tool/ar $BUSYBOX_PATH/ar
-fi
-
-for vtdir in $(ls $VTOY_PATH/tool/vtoytool/); do
-    echo "try $VTOY_PATH/tool/vtoytool/$vtdir/ ..." >> $VTLOG
-    if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_64 --install 2>>$VTLOG; then
-        echo "vtoytool_64 OK" >> $VTLOG
-        break
-    fi
-    
-    if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_32 --install 2>>$VTLOG; then
-        echo "vtoytool_32 OK" >> $VTLOG
-        break
+for app in ar inotifyd; do
+    if [ -e $BUSYBOX_PATH/$app ]; then
+        $BUSYBOX_PATH/rm -f $VTOY_PATH/tool/$app
+        $BUSYBOX_PATH/ln -s $BUSYBOX_PATH/$app $VTOY_PATH/tool/$app
+    else
+        $BUSYBOX_PATH/ln -s $VTOY_PATH/tool/$app $BUSYBOX_PATH/$app
     fi
 done
 
-if $VTOY_PATH/tool/vtoy_fuse_iso_64 -t 2>>$VTLOG; then
-    echo "use vtoy_fuse_iso_64" >>$VTLOG
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_64  $VTOY_PATH/tool/vtoy_fuse_iso
-else
-    echo "use vtoy_fuse_iso_32" >>$VTLOG    
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_32 $VTOY_PATH/tool/vtoy_fuse_iso
-fi
 
-if $VTOY_PATH/tool/unsquashfs_64 -t 2>>$VTLOG; then
-    echo "use unsquashfs_64" >>$VTLOG
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_64  $VTOY_PATH/tool/vtoy_unsquashfs
+if $GREP -q aarch64 $VTOY_PATH/ventoy_arch; then
+    for vtdir in $(ls $VTOY_PATH/tool/vtoytool/); do
+        echo "try $VTOY_PATH/tool/vtoytool/$vtdir/ ..." >> $VTLOG
+        if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_aa64 --install 2>>$VTLOG; then
+            echo "vtoytool_aa64 OK" >> $VTLOG
+            break
+        fi        
+    done
+    
+    $BUSYBOX_PATH/rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
+    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/lz4cataa64 $VTOY_PATH/tool/lz4cat
+    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/zstdcataa64 $VTOY_PATH/tool/zstdcat
+    
+    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_aa64  $VTOY_PATH/tool/vtoy_fuse_iso
+    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_aa64  $VTOY_PATH/tool/vtoy_unsquashfs    
 else
-    echo "use unsquashfs_32" >>$VTLOG    
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_32 $VTOY_PATH/tool/vtoy_unsquashfs
-fi
-
+    
+    if $GREP -q x86_64 $VTOY_PATH/ventoy_arch; then
+        $BUSYBOX_PATH/rm -f $VTOY_PATH/tool/lz4cat $VTOY_PATH/tool/zstdcat
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/lz4cat64  $VTOY_PATH/tool/lz4cat
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/zstdcat64 $VTOY_PATH/tool/zstdcat
+    fi
 
+    for vtdir in $(ls $VTOY_PATH/tool/vtoytool/); do
+        echo "try $VTOY_PATH/tool/vtoytool/$vtdir/ ..." >> $VTLOG
+        if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_64 --install 2>>$VTLOG; then
+            echo "vtoytool_64 OK" >> $VTLOG
+            break
+        fi
+        
+        if $VTOY_PATH/tool/vtoytool/$vtdir/vtoytool_32 --install 2>>$VTLOG; then
+            echo "vtoytool_32 OK" >> $VTLOG
+            break
+        fi
+    done
+    
+    if $VTOY_PATH/tool/vtoy_fuse_iso_64 -t 2>>$VTLOG; then
+        echo "use vtoy_fuse_iso_64" >>$VTLOG
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_64  $VTOY_PATH/tool/vtoy_fuse_iso
+    else
+        echo "use vtoy_fuse_iso_32" >>$VTLOG    
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/vtoy_fuse_iso_32 $VTOY_PATH/tool/vtoy_fuse_iso
+    fi
 
-if $VTOY_PATH/tool/unsquashfs_64 -t 2>>$VTLOG; then
-    echo "use unsquashfs_64" >>$VTLOG
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_64  $VTOY_PATH/tool/vtoy_unsquashfs
-else
-    echo "use unsquashfs_32" >>$VTLOG    
-    $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_32 $VTOY_PATH/tool/vtoy_unsquashfs
+    if $VTOY_PATH/tool/unsquashfs_64 -t 2>>$VTLOG; then
+        echo "use unsquashfs_64" >>$VTLOG
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_64  $VTOY_PATH/tool/vtoy_unsquashfs
+    else
+        echo "use unsquashfs_32" >>$VTLOG    
+        $BUSYBOX_PATH/cp -a $VTOY_PATH/tool/unsquashfs_32 $VTOY_PATH/tool/vtoy_unsquashfs
+    fi
+    
 fi
 

IMG/cpio/ventoy/ventoy_chain.sh

@@ -305,6 +305,10 @@ ventoy_get_os_type() {
         echo 'blackPanther'; return
     fi
     
+    if $GREP -q 'primeos' /proc/version; then
+        echo 'primeos'; return
+    fi
+    
     echo "default"
 }
 

IMG/mkcpio.sh

@@ -21,8 +21,10 @@ cp -a $VENTOY_PATH/SQUASHFS/unsquashfs_* tool/
 cp -a $VENTOY_PATH/FUSEISO/vtoy_fuse_iso_* tool/
 cp -a $VENTOY_PATH/VtoyTool/vtoytool tool/
 cp -a $VENTOY_PATH/VBLADE/vblade-master/vblade_* tool/
+
 cp -a $VENTOY_PATH/LZIP/lunzip32 tool/
 cp -a $VENTOY_PATH/LZIP/lunzip64 tool/
+cp -a $VENTOY_PATH/LZIP/lunzipaa64 tool/
 
 
 chmod -R 777 ./tool

INSTALL/Ventoy2Disk.sh

@@ -10,16 +10,26 @@ if [ -f ./ventoy/version ]; then
     curver=$(cat ./ventoy/version) 
 fi
 
+OLDDIR=$(pwd)
+
+if uname -a | egrep -q 'aarch64|arm64'; then
+    export TOOLDIR=aarch64
+elif uname -a | egrep -q 'x86_64|amd64'; then
+    export TOOLDIR=x86_64
+else
+    export TOOLDIR=i386
+fi
+export PATH=./tool/$TOOLDIR:$PATH
+
+
 echo ''
 echo '**********************************************'
-echo "      Ventoy: $curver"
+echo "      Ventoy: $curver  $TOOLDIR"
 echo "      longpanda admin@ventoy.net"
 echo "      https://www.ventoy.net"
 echo '**********************************************'
 echo ''
 
-OLDDIR=$(pwd)
-PATH=./tool:$PATH
 
 if ! [ -f ./boot/boot.img ]; then
     if [ -d ./grub ]; then
@@ -30,30 +40,30 @@ if ! [ -f ./boot/boot.img ]; then
     exit 1
 fi
 
-echo "############# Ventoy2Disk $* ################" >> ./log.txt
+echo "############# Ventoy2Disk $* [$TOOLDIR] ################" >> ./log.txt
 date >> ./log.txt
 
 #decompress tool
-if [ -f ./tool/VentoyWorker.sh ]; then
+if [ -f ./tool/$TOOLDIR/ash ]; then
     echo "no need to decompress tools" >> ./log.txt
 else
-    cd tool
+    cd ./tool/$TOOLDIR
     
-    if [ -f ./xzcat ]; then
-        chmod +x ./xzcat
-    fi
+    [ -f ./xzcat ] && chmod +x ./xzcat
     
     for file in $(ls *.xz); do
         xzcat $file > ${file%.xz}
-        chmod +x ${file%.xz}
+        [ -f ./$file ] && rm -f ./$file
     done
-    cd ../
+    cd $OLDDIR
+    
+    chmod +x -R ./tool/$TOOLDIR
 fi
 
 if [ -f /bin/bash ]; then
-    bash ./tool/VentoyWorker.sh $*
+    /bin/bash ./tool/VentoyWorker.sh $*
 else
-    ./tool/ash ./tool/VentoyWorker.sh $*
+    ash ./tool/VentoyWorker.sh $*
 fi
 
 if [ -n "$OLDDIR" ]; then