From: longpanda Date: Tue, 2 Feb 2021 10:54:56 +0000 (+0800) Subject: Change VentoyliveCD from i386 to x86_64 X-Git-Tag: v1.0.34~9 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/Ventoy.git/commitdiff_plain/a5e998bcaf15d2475683e4559a9f0886b3b61c63 Change VentoyliveCD from i386 to x86_64 --- diff --git a/DOC/BuildVentoyFromSource.txt b/DOC/BuildVentoyFromSource.txt index 3b2a854..8f2593a 100644 --- a/DOC/BuildVentoyFromSource.txt +++ b/DOC/BuildVentoyFromSource.txt @@ -35,16 +35,16 @@ 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 ===> /opt/gcc-linaro-7.4.1-2019.02-x86_64_aarch64-linux-gnu.tar.xz https://toolchains.bootlin.com/downloads/releases/toolchains/aarch64/tarballs/aarch64--uclibc--stable-2020.08-1.tar.bz2 ===> /opt/aarch64--uclibc--stable-2020.08-1.tar.bz2 - http://www.tinycorelinux.net/11.x/x86/release/distribution_files/vmlinuz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/vmlinuz - http://www.tinycorelinux.net/11.x/x86/release/distribution_files/core.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/core.gz - http://www.tinycorelinux.net/11.x/x86/release/distribution_files/modules.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/modules.gz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/glib2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/glib2.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/libffi.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/libffi.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/liblvm2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/liblvm2.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/ncursesw.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/ncursesw.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/parted.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/parted.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/readline.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/readline.tcz - http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/udev-lib.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/udev-lib.tcz + http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/vmlinuz64 ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/vmlinuz64 + http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/corepure64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/corepure64.gz + http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/modules64.gz ===> /home/Ventoy-master/LiveCD/ISO/EFI/boot/modules64.gz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/glib2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/glib2.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/libffi.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/libffi.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/liblvm2.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/liblvm2.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/ncursesw.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/ncursesw.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/parted.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/parted.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/readline.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/readline.tcz + http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/udev-lib.tcz /home/Ventoy-master/LiveCD/VTOY/ventoy/tcz/udev-lib.tcz 2.3 Prepare third-part tools cd /home/Ventoy-master/DOC/ diff --git a/INSTALL/ventoy_pack.sh b/INSTALL/ventoy_pack.sh index bee6263..3e62539 100644 --- a/INSTALL/ventoy_pack.sh +++ b/INSTALL/ventoy_pack.sh @@ -40,9 +40,7 @@ done format_ventoy_disk_mbr 0 $LOOP fdisk -pwd -ls -lah ./grub/i386-pc/ -$GRUB_DIR/sbin/grub-bios-setup --verbose --skip-fs-probe --directory="./grub/i386-pc" $LOOP +$GRUB_DIR/sbin/grub-bios-setup --skip-fs-probe --directory="./grub/i386-pc" $LOOP curver=$(get_ventoy_version_from_cfg ./grub/grub.cfg) diff --git a/LiveCD/ISO/EFI/boot/grub.cfg b/LiveCD/ISO/EFI/boot/grub.cfg index d6e61c2..2d93e3c 100644 --- a/LiveCD/ISO/EFI/boot/grub.cfg +++ b/LiveCD/ISO/EFI/boot/grub.cfg @@ -5,13 +5,13 @@ set default=LiveCD clear menuentry 'Ventoy xxx LiveCD' --id=LiveCD { - linux /EFI/boot/vmlinuz quiet loglevel=0 superuser rdinit=/ventoy/init.sh - initrd /EFI/ventoy/ventoy.gz /EFI/boot/core.gz /EFI/boot/modules.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz + linux /EFI/boot/vmlinuz64 quiet loglevel=0 superuser rdinit=/ventoy/init.sh + initrd /EFI/ventoy/ventoy.gz /EFI/boot/corepure64.gz /EFI/boot/modules64.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz boot } menuentry 'Ventoy xxx LiveCD (Debug Mode)' { - linux /EFI/boot/vmlinuz loglevel=10 multivt superuser rdinit=/ventoy/init.sh - initrd /EFI/ventoy/ventoy.gz /EFI/boot/core.gz /EFI/boot/modules.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz + linux /EFI/boot/vmlinuz64 loglevel=10 multivt superuser rdinit=/ventoy/init.sh + initrd /EFI/ventoy/ventoy.gz /EFI/boot/corepure64.gz /EFI/boot/modules64.gz newc:ventoy.tar.gz:/EFI/ventoy/ventoy-xxx-linux.tar.gz boot } diff --git a/LiveCD/README.txt b/LiveCD/README.txt index 9ab5b1f..5ee8ba3 100644 --- a/LiveCD/README.txt +++ b/LiveCD/README.txt @@ -3,32 +3,32 @@ Ventoy LiveCD is Tinycore distro + Ventoy linux install package. vmlinuz and core.gz are downloaded from: -http://www.tinycorelinux.net/11.x/x86/release/distribution_files/ +http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/ MD5SUM: -0fd08c73e84b26aabbd0d12006d64855 core.gz -a9c2e2abbf464517e681234fb4687aa1 vmlinuz - +598db33adff41155f26e244e492916d0 corepure64.gz +858a5b2524cc541efe2d22b11b271e52 modules64.gz +ab3a8196df5a84889f16494fde188799 vmlinuz64 VTOY/ventoy/tcz/*/tcz are downloaded from: -http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/ +http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/ MD5SUM: -b6153a469d1d56e1e6895c6812a344cd dosfstools.tcz -29a4585d38b34ad58f8a7cb2d09e065f glib2.tcz -6812067a60165aee3cbcc07a75b6b1f4 libffi.tcz -5120e0c9ee65f936dea8cb6a0a0a1ddd liblvm2.tcz -92909db8fb3c4333a2a4a325ffbf4b50 ncursesw.tcz -e2bb47c9da2abab62fa794d69aba97c0 parted.tcz -0e6dfbebe816062a81aff6d3e5e7719b readline.tcz -3cf996373ab01be269ea0efaf17ce0cd udev-lib.tcz +803ac92b15e2ba58cddc58e1ff66446c dosfstools.tcz +eaa8aafb285b3f3bdf89187a964436db glib2.tcz +bbf81e97259faa73cbaf42b7e76c8685 libffi.tcz +2cb278ef278a6b8819df52ec2e6bedc3 liblvm2.tcz +0345a267ab49e711c596e21eaf721e3b ncursesw.tcz +65e226c963e78a0174baf99bc9cafcfc parted.tcz +ae78bbe0c5b7d79382cd1aeb08dc97bd readline.tcz +dff3775dea468c31e517f5ec5f403ce0 udev-lib.tcz VTOY/ventoy/drivers/*.ko build kernel -http://www.tinycorelinux.net/11.x/x86/release/src/kernel/ -config-5.4.3-tinycore -linux-5.4.3-patched.txz +http://www.tinycorelinux.net/11.x/x86_64/release/src/kernel/ +config-5.4.3-tinycore64 +linux-5.4.3-patched.txz disable a wireless lan driver to avoid compile error diff --git a/LiveCD/VTOY/ventoy/drivers/cdc-acm.ko b/LiveCD/VTOY/ventoy/drivers/cdc-acm.ko index 825b8a0..98209ed 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/cdc-acm.ko and b/LiveCD/VTOY/ventoy/drivers/cdc-acm.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/cdc-wdm.ko b/LiveCD/VTOY/ventoy/drivers/cdc-wdm.ko index a35e5e6..f591c81 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/cdc-wdm.ko and b/LiveCD/VTOY/ventoy/drivers/cdc-wdm.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/ezusb.ko b/LiveCD/VTOY/ventoy/drivers/ezusb.ko index 5840d8b..6c3609f 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/ezusb.ko and b/LiveCD/VTOY/ventoy/drivers/ezusb.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/megaraid_sas.ko b/LiveCD/VTOY/ventoy/drivers/megaraid_sas.ko index 3a33ede..0c867e4 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/megaraid_sas.ko and b/LiveCD/VTOY/ventoy/drivers/megaraid_sas.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptbase.ko b/LiveCD/VTOY/ventoy/drivers/mptbase.ko index 6499113..84a8214 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptbase.ko and b/LiveCD/VTOY/ventoy/drivers/mptbase.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptctl.ko b/LiveCD/VTOY/ventoy/drivers/mptctl.ko index dd6e57b..d502f65 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptctl.ko and b/LiveCD/VTOY/ventoy/drivers/mptctl.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptfc.ko b/LiveCD/VTOY/ventoy/drivers/mptfc.ko index 6f0e1ff..7beda2a 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptfc.ko and b/LiveCD/VTOY/ventoy/drivers/mptfc.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptsas.ko b/LiveCD/VTOY/ventoy/drivers/mptsas.ko index b0921f6..7d32864 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptsas.ko and b/LiveCD/VTOY/ventoy/drivers/mptsas.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptscsih.ko b/LiveCD/VTOY/ventoy/drivers/mptscsih.ko index 9953f82..64b8c56 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptscsih.ko and b/LiveCD/VTOY/ventoy/drivers/mptscsih.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/mptspi.ko b/LiveCD/VTOY/ventoy/drivers/mptspi.ko index bfb1af2..c505366 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/mptspi.ko and b/LiveCD/VTOY/ventoy/drivers/mptspi.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/parport.ko b/LiveCD/VTOY/ventoy/drivers/parport.ko index 3b51c7f..5bb8d9e 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/parport.ko and b/LiveCD/VTOY/ventoy/drivers/parport.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/pi3usb30532.ko b/LiveCD/VTOY/ventoy/drivers/pi3usb30532.ko index 8da5208..936ff0a 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/pi3usb30532.ko and b/LiveCD/VTOY/ventoy/drivers/pi3usb30532.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/scsi_transport_sas.ko b/LiveCD/VTOY/ventoy/drivers/scsi_transport_sas.ko index 7c268e6..9c73ec2 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/scsi_transport_sas.ko and b/LiveCD/VTOY/ventoy/drivers/scsi_transport_sas.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/scsi_transport_spi.ko b/LiveCD/VTOY/ventoy/drivers/scsi_transport_spi.ko index 063913a..3c50b90 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/scsi_transport_spi.ko and b/LiveCD/VTOY/ventoy/drivers/scsi_transport_spi.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/scsi_transport_srp.ko b/LiveCD/VTOY/ventoy/drivers/scsi_transport_srp.ko index 4e2f4cb..86c03a1 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/scsi_transport_srp.ko and b/LiveCD/VTOY/ventoy/drivers/scsi_transport_srp.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/sisusbvga.ko b/LiveCD/VTOY/ventoy/drivers/sisusbvga.ko index 95127e4..396be55 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/sisusbvga.ko and b/LiveCD/VTOY/ventoy/drivers/sisusbvga.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/ulpi.ko b/LiveCD/VTOY/ventoy/drivers/ulpi.ko deleted file mode 100644 index 7c3585f..0000000 Binary files a/LiveCD/VTOY/ventoy/drivers/ulpi.ko and /dev/null differ diff --git a/LiveCD/VTOY/ventoy/drivers/ums-realtek.ko b/LiveCD/VTOY/ventoy/drivers/ums-realtek.ko index 33abceb..a891d64 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/ums-realtek.ko and b/LiveCD/VTOY/ventoy/drivers/ums-realtek.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usb-conn-gpio.ko b/LiveCD/VTOY/ventoy/drivers/usb-conn-gpio.ko deleted file mode 100644 index d91421e..0000000 Binary files a/LiveCD/VTOY/ventoy/drivers/usb-conn-gpio.ko and /dev/null differ diff --git a/LiveCD/VTOY/ventoy/drivers/usb-otg-fsm.ko b/LiveCD/VTOY/ventoy/drivers/usb-otg-fsm.ko index 64b9374..c6242c1 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usb-otg-fsm.ko and b/LiveCD/VTOY/ventoy/drivers/usb-otg-fsm.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usb251xb.ko b/LiveCD/VTOY/ventoy/drivers/usb251xb.ko index 0487fac..97518df 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usb251xb.ko and b/LiveCD/VTOY/ventoy/drivers/usb251xb.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usb3503.ko b/LiveCD/VTOY/ventoy/drivers/usb3503.ko index 0952053..17016ee 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usb3503.ko and b/LiveCD/VTOY/ventoy/drivers/usb3503.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usb4604.ko b/LiveCD/VTOY/ventoy/drivers/usb4604.ko index a5e280d..6e83f82 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usb4604.ko and b/LiveCD/VTOY/ventoy/drivers/usb4604.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usbip-core.ko b/LiveCD/VTOY/ventoy/drivers/usbip-core.ko index 6e07ba0..2c1449e 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usbip-core.ko and b/LiveCD/VTOY/ventoy/drivers/usbip-core.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usbip-host.ko b/LiveCD/VTOY/ventoy/drivers/usbip-host.ko index ed919c7..77896e2 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usbip-host.ko and b/LiveCD/VTOY/ventoy/drivers/usbip-host.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/usblp.ko b/LiveCD/VTOY/ventoy/drivers/usblp.ko index fb1bc44..7e02ce3 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/usblp.ko and b/LiveCD/VTOY/ventoy/drivers/usblp.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/uss720.ko b/LiveCD/VTOY/ventoy/drivers/uss720.ko index cfca323..d3237ac 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/uss720.ko and b/LiveCD/VTOY/ventoy/drivers/uss720.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/vhci-hcd.ko b/LiveCD/VTOY/ventoy/drivers/vhci-hcd.ko index b5ff590..82b5b7e 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/vhci-hcd.ko and b/LiveCD/VTOY/ventoy/drivers/vhci-hcd.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/xhci-hcd.ko b/LiveCD/VTOY/ventoy/drivers/xhci-hcd.ko index 9c2bbb6..e047474 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/xhci-hcd.ko and b/LiveCD/VTOY/ventoy/drivers/xhci-hcd.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/xhci-pci.ko b/LiveCD/VTOY/ventoy/drivers/xhci-pci.ko index 63034a3..8568b27 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/xhci-pci.ko and b/LiveCD/VTOY/ventoy/drivers/xhci-pci.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/xhci-plat-hcd.ko b/LiveCD/VTOY/ventoy/drivers/xhci-plat-hcd.ko index 29bc93d..e0520e2 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/xhci-plat-hcd.ko and b/LiveCD/VTOY/ventoy/drivers/xhci-plat-hcd.ko differ diff --git a/LiveCD/VTOY/ventoy/drivers/yurex.ko b/LiveCD/VTOY/ventoy/drivers/yurex.ko index c23e05d..112ee32 100644 Binary files a/LiveCD/VTOY/ventoy/drivers/yurex.ko and b/LiveCD/VTOY/ventoy/drivers/yurex.ko differ diff --git a/LiveCD/VTOY/ventoy/modlist b/LiveCD/VTOY/ventoy/modlist index 198e3e0..c37359f 100644 --- a/LiveCD/VTOY/ventoy/modlist +++ b/LiveCD/VTOY/ventoy/modlist @@ -12,8 +12,6 @@ sisusbvga usb251xb pi3usb30532 usb-otg-fsm -usb-conn-gpio -ulpi ums-realtek xhci-hcd xhci-pci diff --git a/LiveCD/VTOY/ventoy/tcz/dosfstools.tcz b/LiveCD/VTOY/ventoy/tcz/dosfstools.tcz deleted file mode 100644 index d43d06a..0000000 Binary files a/LiveCD/VTOY/ventoy/tcz/dosfstools.tcz and /dev/null differ diff --git a/LiveCD/docker_ci.sh b/LiveCD/docker_ci.sh index 762d988..77660e6 100644 --- a/LiveCD/docker_ci.sh +++ b/LiveCD/docker_ci.sh @@ -2,10 +2,12 @@ VENTOY_PATH=$PWD/../ -for i in vmlinuz core.gz modules.gz; do - wget -q -P ISO/EFI/boot/ http://www.tinycorelinux.net/11.x/x86/release/distribution_files/$i +for i in vmlinuz64 corepure64.gz modules64.gz; do + wget -q -P ISO/EFI/boot/ http://www.tinycorelinux.net/11.x/x86_64/release/distribution_files/$i done -for i in glib2.tcz libffi.tcz liblvm2.tcz ncursesw.tcz parted.tcz readline.tcz udev-lib.tcz; do - wget -q -P VTOY/ventoy/tcz/ http://distro.ibiblio.org/tinycorelinux/11.x/x86/tcz/$i +[ -d VTOY/ventoy/tcz ] || mkdir -p VTOY/ventoy/tcz + +for i in dosfstools.tcz glib2.tcz libffi.tcz liblvm2.tcz ncursesw.tcz parted.tcz readline.tcz udev-lib.tcz; do + wget -q -P VTOY/ventoy/tcz/ http://distro.ibiblio.org/tinycorelinux/11.x/x86_64/tcz/$i done